switch from homebrew to firefox overlay for macos

This reverts commit d1f12671b0.

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; {
+      packages.aws = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ]
-        aws = import ./hosts/aws {
+        (system: {
-          inherit inputs globals;
+          "${system}" = import ./hosts/aws { inherit inputs globals system; };
-          system = "x86_64-linux";
+        });
-        };
-      };
 
       apps = forAllSystems (system:
         let pkgs = import nixpkgs { inherit system; };

hosts/desktop/default.nix

@@ -37,7 +37,7 @@ nixpkgs.lib.nixosSystem {
     ../../modules/applications/discord.nix
     ../../modules/applications/nautilus.nix
     ../../modules/applications/obsidian.nix
-    ../../modules/mail/default.nix
+    ../../modules/mail
     ../../modules/gaming/steam.nix
     ../../modules/gaming/legendary.nix
     ../../modules/repositories/notes.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/wsl/default.nix

@@ -16,7 +16,10 @@ nixpkgs.lib.nixosSystem {
       nix.registry.nixpkgs.flake = nixpkgs;
       identityFile = "/home/${globals.user}/.ssh/id_ed25519";
       gui.enable = false;
-      colorscheme = (import ../../modules/colorscheme/gruvbox);
+      theme = {
+        colors = (import ../../modules/colorscheme/gruvbox).dark;
+        dark = true;
+      };
       passwordHash = nixpkgs.lib.fileContents ../../private/password.sha512;
       wsl = {
         enable = true;
@@ -31,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/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,6 +47,8 @@
             "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 {

modules/applications/kitty.nix

@@ -69,6 +69,9 @@
 
           tab_bar_edge = "top";
           tab_bar_style = "slant";
+
+          # Audio
+          enable_audio_bell = false;
         };
       };
     };

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

@@ -20,6 +20,7 @@
     base0E = "#d3869b"; # purple
     base0F = "#d65d0e"; # brown
     neovimConfig = ./neovim.lua;
+    batTheme = "gruvbox-dark";
   };
   light = {
     base00 = "#fbf1c7"; # ----
@@ -38,6 +39,7 @@
     base0D = "#076678"; # blue
     base0E = "#8f3f71"; # purple
     base0F = "#d65d0e"; # brown
-    neovimConfig = ./neovim-light.lua;
+    neovimConfig = ./neovim.lua;
+    batTheme = "gruvbox-light";
   };
 }

modules/colorscheme/gruvbox/neovim.lua

@@ -6,7 +6,6 @@ M.packer = function(use)
         config = function()
             vim.g.gruvbox_italicize_strings = 0
             vim.cmd("colorscheme gruvbox8")
-            vim.cmd("set background=dark")
         end,
     })
 end

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 = {
+    programs.alacritty.settings = { font.normal.family = "VictorMono"; };
-      font.normal.family = "FiraCode Nerd Font Mono";
-    };
 
     programs.kitty.font = {
-      package = pkgs.nerdfonts;
+      package = (pkgs.nerdfonts.override { fonts = [ "VictorMono" ]; });
-      name = "FiraCode";
+      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)
+-- local function dump(o)
-    if type(o) == "table" then
+--     if type(o) == "table" then
-        local s = "{ "
+--         local s = "{ "
-        for k, v in pairs(o) do
+--         for k, v in pairs(o) do
-            if type(k) ~= "number" then
+--             if type(k) ~= "number" then
-                k = '"' .. k .. '"'
+--                 k = '"' .. k .. '"'
-            end
+--             end
-            s = s .. "[" .. k .. "] = " .. dump(v) .. ","
+--             s = s .. "[" .. k .. "] = " .. dump(v) .. ","
-        end
+--         end
-        return s .. "} "
+--         return s .. "} "
-    else
+--     else
-        return tostring(o)
+--         return tostring(o)
-    end
+--     end
-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/hardware/audio.nix

@@ -39,6 +39,9 @@ in {
       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; [
       pamixer # Audio control

modules/neovim/default.nix

@@ -19,9 +19,9 @@
       };
       "nvim/lua/packer/colors.lua".source = config.theme.colors.neovimConfig;
       "nvim/lua/background.lua".text = ''
-        vim.cmd("set background=${
+        vim.o.background = "${
           if config.theme.dark == true then "dark" else "light"
-        }")
+        }"
       '';
     };
 

modules/neovim/lua/packer/lsp.lua

@@ -46,8 +46,8 @@ M.packer = function(use)
                     capabilities = capabilities,
                 })
             end
-            if on_path("rnix-lsp") then
+            if on_path("nil") then
-                require("lspconfig").rnix.setup({ capabilities = capabilities })
+                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/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 insert \cn 'commandline -r "nix run nixpkgs#"'
-bind -M default \cn 'commandline -r "nix run github:NixOS/nixpkgs/nixpkgs-unstable#"'
+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,13 +13,14 @@ let
 
 in {
 
+  config = {
+
     home-manager.users.${config.user} = {
 
       home.packages = with pkgs; [
         unzip # Extract zips
         rsync # Copy folders
         ripgrep # grep
-      bat # cat
         fd # find
         sd # sed
         jq # JSON manipulation
@@ -31,7 +32,7 @@ in {
         vimv-rs # Batch rename files
         dig # DNS lookup
         lf # File viewer
-      # whois # Lookup IPs
+        inetutils # Includes telnet, whois
         age # Encryption
       ];
 
@@ -43,6 +44,11 @@ in {
         ".digrc".text = "+noall +answer"; # Cleaner dig commands
       };
 
+      programs.bat = {
+        enable = true; # cat replacement
+        config = { theme = config.theme.colors.batTheme; };
+      };
+
       programs.fish.shellAbbrs = {
         cat = "bat"; # Swap cat with bat
       };
@@ -53,10 +59,8 @@ in {
           argumentNames = "target";
           body = "${pkgs.prettyping}/bin/prettyping --nolegend $target";
         };
-      qr = {
-        body =
-          "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | open /tmp/qr.png"; # Fix for non-macOS
       };
+
     };
 
   };