switch from homebrew to firefox overlay for macos

This reverts commit d1f12671b0.

.gitignore

@@ -6,3 +6,4 @@ result
 .luarc.json
 private/**
 !private/**.age
+!private/**.sha512

flake.lock

@@ -21,6 +21,24 @@
         "type": "github"
       }
     },
+    "firefox-darwin": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1668992358,
+        "narHash": "sha256-24iH+wIbE1bKCFmqslwOpfrDypJ40mk1uGIqRUxDXxY=",
+        "owner": "bandithedoge",
+        "repo": "nixpkgs-firefox-darwin",
+        "rev": "066d4fd658acd075b45405eda9e3bca6a71a47b1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "bandithedoge",
+        "repo": "nixpkgs-firefox-darwin",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -111,6 +129,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1639237670,
+        "narHash": "sha256-RTdL4rEQcgaZGpvtDgkp3oK/V+1LM3I53n0ACPSroAQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "edfb969386ebe6c3cf8f878775a7975cd88f926d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1666959691,
         "narHash": "sha256-TRpWA3t8ata79HOGtFd5dDCl1kJQmIE16PDF53/Hcxo=",
@@ -126,7 +160,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1660318005,
         "narHash": "sha256-g9WCa9lVUmOV6dYRbEPjv/TLOR5hamjeCcKExVGS3OQ=",
@@ -159,9 +193,10 @@
     "root": {
       "inputs": {
         "darwin": "darwin",
+        "firefox-darwin": "firefox-darwin",
         "home-manager": "home-manager",
         "nixos-generators": "nixos-generators",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nur": "nur",
         "wallpapers": "wallpapers",
         "wsl": "wsl"
@@ -202,7 +237,7 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1666720338,

flake.nix

@@ -26,6 +26,9 @@
     # Community packages; used for Firefox extensions
     nur.url = "github:nix-community/nur";
 
+    # Use official Firefox binary for macOS
+    firefox-darwin.url = "github:bandithedoge/nixpkgs-firefox-darwin";
+
     # Wallpapers
     wallpapers = {
       url = "gitlab:exorcist365/wallpapers";
@@ -83,12 +86,10 @@
       };
 
       # Package servers into images with a generator
-      packages.x86_64-linux = with inputs; {
-        aws = import ./hosts/aws {
-          inherit inputs globals;
-          system = "x86_64-linux";
-        };
-      };
+      packages.aws = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ]
+        (system: {
+          "${system}" = import ./hosts/aws { inherit inputs globals system; };
+        });
 
       apps = forAllSystems (system:
         let pkgs = import nixpkgs { inherit system; };

hosts/common.nix

@@ -3,9 +3,9 @@
   imports =
     [ ../modules/shell ../modules/neovim ../modules/repositories/dotfiles.nix ];
 
-  options = with lib; {
-    user = mkOption {
-      type = types.str;
+  options = rec {
+    user = lib.mkOption {
+      type = lib.types.str;
       description = "Primary user of the system";
     };
     fullName = lib.mkOption {
@@ -27,17 +27,30 @@
       default = "/etc/ssh/ssh_host_ed25519_key";
     };
     gui = {
-      enable = mkEnableOption {
-        description = "Enable graphics";
+      enable = lib.mkEnableOption {
+        description = "Enable graphics.";
         default = false;
       };
     };
-    colorscheme = mkOption {
-      type = types.attrs;
-      description = "Base16 color scheme";
+    theme = {
+      colors = lib.mkOption {
+        type = lib.types.attrs;
+        description = "Base16 color scheme.";
+        default = (import ../modules/colorscheme/gruvbox).dark;
+      };
+      dark = lib.mkOption {
+        type = lib.types.bool;
+        description = "Enable dark mode.";
+        default = true;
+      };
     };
-    homePath = mkOption {
-      type = types.path;
+
+    # colorscheme = lib.mkOption {
+    #   type = types.attrs;
+    #   description = "Base16 color scheme";
+    # };
+    homePath = lib.mkOption {
+      type = lib.types.path;
       description = "Path of user's home directory.";
       default = builtins.toPath (if pkgs.stdenv.isDarwin then
         "/Users/${config.user}"
@@ -45,17 +58,17 @@
         "/home/${config.user}");
     };
 
-    dotfilesPath = mkOption {
-      type = types.path;
+    dotfilesPath = lib.mkOption {
+      type = lib.types.path;
       description = "Path of dotfiles repository.";
       default = config.homePath + "/dev/personal/dotfiles";
     };
-    dotfilesRepo = mkOption {
-      type = types.str;
+    dotfilesRepo = lib.mkOption {
+      type = lib.types.str;
       description = "Link to dotfiles repository.";
     };
-    unfreePackages = mkOption {
-      type = types.listOf types.str;
+    unfreePackages = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
       description = "List of unfree packages to allow.";
       default = [ ];
     };

hosts/desktop/default.nix

@@ -15,17 +15,14 @@ nixpkgs.lib.nixosSystem {
       # Set registry to flake packages, used for nix X commands
       nix.registry.nixpkgs.flake = nixpkgs;
       identityFile = "/home/${globals.user}/.ssh/id_ed25519";
-      gaming.steam = true;
-      gaming.legendary = true;
-      gui = {
-        enable = true;
-        compositor.enable = true;
-        wallpaper = "${wallpapers}/gruvbox/road.jpg";
-        gtk.theme = { name = "Adwaita-dark"; };
+      gui.enable = true;
+      theme = {
+        colors = (import ../../modules/colorscheme/gruvbox).dark;
+        dark = true;
       };
-      colorscheme = (import ../../modules/colorscheme/gruvbox);
-      passwordHash =
-        "$6$PZYiMGmJIIHAepTM$Wx5EqTQ5GApzXx58nvi8azh16pdxrN6Qrv1wunDlzveOgawitWzcIxuj76X9V868fsPi/NOIEO8yVXqwzS9UF.";
+      wallpaper = "${wallpapers}/gruvbox/road.jpg";
+      gtk.theme.name = nixpkgs.lib.mkDefault "Adwaita-dark";
+      passwordHash = nixpkgs.lib.fileContents ../../private/password.sha512;
     }
 
     ./hardware-configuration.nix
@@ -33,14 +30,19 @@ nixpkgs.lib.nixosSystem {
     ../../modules/hardware
     ../../modules/nixos
     ../../modules/graphical
-    ../../modules/gaming
-    ../../modules/applications
-    ../../modules/mail/default.nix
+    ../../modules/applications/media.nix
+    ../../modules/applications/firefox.nix
+    ../../modules/applications/kitty.nix
+    ../../modules/applications/1password.nix
+    ../../modules/applications/discord.nix
+    ../../modules/applications/nautilus.nix
+    ../../modules/applications/obsidian.nix
+    ../../modules/mail
+    ../../modules/gaming/steam.nix
+    ../../modules/gaming/legendary.nix
     ../../modules/repositories/notes.nix
     ../../modules/services/keybase.nix
-    ../../modules/services/gnupg.nix
     ../../modules/services/mullvad.nix
     ../../modules/programming/nix.nix
-    ../../modules/programming/haskell.nix
   ];
 }

hosts/macbook/default.nix

@@ -14,12 +14,15 @@ darwin.lib.darwinSystem {
     })
     home-manager.darwinModules.home-manager
     {
-      identityFile = "/home/${globals.user}/.ssh/id_ed25519";
+      identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
       gui.enable = true;
-      colorscheme = (import ../../modules/colorscheme/gruvbox);
+      theme = {
+        colors = (import ../../modules/colorscheme/gruvbox).dark;
+        dark = true;
+      };
       mailUser = globals.user;
       networking.hostName = "noah-masur-mac";
-      nixpkgs.overlays = [ nur.overlay ];
+      nixpkgs.overlays = [ nur.overlay firefox-darwin.overlay ];
       # Set registry to flake packages, used for nix X commands
       nix.registry.nixpkgs.flake = nixpkgs;
     }
@@ -29,6 +32,7 @@ darwin.lib.darwinSystem {
     ../../modules/applications/alacritty.nix
     ../../modules/applications/kitty.nix
     ../../modules/applications/discord.nix
+    ../../modules/applications/firefox.nix
     ../../modules/repositories/notes.nix
     ../../modules/programming/nix.nix
     ../../modules/programming/terraform.nix

hosts/oracle/default.nix

@@ -28,7 +28,6 @@ nixpkgs.lib.nixosSystem {
       giteaServer = "git.masu.rs";
 
       # Disable passwords, only use SSH key
-      passwordHash = null;
       publicKey =
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
 

hosts/wsl/default.nix

@@ -16,9 +16,11 @@ nixpkgs.lib.nixosSystem {
       nix.registry.nixpkgs.flake = nixpkgs;
       identityFile = "/home/${globals.user}/.ssh/id_ed25519";
       gui.enable = false;
-      colorscheme = (import ../../modules/colorscheme/gruvbox);
-      passwordHash =
-        "$6$PZYiMGmJIIHAepTM$Wx5EqTQ5GApzXx58nvi8azh16pdxrN6Qrv1wunDlzveOgawitWzcIxuj76X9V868fsPi/NOIEO8yVXqwzS9UF.";
+      theme = {
+        colors = (import ../../modules/colorscheme/gruvbox).dark;
+        dark = true;
+      };
+      passwordHash = nixpkgs.lib.fileContents ../../private/password.sha512;
       wsl = {
         enable = true;
         automountPath = "/mnt";
@@ -32,7 +34,7 @@ nixpkgs.lib.nixosSystem {
     ../common.nix
     ../../modules/wsl
     ../../modules/nixos
-    ../../modules/mail/himalaya.nix
+    ../../modules/mail
     ../../modules/repositories/notes.nix
     ../../modules/programming/nix.nix
     ../../modules/programming/lua.nix

modules/applications/alacritty.nix

@@ -23,8 +23,8 @@
           key_bindings = [
             # Used for word completion in fish_user_key_bindings
             {
-              key = "L";
-              mods = "Control|Shift";
+              key = "Return";
+              mods = "Shift";
               chars = "\\x1F";
             }
             # Used for searching nixpkgs in fish_user_key_bindings
@@ -54,32 +54,32 @@
           ];
           colors = {
             primary = {
-              background = config.colorscheme.base00;
-              foreground = config.colorscheme.base05;
+              background = config.theme.colors.base00;
+              foreground = config.theme.colors.base05;
             };
             cursor = {
               text = "#1d2021";
-              cursor = config.colorscheme.base05;
+              cursor = config.theme.colors.base05;
             };
             normal = {
               black = "#1d2021";
-              red = config.colorscheme.base08;
-              green = config.colorscheme.base0B;
-              yellow = config.colorscheme.base0A;
-              blue = config.colorscheme.base0D;
-              magenta = config.colorscheme.base0E;
-              cyan = config.colorscheme.base0C;
-              white = config.colorscheme.base05;
+              red = config.theme.colors.base08;
+              green = config.theme.colors.base0B;
+              yellow = config.theme.colors.base0A;
+              blue = config.theme.colors.base0D;
+              magenta = config.theme.colors.base0E;
+              cyan = config.theme.colors.base0C;
+              white = config.theme.colors.base05;
             };
             bright = {
-              black = config.colorscheme.base03;
-              red = config.colorscheme.base09;
-              green = config.colorscheme.base01;
-              yellow = config.colorscheme.base02;
-              blue = config.colorscheme.base04;
-              magenta = config.colorscheme.base06;
-              cyan = config.colorscheme.base0F;
-              white = config.colorscheme.base07;
+              black = config.theme.colors.base03;
+              red = config.theme.colors.base09;
+              green = config.theme.colors.base01;
+              yellow = config.theme.colors.base02;
+              blue = config.theme.colors.base04;
+              magenta = config.theme.colors.base06;
+              cyan = config.theme.colors.base0F;
+              white = config.theme.colors.base07;
             };
           };
           draw_bold_text_with_bright_colors = false;

modules/applications/firefox.nix

@@ -9,6 +9,7 @@
 
       programs.firefox = {
         enable = true;
+        package = lib.mkIf pkgs.stdenv.isDarwin pkgs.firefox-bin;
         extensions = with pkgs.nur.repos.rycee.firefox-addons; [
           ublock-origin
           vimium
@@ -38,6 +39,7 @@
             "browser.toolbars.bookmarks.visibility" = "newtab";
             "browser.startup.page" = 3; # Restore previous session
             "browser.newtabpage.enabled" = false; # Make new tabs blank
+            "dom.forms.autocomplete.formautofill" = false; # Disable autofill
             "general.autoScroll" = true; # Drag middle-mouse to scroll
             "services.sync.prefs.sync.general.autoScroll" =
               false; # Prevent disabling autoscroll
@@ -45,68 +47,70 @@
             "toolkit.legacyUserProfileCustomizations.stylesheets" =
               true; # Allow userChrome.css
             "layout.css.color-mix.enabled" = true;
+            "ui.systemUsesDarkTheme" =
+              if config.theme.dark == true then 1 else 0;
           };
           userChrome = ''
             :root {
-              --focus-outline-color: ${config.colorscheme.base04} !important;
-              --toolbar-color: ${config.colorscheme.base07} !important;
+              --focus-outline-color: ${config.theme.colors.base04} !important;
+              --toolbar-color: ${config.theme.colors.base07} !important;
               --tab-min-height: 30px !important;
             }
             /* Background of tab bar */
             .toolbar-items {
-              background-color: ${config.colorscheme.base00} !important;
+              background-color: ${config.theme.colors.base00} !important;
             }
             /* Tabs themselves */
             .tabbrowser-tab .tab-stack {
               border-radius: 5px 5px 0 0;
               overflow: hidden;
-              background-color: ${config.colorscheme.base00};
-              color: ${config.colorscheme.base06} !important;
+              background-color: ${config.theme.colors.base00};
+              color: ${config.theme.colors.base06} !important;
             }
             .tab-content {
               border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 40%, transparent);
               border-radius: 5px 5px 0 0;
-              background-color: ${config.colorscheme.base00};
-              color: ${config.colorscheme.base06} !important;
+              background-color: ${config.theme.colors.base00};
+              color: ${config.theme.colors.base06} !important;
             }
             .tab-content[selected=true] {
               border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 25%, transparent);
-              background-color: ${config.colorscheme.base01} !important;
-              color: ${config.colorscheme.base07} !important;
+              background-color: ${config.theme.colors.base01} !important;
+              color: ${config.theme.colors.base07} !important;
             }
             /* Below tab bar */
             #nav-bar {
-              background: ${config.colorscheme.base01} !important;
+              background: ${config.theme.colors.base01} !important;
             }
             /* URL bar in nav bar */
             #urlbar[focused=true] {
-              color: ${config.colorscheme.base07} !important;
-              background: ${config.colorscheme.base02} !important;
-              caret-color: ${config.colorscheme.base05} !important;
+              color: ${config.theme.colors.base07} !important;
+              background: ${config.theme.colors.base02} !important;
+              caret-color: ${config.theme.colors.base05} !important;
             }
             #urlbar:not([focused=true]) {
-              color: ${config.colorscheme.base04} !important;
-              background: ${config.colorscheme.base02} !important;
+              color: ${config.theme.colors.base04} !important;
+              background: ${config.theme.colors.base02} !important;
             }
             #urlbar ::-moz-selection {
-              color: ${config.colorscheme.base07} !important;
-              background: ${config.colorscheme.base02} !important;
+              color: ${config.theme.colors.base07} !important;
+              background: ${config.theme.colors.base02} !important;
             }
             #urlbar-input-container {
-              border: 1px solid ${config.colorscheme.base01} !important;
+              border: 1px solid ${config.theme.colors.base01} !important;
             }
             #urlbar-background {
-              background: ${config.colorscheme.base01} !important;
+              background: ${config.theme.colors.base01} !important;
             }
             /* Text in URL bar */
             #urlbar-input, #urlbar-scheme, .searchbar-textbox {
-              color: ${config.colorscheme.base07} !important;
+              color: ${config.theme.colors.base07} !important;
             }
           '';
           userContent = ''
             @-moz-document url-prefix(about:blank) {
               * {
-                background-color:${config.colorscheme.base01} !important;
+                background-color:${config.theme.colors.base01} !important;
               }
             }
           '';

modules/applications/kitty.nix

@@ -9,51 +9,54 @@
         environment = { };
         extraConfig = "";
         font.size = 14;
-        keybindings = { };
+        keybindings = {
+          "shift+enter" = "send_text all \\x1F";
+          "super+f" = "toggle_fullscreen";
+        };
         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;
+          background = config.theme.colors.base00;
+          foreground = config.theme.colors.base05;
+          selection_background = config.theme.colors.base05;
+          selection_foreground = config.theme.colors.base00;
+          url_color = config.theme.colors.base04;
+          cursor = config.theme.colors.base05;
+          active_border_color = config.theme.colors.base03;
+          inactive_border_color = config.theme.colors.base01;
+          active_tab_background = config.theme.colors.base00;
+          active_tab_foreground = config.theme.colors.base05;
+          inactive_tab_background = config.theme.colors.base01;
+          inactive_tab_foreground = config.theme.colors.base04;
+          tab_bar_background = config.theme.colors.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;
+          color0 = config.theme.colors.base00;
+          color1 = config.theme.colors.base08;
+          color2 = config.theme.colors.base0B;
+          color3 = config.theme.colors.base0A;
+          color4 = config.theme.colors.base0D;
+          color5 = config.theme.colors.base0E;
+          color6 = config.theme.colors.base0C;
+          color7 = config.theme.colors.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;
+          color8 = config.theme.colors.base03;
+          color9 = config.theme.colors.base08;
+          color10 = config.theme.colors.base0B;
+          color11 = config.theme.colors.base0A;
+          color12 = config.theme.colors.base0D;
+          color13 = config.theme.colors.base0E;
+          color14 = config.theme.colors.base0C;
+          color15 = config.theme.colors.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;
+          color16 = config.theme.colors.base09;
+          color17 = config.theme.colors.base0F;
+          color18 = config.theme.colors.base01;
+          color19 = config.theme.colors.base02;
+          color20 = config.theme.colors.base04;
+          color21 = config.theme.colors.base06;
 
           # Scrollback
           scrolling_lines = 10000;
@@ -66,6 +69,9 @@
 
           tab_bar_edge = "top";
           tab_bar_style = "slant";
+
+          # Audio
+          enable_audio_bell = false;
         };
       };
     };

modules/applications/media.nix

@@ -5,6 +5,7 @@
       mpv # Video viewer
       sxiv # Image viewer
       mupdf # PDF viewer
+      zathura # PDF viewer
     ];
   };
 

modules/applications/nautilus.nix

@@ -7,6 +7,13 @@
         gnome.nautilus
         gnome.sushi # Quick preview with spacebar
       ];
+
+      programs.fish.functions = {
+        qr = {
+          body =
+            "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | ${pkgs.gnome.sushi}/bin/sushi /tmp/qr.png";
+        };
+      };
     };
   };
 

modules/colorscheme/gruvbox/default.nix

@@ -2,21 +2,44 @@
   name = "gruvbox"; # Dark, Medium
   author =
     "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)";
-  base00 = "#282828"; # ----
-  base01 = "#3c3836"; # ---
-  base02 = "#504945"; # --
-  base03 = "#665c54"; # -
-  base04 = "#bdae93"; # +
-  base05 = "#d5c4a1"; # ++
-  base06 = "#ebdbb2"; # +++
-  base07 = "#fbf1c7"; # ++++
-  base08 = "#fb4934"; # red
-  base09 = "#fe8019"; # orange
-  base0A = "#fabd2f"; # yellow
-  base0B = "#b8bb26"; # green
-  base0C = "#8ec07c"; # aqua/cyan
-  base0D = "#83a598"; # blue
-  base0E = "#d3869b"; # purple
-  base0F = "#d65d0e"; # brown
-  neovimConfig = ./neovim.lua;
+  dark = {
+    base00 = "#282828"; # ----
+    base01 = "#3c3836"; # ---
+    base02 = "#504945"; # --
+    base03 = "#665c54"; # -
+    base04 = "#bdae93"; # +
+    base05 = "#d5c4a1"; # ++
+    base06 = "#ebdbb2"; # +++
+    base07 = "#fbf1c7"; # ++++
+    base08 = "#fb4934"; # red
+    base09 = "#fe8019"; # orange
+    base0A = "#fabd2f"; # yellow
+    base0B = "#b8bb26"; # green
+    base0C = "#8ec07c"; # aqua/cyan
+    base0D = "#83a598"; # blue
+    base0E = "#d3869b"; # purple
+    base0F = "#d65d0e"; # brown
+    neovimConfig = ./neovim.lua;
+    batTheme = "gruvbox-dark";
+  };
+  light = {
+    base00 = "#fbf1c7"; # ----
+    base01 = "#ebdbb2"; # ---
+    base02 = "#d5c4a1"; # --
+    base03 = "#bdae93"; # -
+    base04 = "#665c54"; # +
+    base05 = "#504945"; # ++
+    base06 = "#3c3836"; # +++
+    base07 = "#282828"; # ++++
+    base08 = "#9d0006"; # red
+    base09 = "#af3a03"; # orange
+    base0A = "#b57614"; # yellow
+    base0B = "#79740e"; # green
+    base0C = "#427b58"; # aqua/cyan
+    base0D = "#076678"; # blue
+    base0E = "#8f3f71"; # purple
+    base0F = "#d65d0e"; # brown
+    neovimConfig = ./neovim.lua;
+    batTheme = "gruvbox-light";
+  };
 }

modules/darwin/fonts.nix

@@ -3,15 +3,13 @@
   home-manager.users.${config.user} = {
 
     home.packages = with pkgs;
-      [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
+      [ (nerdfonts.override { fonts = [ "VictorMono" ]; }) ];
 
-    programs.alacritty.settings = {
-      font.normal.family = "FiraCode Nerd Font Mono";
-    };
+    programs.alacritty.settings = { font.normal.family = "VictorMono"; };
 
     programs.kitty.font = {
-      package = pkgs.nerdfonts;
-      name = "FiraCode";
+      package = (pkgs.nerdfonts.override { fonts = [ "VictorMono" ]; });
+      name = "VictorMono Nerd Font Mono";
     };
 
   };

modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua

@@ -9,24 +9,25 @@ WORK_RIGHT_MONITOR = "DELL U2415 (1)"
 LAPTOP_MONITOR = "Built-in Retina Display"
 
 -- Used to find out the name of the monitor in Hammerspoon
-function dump(o)
-    if type(o) == "table" then
-        local s = "{ "
-        for k, v in pairs(o) do
-            if type(k) ~= "number" then
-                k = '"' .. k .. '"'
-            end
-            s = s .. "[" .. k .. "] = " .. dump(v) .. ","
-        end
-        return s .. "} "
-    else
-        return tostring(o)
-    end
-end
+-- local function dump(o)
+--     if type(o) == "table" then
+--         local s = "{ "
+--         for k, v in pairs(o) do
+--             if type(k) ~= "number" then
+--                 k = '"' .. k .. '"'
+--             end
+--             s = s .. "[" .. k .. "] = " .. dump(v) .. ","
+--         end
+--         return s .. "} "
+--     else
+--         return tostring(o)
+--     end
+-- end
+
 -- Turn on when looking for the monitor name
 -- print(dump(hs.screen.allScreens()))
 
-function concat(...)
+local function concat(...)
     local res = {}
     for _, tab in ipairs({ ... }) do
         for _, elem in ipairs(tab) do
@@ -36,12 +37,12 @@ function concat(...)
     return res
 end
 
-function worklayout()
+local function worklayout()
     hs.hotkey.bind({ "alt", "ctrl", "cmd" }, "l", function()
         local u = hs.geometry.unitrect
         -- set the layout
         local left = {
-            -- { "Alacritty", nil, WORK_LEFT_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
+            { "kitty", nil, WORK_LEFT_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
         }
         local right = {
             { "Slack", nil, WORK_RIGHT_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },

modules/darwin/homebrew.nix

@@ -32,7 +32,6 @@
       "openjdk" # Required by Apache Directory Studio
     ];
     casks = [
-      "firefox" # Firefox packaging on Nix is broken for macOS
       "1password" # 1Password packaging on Nix is broken for macOS
       "scroll-reverser" # Different scroll style for mouse vs. trackpad
       "meetingbar" # Show meetings in menu bar

modules/darwin/kitty.nix

@@ -6,9 +6,11 @@
       darwinLaunchOptions = [ "--start-as=fullscreen" ];
       font.size = lib.mkForce 20;
       settings = {
-        shell = "${pkgs.fish}/bin/fish";
+        shell = "/run/current-system/sw/bin/fish";
         macos_traditional_fullscreen = true;
         macos_quit_when_last_window_closed = true;
+        disable_ligatures = "always";
+        macos_option_as_alt = true;
       };
     };
   };

modules/darwin/nixpkgs.nix

@@ -21,7 +21,7 @@
         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 -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#macbook";
             commandline --function execute
           '';
         };

modules/darwin/system.nix

@@ -1,7 +1,9 @@
-{ ... }: {
+{ pkgs, ... }: {
 
   services.nix-daemon.enable = true;
 
+  environment.shells = [ pkgs.fish ];
+
   security.pam.enableSudoTouchIdAuth = true;
 
   system = {
@@ -130,6 +132,16 @@
       defaults write com.apple.screensaver askForPassword -int 1
       defaults write com.apple.screensaver askForPasswordDelay -int 0
 
+      echo "Allow apps from anywhere"
+      SPCTL=$(spctl --status)
+      if ! [ "$SPCTL" = "assessments disabled" ]; then
+          sudo spctl --master-disable
+      fi
+
+    '';
+
+    # User-level settings
+    activationScripts.postUserActivation.text = ''
       echo "Show the ~/Library folder"
       chflags nohidden ~/Library
 
@@ -154,22 +166,17 @@
           "$(__dock_item /Applications/1Password.app)" \
           "$(__dock_item /Applications/Slack.app)" \
           "$(__dock_item /System/Applications/Calendar.app)" \
-          "$(__dock_item /Applications/Firefox.app)" \
+          "$(__dock_item ${pkgs.firefox-bin}/Applications/Firefox.app)" \
           "$(__dock_item /System/Applications/Messages.app)" \
           "$(__dock_item /System/Applications/Mail.app)" \
           "$(__dock_item /Applications/Mimestream.app)" \
           "$(__dock_item /Applications/zoom.us.app)" \
+          "$(__dock_item ${pkgs.discord}/Applications/Discord.app)" \
           "$(__dock_item /Applications/Obsidian.app)" \
-          "$(__dock_item /Applications/Alacritty.app)" \
+          "$(__dock_item ${pkgs.kitty}/Applications/kitty.app)" \
           "$(__dock_item /System/Applications/System\ Preferences.app)"
-
-      echo "Allow apps from anywhere"
-      SPCTL=$(spctl --status)
-      if ! [ "$SPCTL" = "assessments disabled" ]; then
-          sudo spctl --master-disable
-      fi
-
     '';
+
   };
 
 }

modules/darwin/user.nix

@@ -4,6 +4,12 @@
     # macOS user
     home = config.homePath;
     shell = pkgs.fish; # Default shell
+
+  };
+
+  # Used for aerc
+  home-manager.users.${config.user} = {
+    home.sessionVariables = { XDG_CONFIG_HOME = "${config.homePath}/.config"; };
   };
 
 }

modules/gaming/default.nix

@@ -1,7 +1,5 @@
 { config, ... }: {
 
-  imports = [ ./leagueoflegends.nix ./lutris.nix ./steam.nix ./legendary.nix ];
-
   config = {
     hardware.opengl = {
       enable = true;

modules/gaming/legendary.nix

@@ -4,10 +4,9 @@ let home-packages = config.home-manager.users.${config.user}.home.packages;
 
 in {
 
-  options.gaming.legendary =
-    lib.mkEnableOption "Legendary - Epic Games Launcher";
+  imports = [ ./. ];
 
-  config = lib.mkIf config.gaming.legendary {
+  config = {
     environment.systemPackages = with pkgs; [
       legendary-gl
       rare # GUI for Legendary (not working)

modules/gaming/steam.nix

@@ -1,8 +1,8 @@
 { config, pkgs, lib, ... }: {
 
-  options.gaming.steam = lib.mkEnableOption "Steam";
+  imports = [ ./. ];
 
-  config = lib.mkIf config.gaming.steam {
+  config = {
     hardware.steam-hardware.enable = true;
     unfreePackages = [ "steam" "steam-original" "steamcmd" "steam-run" ];
     environment.systemPackages = with pkgs; [

modules/graphical/default.nix

@@ -1,53 +1,29 @@
 { lib, ... }: {
 
-  imports = [
-    ./xorg.nix
-    ./fonts.nix
-    ./i3.nix
-    ./polybar.nix
-    ./picom.nix
-    # ./dmenu.nix
-    ./rofi.nix
-  ];
+  imports =
+    [ ./xorg.nix ./fonts.nix ./i3.nix ./polybar.nix ./picom.nix ./rofi.nix ];
 
-  options = with lib; {
+  options = {
 
-    gui = {
-      compositor.enable = mkEnableOption {
-        description = "Enable transparency, blur, shadows";
-        default = false;
-      };
-      launcherCommand = mkOption {
-        type = types.str;
-        description = "Command to use for launching";
-      };
-      systemdSearch = mkOption {
-        type = types.str;
-        description = "Command to use for interacting with systemd";
-      };
-      altTabCommand = mkOption {
-        type = types.str;
-        description = "Command to use for choosing windows";
-      };
-      toggleBarCommand = lib.mkOption {
-        type = lib.types.str;
-        description = "Command to hide and show the status bar.";
-      };
-      gtk.theme = {
-        name = mkOption {
-          type = types.str;
-          description = "Theme name for GTK applications";
-        };
-        package = mkOption {
-          type = types.str;
-          description = "Theme package name for GTK applications";
-          default = "gnome-themes-extra";
-        };
-      };
-      wallpaper = mkOption {
-        type = types.path;
-        description = "Wallpaper background image file";
-      };
+    launcherCommand = lib.mkOption {
+      type = lib.types.str;
+      description = "Command to use for launching";
+    };
+    systemdSearch = lib.mkOption {
+      type = lib.types.str;
+      description = "Command to use for interacting with systemd";
+    };
+    altTabCommand = lib.mkOption {
+      type = lib.types.str;
+      description = "Command to use for choosing windows";
+    };
+    toggleBarCommand = lib.mkOption {
+      type = lib.types.str;
+      description = "Command to hide and show the status bar.";
+    };
+    wallpaper = lib.mkOption {
+      type = lib.types.path;
+      description = "Wallpaper background image file";
     };
 
   };

modules/graphical/i3.nix

@@ -5,7 +5,7 @@ let
   lockCmd =
     "${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span";
   lockUpdate =
-    "${pkgs.betterlockscreen}/bin/betterlockscreen --update ${config.gui.wallpaper} --display 1 --span";
+    "${pkgs.betterlockscreen}/bin/betterlockscreen --update ${config.wallpaper} --display 1 --span";
 
 in {
 
@@ -43,22 +43,22 @@ in {
           modifier = modifier;
           assigns = {
             "${ws1}" = [{ class = "Firefox"; }];
-            "${ws2}" = [{ class = "Alacritty"; }];
+            "${ws2}" = [{ class = "kitty"; }];
             "${ws3}" = [{ class = "discord"; }];
             "${ws4}" = [{ class = "Steam"; }];
           };
           bars = [{ command = "echo"; }]; # Disable i3bar
           colors = let
-            background = config.colorscheme.base00;
-            inactiveBackground = config.colorscheme.base01;
-            border = config.colorscheme.base01;
-            inactiveBorder = config.colorscheme.base01;
-            text = config.colorscheme.base07;
-            inactiveText = config.colorscheme.base04;
-            urgentBackground = config.colorscheme.base08;
+            background = config.theme.colors.base00;
+            inactiveBackground = config.theme.colors.base01;
+            border = config.theme.colors.base01;
+            inactiveBorder = config.theme.colors.base01;
+            text = config.theme.colors.base07;
+            inactiveText = config.theme.colors.base04;
+            urgentBackground = config.theme.colors.base08;
             indicator = "#00000000";
           in {
-            background = config.colorscheme.base00;
+            background = config.theme.colors.base00;
             focused = {
               inherit background indicator text border;
               childBorder = background;
@@ -111,12 +111,12 @@ in {
 
             # Launchers
             "${modifier}+Return" =
-              "exec --no-startup-id alacritty; workspace ${ws2}; layout tabbed";
+              "exec --no-startup-id kitty; workspace ${ws2}; layout tabbed";
             "${modifier}+space" =
-              "exec --no-startup-id ${config.gui.launcherCommand}";
+              "exec --no-startup-id ${config.launcherCommand}";
             "${modifier}+Shift+s" =
-              "exec --no-startup-id ${config.gui.systemdSearch}";
-            "Mod1+Tab" = "exec --no-startup-id ${config.gui.altTabCommand}";
+              "exec --no-startup-id ${config.systemdSearch}";
+            "Mod1+Tab" = "exec --no-startup-id ${config.altTabCommand}";
             "${modifier}+Shift+c" = "reload";
             "${modifier}+Shift+r" = "restart";
             "${modifier}+Shift+q" = ''
@@ -125,7 +125,7 @@ in {
 
             # Window options
             "${modifier}+q" = "kill";
-            "${modifier}+b" = "exec ${config.gui.toggleBarCommand}";
+            "${modifier}+b" = "exec ${config.toggleBarCommand}";
             "${modifier}+f" = "fullscreen toggle";
             "${modifier}+h" = "focus left";
             "${modifier}+j" = "focus down";
@@ -205,12 +205,18 @@ in {
           modes = { };
           startup = [
             {
-              command = "feh --bg-fill ${config.gui.wallpaper}";
+              command = "feh --bg-fill ${config.wallpaper}";
               always = true;
               notification = false;
             }
             {
-              command = "i3-msg workspace ${ws1}";
+              command =
+                "i3-msg workspace ${ws2}, move workspace to output right";
+              notification = false;
+            }
+            {
+              command =
+                "i3-msg workspace ${ws1}, move workspace to output left";
               notification = false;
             }
           ];

modules/graphical/picom.nix

@@ -1,50 +1,49 @@
 { config, lib, ... }: {
 
-  config =
-    lib.mkIf (config.services.xserver.enable && config.gui.compositor.enable) {
-      home-manager.users.${config.user} = {
+  config = lib.mkIf (config.services.xserver.enable) {
+    home-manager.users.${config.user} = {
 
-        services.picom = {
-          enable = true;
-          backend = "glx";
-          settings = {
-            blur = false;
-            blurExclude = [ ];
-            inactiveDim = "0.05";
-            noDNDShadow = false;
-            noDockShadow = false;
-            # shadow-radius = 20
-            # '';
-            # shadow-radius = 20
-            # corner-radius = 10
-            # blur-size = 20
-            # rounded-corners-exclude = [
-            # "window_type = 'dock'",
-            # "class_g = 'i3-frame'"
-            # ]
-            # '';
-          };
-          fade = false;
-          experimentalBackends = true;
-          inactiveOpacity = 1.0;
-          menuOpacity = 1.0;
-          opacityRules = [
-            "0:_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_HIDDEN'" # Hide tabbed windows
-          ];
-          shadow = false;
-          shadowExclude = [ ];
-          shadowOffsets = [ (-10) (-10) ];
-          shadowOpacity = 0.5;
-          vSync = true;
+      services.picom = {
+        enable = true;
+        backend = "glx";
+        settings = {
+          blur = false;
+          blurExclude = [ ];
+          inactiveDim = "0.05";
+          noDNDShadow = false;
+          noDockShadow = false;
+          # shadow-radius = 20
+          # '';
+          # shadow-radius = 20
+          # corner-radius = 10
+          # blur-size = 20
+          # rounded-corners-exclude = [
+          # "window_type = 'dock'",
+          # "class_g = 'i3-frame'"
+          # ]
+          # '';
         };
-
-        xsession.windowManager.i3.config.startup = [{
-          command = "systemctl --user restart picom";
-          always = true;
-          notification = false;
-        }];
-
+        fade = false;
+        experimentalBackends = true;
+        inactiveOpacity = 1.0;
+        menuOpacity = 1.0;
+        opacityRules = [
+          "0:_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_HIDDEN'" # Hide tabbed windows
+        ];
+        shadow = false;
+        shadowExclude = [ ];
+        shadowOffsets = [ (-10) (-10) ];
+        shadowOpacity = 0.5;
+        vSync = true;
       };
+
+      xsession.windowManager.i3.config.startup = [{
+        command = "systemctl --user restart picom";
+        always = true;
+        notification = false;
+      }];
+
     };
+  };
 
 }

modules/graphical/polybar.nix

@@ -2,7 +2,7 @@
 
   config = lib.mkIf config.services.xserver.enable {
 
-    gui.toggleBarCommand = "polybar-msg cmd toggle";
+    toggleBarCommand = "polybar-msg cmd toggle";
 
     home-manager.users.${config.user} = {
 
@@ -23,14 +23,14 @@
             # offset-y = -5;
             # offset-y = "5%";
             # dpi = 96;
-            background = config.colorscheme.base01;
-            foreground = config.colorscheme.base05;
+            background = config.theme.colors.base01;
+            foreground = config.theme.colors.base05;
             line-size = "3pt";
             border-top-size = 0;
             border-right-size = 0;
             border-left-size = 0;
             border-bottom-size = "4pt";
-            border-color = config.colorscheme.base00;
+            border-color = config.theme.colors.base00;
             padding-left = 2;
             padding-right = 2;
             module-margin = 1;
@@ -58,35 +58,35 @@
             fuzzy-match = true;
             format = "<label-state> <label-mode>";
             label-focused = "%name%";
-            label-focused-foreground = config.colorscheme.base01;
-            label-focused-background = config.colorscheme.base05;
-            label-focused-underline = config.colorscheme.base03;
+            label-focused-foreground = config.theme.colors.base01;
+            label-focused-background = config.theme.colors.base05;
+            label-focused-underline = config.theme.colors.base03;
             label-focused-padding = padding;
             label-unfocused = "%name%";
             label-unfocused-padding = padding;
             label-visible = "%name%";
-            label-visible-underline = config.colorscheme.base01;
+            label-visible-underline = config.theme.colors.base01;
             label-visible-padding = padding;
             label-urgent = "%name%";
-            label-urgent-foreground = config.colorscheme.base00;
-            label-urgent-background = config.colorscheme.base08;
-            label-urgent-underline = config.colorscheme.base0F;
+            label-urgent-foreground = config.theme.colors.base00;
+            label-urgent-background = config.theme.colors.base08;
+            label-urgent-underline = config.theme.colors.base0F;
             label-urgent-padding = padding;
           };
           "module/xworkspaces" = {
             type = "internal/xworkspaces";
             label-active = "%name%";
-            label-active-background = config.colorscheme.base05;
-            label-active-foreground = config.colorscheme.base01;
-            label-active-underline = config.colorscheme.base03;
+            label-active-background = config.theme.colors.base05;
+            label-active-foreground = config.theme.colors.base01;
+            label-active-underline = config.theme.colors.base03;
             label-active-padding = 1;
             label-occupied = "%name%";
             label-occupied-padding = 1;
             label-urgent = "%name%";
-            label-urgent-background = config.colorscheme.base08;
+            label-urgent-background = config.theme.colors.base08;
             label-urgent-padding = 1;
             label-empty = "%name%";
-            label-empty-foreground = config.colorscheme.base06;
+            label-empty-foreground = config.theme.colors.base06;
             label-empty-padding = 1;
           };
           "module/xwindow" = {
@@ -108,10 +108,10 @@
             format-volume = "<ramp-volume> <label-volume>";
             # format-volume-background = colors.background;
             # label-volume-background = colors.background;
-            format-volume-foreground = config.colorscheme.base0B;
+            format-volume-foreground = config.theme.colors.base0B;
             label-volume = "%percentage%%";
             label-muted = "ﱝ ---";
-            label-muted-foreground = config.colorscheme.base03;
+            label-muted-foreground = config.theme.colors.base03;
             ramp-volume-0 = "";
             ramp-volume-1 = "墳";
             ramp-volume-2 = "";
@@ -163,7 +163,7 @@
             date = "%d %b  %l:%M %p";
             date-alt = "%Y-%m-%d %H:%M:%S";
             label = "%date%";
-            label-foreground = config.colorscheme.base0A;
+            label-foreground = config.theme.colors.base0A;
             # format-background = colors.background;
           };
           "settings" = {

modules/graphical/rofi.nix

@@ -25,19 +25,19 @@
           # Inspired by https://github.com/sherubthakur/dotfiles/blob/master/users/modules/desktop-environment/rofi/launcher.rasi
 
           "*" = {
-            background-color = mkLiteral config.colorscheme.base00;
-            foreground-color = mkLiteral config.colorscheme.base07;
-            text-color = mkLiteral config.colorscheme.base07;
-            border-color = mkLiteral config.colorscheme.base04;
+            background-color = mkLiteral config.theme.colors.base00;
+            foreground-color = mkLiteral config.theme.colors.base07;
+            text-color = mkLiteral config.theme.colors.base07;
+            border-color = mkLiteral config.theme.colors.base04;
           };
 
           # Holds the entire window
           "#window" = {
             transparency = "real";
-            background-color = mkLiteral config.colorscheme.base00;
-            text-color = mkLiteral config.colorscheme.base07;
+            background-color = mkLiteral config.theme.colors.base00;
+            text-color = mkLiteral config.theme.colors.base07;
             border = mkLiteral "4px";
-            border-color = mkLiteral config.colorscheme.base04;
+            border-color = mkLiteral config.theme.colors.base04;
             border-radius = mkLiteral "4px";
             width = mkLiteral "850px";
             padding = mkLiteral "15px";
@@ -45,10 +45,10 @@
 
           # Wrapper around bar and results
           "#mainbox" = {
-            background-color = mkLiteral config.colorscheme.base00;
+            background-color = mkLiteral config.theme.colors.base00;
             border = mkLiteral "0px";
             border-radius = mkLiteral "0px";
-            border-color = mkLiteral config.colorscheme.base04;
+            border-color = mkLiteral config.theme.colors.base04;
             children = map mkLiteral [ "inputbar" "listview" ];
             spacing = mkLiteral "10px";
             padding = mkLiteral "10px";
@@ -59,7 +59,7 @@
             expand = false;
             str = ":";
             margin = mkLiteral "0px 0.3em 0em 0em";
-            text-color = mkLiteral config.colorscheme.base07;
+            text-color = mkLiteral config.theme.colors.base07;
           };
 
           # Command prompt left of the input
@@ -67,7 +67,7 @@
 
           # Actual text box
           "#entry" = {
-            placeholder-color = mkLiteral config.colorscheme.base03;
+            placeholder-color = mkLiteral config.theme.colors.base03;
             expand = true;
             horizontal-align = "0";
             placeholder = "Launch Program";
@@ -85,7 +85,7 @@
 
           # Results
           "#listview" = {
-            background-color = mkLiteral config.colorscheme.base00;
+            background-color = mkLiteral config.theme.colors.base00;
             padding = mkLiteral "0px";
             columns = 1;
             lines = 12;
@@ -104,9 +104,9 @@
           "#element.selected" = {
             border = mkLiteral "1px";
             border-radius = mkLiteral "4px";
-            border-color = mkLiteral config.colorscheme.base07;
-            background-color = mkLiteral config.colorscheme.base04;
-            text-color = mkLiteral config.colorscheme.base00;
+            border-color = mkLiteral config.theme.colors.base07;
+            background-color = mkLiteral config.theme.colors.base04;
+            text-color = mkLiteral config.theme.colors.base00;
           };
 
           "#element-text" = {
@@ -116,8 +116,8 @@
             margin = mkLiteral "0px 2.5px 0px 2.5px";
           };
           "#element-text.selected" = {
-            background-color = mkLiteral config.colorscheme.base04;
-            text-color = mkLiteral config.colorscheme.base00;
+            background-color = mkLiteral config.theme.colors.base04;
+            text-color = mkLiteral config.theme.colors.base00;
           };
 
           # Not sure how to get icons
@@ -125,11 +125,11 @@
             size = mkLiteral "18px";
             border = mkLiteral "0px";
             padding = mkLiteral "2px 5px 2px 2px";
-            background-color = mkLiteral config.colorscheme.base00;
+            background-color = mkLiteral config.theme.colors.base00;
           };
           "#element-icon.selected" = {
-            background-color = mkLiteral config.colorscheme.base04;
-            text-color = mkLiteral config.colorscheme.base00;
+            background-color = mkLiteral config.theme.colors.base04;
+            text-color = mkLiteral config.theme.colors.base00;
           };
 
         };
@@ -144,9 +144,9 @@
 
     };
 
-    gui.launcherCommand = "${pkgs.rofi}/bin/rofi -show run -modi run";
-    gui.systemdSearch = "${pkgs.rofi-systemd}/bin/rofi-systemd";
-    gui.altTabCommand = "${pkgs.rofi}/bin/rofi -show window -modi window";
+    launcherCommand = "${pkgs.rofi}/bin/rofi -show run -modi run";
+    systemdSearch = "${pkgs.rofi-systemd}/bin/rofi-systemd";
+    altTabCommand = "${pkgs.rofi}/bin/rofi -show window -modi window";
 
   };
 

modules/graphical/xorg.nix

@@ -1,15 +1,25 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }: {
 
-let
-
-  gtkTheme = {
-    name = config.gui.gtk.theme.name;
-    package = pkgs.${config.gui.gtk.theme.package};
+  options = {
+    gtk.theme = {
+      name = lib.mkOption {
+        type = lib.types.str;
+        description = "Theme name for GTK applications";
+      };
+      package = lib.mkOption {
+        type = lib.types.str;
+        description = "Theme package name for GTK applications";
+        default = "gnome-themes-extra";
+      };
+    };
   };
 
-in {
-
-  config = lib.mkIf config.gui.enable {
+  config = let
+    gtkTheme = {
+      name = config.gtk.theme.name;
+      package = pkgs."${config.gtk.theme.package}";
+    };
+  in lib.mkIf config.gui.enable {
 
     # Enable the X11 windowing system.
     services.xserver = {
@@ -22,7 +32,7 @@ in {
       displayManager = {
         lightdm = {
           enable = config.services.xserver.enable;
-          background = config.gui.wallpaper;
+          background = config.wallpaper;
 
           # Make the login screen dark
           greeters.gtk.theme = gtkTheme;
@@ -46,7 +56,7 @@ in {
     services.dbus.packages = [ pkgs.dconf ];
     programs.dconf.enable = true;
 
-    environment.sessionVariables = { GTK_THEME = config.gui.gtk.theme.name; };
+    environment.sessionVariables = { GTK_THEME = config.gtk.theme.name; };
 
     home-manager.users.${config.user} = {
 
@@ -55,7 +65,10 @@ in {
         pbpaste = "xclip -selection clipboard -out";
       };
 
-      gtk = let gtkExtraConfig = { gtk-application-prefer-dark-theme = true; };
+      gtk = let
+        gtkExtraConfig = {
+          gtk-application-prefer-dark-theme = config.theme.dark;
+        };
       in {
         enable = true;
         theme = gtkTheme;

modules/hardware/audio.nix

@@ -33,8 +33,14 @@ in {
   config = lib.mkIf config.gui.enable {
     sound.enable = true;
 
-    # Enable PulseAudio
-    hardware.pulseaudio.enable = true;
+    # Enable PipeWire
+    services.pipewire = {
+      enable = true;
+      pulse.enable = true;
+    };
+
+    # Provides audio source with background noise filtered
+    programs.noisetorch.enable = true;
 
     # These aren't necessary, but helpful for the user
     environment.systemPackages = with pkgs; [
@@ -52,7 +58,8 @@ in {
         # Make sure that Volnoti actually starts (home-manager doesn't start
         # user daemon's automatically)
         startup = [{
-          command = "systemctl --user restart volnoti";
+          command =
+            "systemctl --user restart volnoti --alpha 0.15 --radius 40 --timeout 0.2";
           always = true;
           notification = false;
         }];

modules/mail/aerc.nix

@@ -51,7 +51,7 @@
 
             "<Enter>" = ":view<Enter>";
             d = ":prompt 'Really delete this message?' 'delete-message'<Enter>";
-            D = ":delete<Enter>";
+            D = ":move Trash<Enter>";
             A = ":archive flat<Enter>";
 
             C = ":compose<Enter>";
@@ -81,7 +81,7 @@
             O = ":open<Enter>";
             S = ":save<space>";
             "|" = ":pipe<space>";
-            D = ":delete<Enter>";
+            D = ":move Trash<Enter>";
             A = ":archive flat<Enter>";
 
             "<C-l>" = ":open-link <space>";
@@ -167,13 +167,14 @@
             "message/rfc822" =
               "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
             "application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
+            "application/pdf" = "${pkgs.zathura}/bin/zathura -";
           };
         };
       };
       accounts.email.accounts.home.aerc = {
         enable = true;
         extraAccounts = {
-          check-mail = "1m";
+          check-mail = "5m";
           check-mail-cmd = "${pkgs.isync}/bin/mbsync -a";
         };
       };

modules/neovim/default.nix

@@ -5,6 +5,8 @@
     home.packages = with pkgs; [
       neovim
       gcc # for tree-sitter
+      tree-sitter # for tree-sitter-gitignore parser
+      nodejs # for tree-sitter-gitignore parser
       shfmt # used everywhere
       shellcheck # used everywhere
     ];
@@ -15,7 +17,12 @@
         source = ./lua;
         recursive = true; # Allows adding more files
       };
-      "nvim/lua/packer/colors.lua".source = config.colorscheme.neovimConfig;
+      "nvim/lua/packer/colors.lua".source = config.theme.colors.neovimConfig;
+      "nvim/lua/background.lua".text = ''
+        vim.o.background = "${
+          if config.theme.dark == true then "dark" else "light"
+        }"
+      '';
     };
 
     programs.git.extraConfig.core.editor = "nvim";

modules/neovim/init.lua

@@ -1,3 +1,4 @@
 require("packer_init")
 require("settings")
 require("keybinds")
+require("background")

modules/neovim/lua/packer/lsp.lua

@@ -46,8 +46,8 @@ M.packer = function(use)
                     capabilities = capabilities,
                 })
             end
-            if on_path("rnix-lsp") then
-                require("lspconfig").rnix.setup({ capabilities = capabilities })
+            if on_path("nil") then
+                require("lspconfig").nil_ls.setup({ capabilities = capabilities })
             end
 
             vim.keymap.set("n", "gd", vim.lsp.buf.definition)

modules/neovim/lua/packer/toggleterm.lua

@@ -50,7 +50,7 @@ M.packer = function(use)
             vim.keymap.set("n", "<Leader>t", TERM_TOGGLE)
             vim.keymap.set("n", "<Leader>P", NIXPKGS_TOGGLE)
             vim.keymap.set("n", "<Leader>gw", GITWATCH_TOGGLE)
-            vim.keymap.set("n", "<C-k>", K9S_TOGGLE)
+            vim.keymap.set("n", "<Leader>9", K9S_TOGGLE)
         end,
     })
 

modules/neovim/lua/settings.lua

@@ -75,6 +75,11 @@ vim.api.nvim_exec(
     false
 )
 
+vim.filetype.add({
+    pattern = {
+        [".*%.tfvars"] = "terraform",
+    },
+})
 vim.api.nvim_create_autocmd("FileType", {
     pattern = "*.eml",
     callback = function()

modules/programming/nix.nix

@@ -4,7 +4,7 @@
 
     home.packages = with pkgs; [
       nixfmt # Nix file formatter
-      rnix-lsp # Nix language server
+      nil # Nix language server
     ];
 
   };

modules/services/n8n.nix

@@ -0,0 +1,21 @@
+{ ... }: {
+
+  services.n8n = {
+    enable = true;
+    settings = {
+      n8n = {
+        listenAddress = "127.0.0.1";
+        port = 5678;
+      };
+    };
+  };
+
+  caddyRoutes = [{
+    match = [{ host = [ config.n8nServer ]; }];
+    handle = [{
+      handler = "reverse_proxy";
+      upstreams = [{ dial = "localhost:5678"; }];
+    }];
+  }];
+
+}

modules/services/sshd.nix

@@ -28,6 +28,9 @@
 
     # Implement a simple fail2ban service for sshd
     services.sshguard.enable = true;
+
+    # Add terminfo for SSH from popular terminal emulators
+    environment.enableAllTerminfo = true;
   };
 
 }

modules/shell/fish/functions/fish_user_key_bindings.fish

@@ -14,7 +14,7 @@ bind -M insert \cp projects
 bind -M default \cp projects
 bind -M insert \x1F accept-autosuggestion
 bind -M default \x1F accept-autosuggestion
-bind -M insert \cn 'commandline -r "nix run github:NixOS/nixpkgs/nixpkgs-unstable#"'
-bind -M default \cn 'commandline -r "nix run github:NixOS/nixpkgs/nixpkgs-unstable#"'
+bind -M insert \cn 'commandline -r "nix run nixpkgs#"'
+bind -M default \cn 'commandline -r "nix run nixpkgs#"'
 bind -M insert \x11F nix-fzf
 bind -M default \x11F nix-fzf

modules/shell/nixpkgs.nix

@@ -19,9 +19,9 @@
           body = ''
             set program $argv[1]
             if test (count $argv) -ge 2
-                commandline -r "nix run github:NixOS/nixpkgs/nixpkgs-unstable#$program -- $argv[2..-1]"
+                commandline -r "nix run nixpkgs#$program -- $argv[2..-1]"
             else
-                commandline -r "nix run github:NixOS/nixpkgs/nixpkgs-unstable#$program"
+                commandline -r "nix run nixpkgs#$program"
             end
             commandline -f execute
           '';

modules/shell/utilities.nix

@@ -13,50 +13,54 @@ let
 
 in {
 
-  home-manager.users.${config.user} = {
+  config = {
 
-    home.packages = with pkgs; [
-      unzip # Extract zips
-      rsync # Copy folders
-      ripgrep # grep
-      bat # cat
-      fd # find
-      sd # sed
-      jq # JSON manipulation
-      tealdeer # Cheatsheets
-      tree # View directory hierarchy
-      htop # Show system processes
-      glow # Pretty markdown previews
-      qrencode # Generate qr codes
-      vimv-rs # Batch rename files
-      dig # DNS lookup
-      lf # File viewer
-      # whois # Lookup IPs
-      age # Encryption
-    ];
+    home-manager.users.${config.user} = {
 
-    programs.zoxide.enable = true; # Shortcut jump command
+      home.packages = with pkgs; [
+        unzip # Extract zips
+        rsync # Copy folders
+        ripgrep # grep
+        fd # find
+        sd # sed
+        jq # JSON manipulation
+        tealdeer # Cheatsheets
+        tree # View directory hierarchy
+        htop # Show system processes
+        glow # Pretty markdown previews
+        qrencode # Generate qr codes
+        vimv-rs # Batch rename files
+        dig # DNS lookup
+        lf # File viewer
+        inetutils # Includes telnet, whois
+        age # Encryption
+      ];
 
-    home.file = {
-      ".rgignore".text = ignorePatterns;
-      ".fdignore".text = ignorePatterns;
-      ".digrc".text = "+noall +answer"; # Cleaner dig commands
-    };
+      programs.zoxide.enable = true; # Shortcut jump command
 
-    programs.fish.shellAbbrs = {
-      cat = "bat"; # Swap cat with bat
-    };
-
-    programs.fish.functions = {
-      ping = {
-        description = "Improved ping";
-        argumentNames = "target";
-        body = "${pkgs.prettyping}/bin/prettyping --nolegend $target";
+      home.file = {
+        ".rgignore".text = ignorePatterns;
+        ".fdignore".text = ignorePatterns;
+        ".digrc".text = "+noall +answer"; # Cleaner dig commands
       };
-      qr = {
-        body =
-          "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | open /tmp/qr.png"; # Fix for non-macOS
+
+      programs.bat = {
+        enable = true; # cat replacement
+        config = { theme = config.theme.colors.batTheme; };
       };
+
+      programs.fish.shellAbbrs = {
+        cat = "bat"; # Swap cat with bat
+      };
+
+      programs.fish.functions = {
+        ping = {
+          description = "Improved ping";
+          argumentNames = "target";
+          body = "${pkgs.prettyping}/bin/prettyping --nolegend $target";
+        };
+      };
+
     };
 
   };

private/password.sha512

@@ -0,0 +1 @@
+$6$PZYiMGmJIIHAepTM$Wx5EqTQ5GApzXx58nvi8azh16pdxrN6Qrv1wunDlzveOgawitWzcIxuj76X9V868fsPi/NOIEO8yVXqwzS9UF.

windows/alacritty.yml

@@ -720,7 +720,7 @@ shell:
 # in the order they were defined in.
 key_bindings:
   # Used for word completion in fish_user_key_bindings
-  - { key: L, mods: Control|Shift, chars: "\x1F" }
+  - { key: Return, mods: 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 }