flake.nix

@@ -61,31 +61,27 @@
       # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
       forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
 
-    in rec {
+    in {
 
-      nixosConfigurations = {
+      nixosConfigurations = with inputs; {
-        desktop = import ./hosts/desktop { inherit inputs globals; };
+        desktop = import ./hosts/desktop {
-        wsl = import ./hosts/wsl { inherit inputs globals; };
+          inherit nixpkgs home-manager nur globals wallpapers;
-        oracle = import ./hosts/oracle { inherit inputs globals; };
+        };
+        wsl = import ./hosts/wsl { inherit nixpkgs wsl home-manager globals; };
+        oracle =
+          import ./hosts/oracle { inherit nixpkgs home-manager globals; };
       };
 
-      darwinConfigurations = {
+      darwinConfigurations = with inputs; {
-        macbook = import ./hosts/macbook { inherit inputs globals; };
+        macbook = import ./hosts/macbook {
+          inherit nixpkgs darwin home-manager nur globals;
         };
-
-      # For quickly applying local settings with:
-      # home-manager switch --flake .#desktop
-      homeConfigurations = {
-        desktop =
-          nixosConfigurations.desktop.config.home-manager.users.${globals.user}.home;
-        macbook =
-          darwinConfigurations.macbook.config.home-manager.users."Noah.Masur".home;
       };
 
       # Package servers into images with a generator
       packages.x86_64-linux = with inputs; {
         aws = import ./hosts/aws {
-          inherit inputs globals;
+          inherit nixpkgs nixos-generators home-manager globals;
           system = "x86_64-linux";
         };
       };

hosts/aws/default.nix

@@ -1,6 +1,4 @@
-{ inputs, globals, ... }:
+{ nixpkgs, system, nixos-generators, home-manager, globals, ... }:
-
-with inputs;
 
 nixos-generators.nixosGenerate {
   inherit system;

hosts/desktop/default.nix

@@ -1,6 +1,4 @@
-{ inputs, globals, ... }:
+{ nixpkgs, home-manager, nur, globals, wallpapers, ... }:
-
-with inputs;
 
 # System configuration for my desktop
 nixpkgs.lib.nixosSystem {

hosts/macbook/default.nix

@@ -1,6 +1,4 @@
-{ inputs, globals, ... }:
+{ nixpkgs, darwin, home-manager, nur, globals, ... }:
-
-with inputs;
 
 # System configuration for my work MacBook
 darwin.lib.darwinSystem {

hosts/oracle/default.nix

@@ -1,6 +1,4 @@
-{ inputs, globals, ... }:
+{ nixpkgs, home-manager, globals, ... }:
-
-with inputs;
 
 # System configuration for an Oracle free server
 

hosts/wsl/default.nix

@@ -1,6 +1,4 @@
-{ inputs, globals, ... }:
+{ nixpkgs, wsl, home-manager, globals, ... }:
-
-with inputs;
 
 # System configuration for WSL
 nixpkgs.lib.nixosSystem {

modules/applications/alacritty.nix

@@ -34,8 +34,8 @@
               chars = "\\x11F";
             }
             {
-              key = "H";
+              key = "K";
-              mods = "Control|Shift";
+              mods = "Control";
               mode = "~Vi";
               action = "ToggleViMode";
             }

modules/applications/default.nix

@@ -6,7 +6,6 @@
     ./calibre.nix
     ./discord.nix
     ./firefox.nix
-    ./kitty.nix
     ./media.nix
     ./obsidian.nix
     ./qbittorrent.nix

modules/applications/firefox.nix

@@ -33,7 +33,6 @@
           settings = {
             "browser.aboutConfig.showWarning" = false;
             "browser.warnOnQuit" = false;
-            "browser.quitShortcut.disabled" = true;
             "browser.theme.dark-private-windows" = true;
             "browser.toolbars.bookmarks.visibility" = "newtab";
             "browser.startup.page" = 3; # Restore previous session

modules/applications/kitty.nix

@@ -1,73 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  config = lib.mkIf config.gui.enable {
-    home-manager.users.${config.user} = {
-      # xsession.windowManager.i3.config.terminal = "kitty";
-      # programs.rofi.terminal = "${pkgs.kitty}/bin/kitty";
-      programs.kitty = {
-        enable = true;
-        darwinLaunchOptions = null;
-        environment = { };
-        extraConfig = "";
-        font.size = 14;
-        keybindings = { };
-        settings = {
-
-          # Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache)
-          background = config.colorscheme.base00;
-          foreground = config.colorscheme.base05;
-          selection_background = config.colorscheme.base05;
-          selection_foreground = config.colorscheme.base00;
-          url_color = config.colorscheme.base04;
-          cursor = config.colorscheme.base05;
-          active_border_color = config.colorscheme.base03;
-          inactive_border_color = config.colorscheme.base01;
-          active_tab_background = config.colorscheme.base00;
-          active_tab_foreground = config.colorscheme.base05;
-          inactive_tab_background = config.colorscheme.base01;
-          inactive_tab_foreground = config.colorscheme.base04;
-          tab_bar_background = config.colorscheme.base01;
-
-          # normal
-          color0 = config.colorscheme.base00;
-          color1 = config.colorscheme.base08;
-          color2 = config.colorscheme.base0B;
-          color3 = config.colorscheme.base0A;
-          color4 = config.colorscheme.base0D;
-          color5 = config.colorscheme.base0E;
-          color6 = config.colorscheme.base0C;
-          color7 = config.colorscheme.base05;
-
-          # bright
-          color8 = config.colorscheme.base03;
-          color9 = config.colorscheme.base08;
-          color10 = config.colorscheme.base0B;
-          color11 = config.colorscheme.base0A;
-          color12 = config.colorscheme.base0D;
-          color13 = config.colorscheme.base0E;
-          color14 = config.colorscheme.base0C;
-          color15 = config.colorscheme.base07;
-
-          # extended base16 colors
-          color16 = config.colorscheme.base09;
-          color17 = config.colorscheme.base0F;
-          color18 = config.colorscheme.base01;
-          color19 = config.colorscheme.base02;
-          color20 = config.colorscheme.base04;
-          color21 = config.colorscheme.base06;
-
-          # Scrollback
-          scrolling_lines = 10000;
-          scrollback_pager_history_size = 10; # MB
-          scrollback_pager = ''
-            ${pkgs.neovim}/bin/nvim -c 'setlocal nonumber nolist showtabline=0 foldcolumn=0|Man!' -c "autocmd VimEnter * normal G" -'';
-
-          # Window
-          window_padding_width = 4;
-
-          # macos_traditional_fullscreen = true;
-        };
-      };
-    };
-  };
-}

modules/darwin/fonts.nix

@@ -9,11 +9,6 @@
       font.normal.family = "FiraCode Nerd Font Mono";
     };
 
-    programs.kitty.font = {
-      package = pkgs.nerdfonts;
-      name = "FiraCode";
-    };
-
   };
 
 }

modules/darwin/nixpkgs.nix

@@ -18,13 +18,6 @@
             commandline --function execute
           '';
         };
-        rebuild-home = lib.mkForce {
-          body = ''
-            git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r ${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName}";
-            commandline --function execute
-          '';
-        };
       };
     };
 

modules/graphical/fonts.nix

@@ -21,7 +21,6 @@ in {
       services.polybar.config."bar/main".font-0 = "Hack Nerd Font:size=10;2";
       programs.rofi.font = "Hack Nerd Font 14";
       programs.alacritty.settings.font.normal.family = fontName;
-      programs.kitty.font.name = fontName;
     };
 
   };

modules/graphical/xorg.nix

@@ -27,11 +27,6 @@ in {
           # Make the login screen dark
           greeters.gtk.theme = gtkTheme;
 
-          # Show default user
-          extraSeatDefaults = ''
-            greeter-hide-users = false
-          '';
-
         };
       };
 

modules/shell/nixpkgs.nix

@@ -12,7 +12,6 @@
         nixh = "man home-configuration.nix";
         nr = "rebuild-nixos";
         nro = "rebuild-nixos offline";
-        hm = "rebuild-home";
       };
       functions = {
         nix-shell-run = {
@@ -44,13 +43,6 @@
             commandline --function execute
           '';
         };
-        rebuild-home = {
-          body = ''
-            git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName}";
-            commandline --function execute
-          '';
-        };
       };
     };
 

windows/alacritty.yml

@@ -723,7 +723,7 @@ key_bindings:
   - { key: L, mods: Control|Shift, chars: "\x1F" }
   # Used for searching nixpkgs in fish_user_key_bindings
   - { key: N, mods: Control|Shift, chars: "\x11F" }
-  - { key: H, mods: Control|Shift, mode: ~Vi, action: ToggleViMode }
+  - { key: K, mods: Control, mode: ~Vi, action: ToggleViMode }
   - { key: Return, mode: Vi, action: ToggleViMode }
   # Used to enable $ keybind in Vi mode
   - { key: 5, mods: Shift, mode: Vi|~Search, action: Last }