hosts/macbook/default.nix

@@ -14,7 +14,7 @@ darwin.lib.darwinSystem {
     })
     home-manager.darwinModules.home-manager
     {
-      identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
+      identityFile = "/home/${globals.user}/.ssh/id_ed25519";
       gui.enable = true;
       colorscheme = (import ../../modules/colorscheme/gruvbox);
       mailUser = globals.user;

modules/darwin/fonts.nix

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

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

@@ -9,25 +9,24 @@ WORK_RIGHT_MONITOR = "DELL U2415 (1)"
 LAPTOP_MONITOR = "Built-in Retina Display"
 
 -- Used to find out the name of the monitor in Hammerspoon
--- local function dump(o)
+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()))
 
-local function concat(...)
+function concat(...)
     local res = {}
     for _, tab in ipairs({ ... }) do
         for _, elem in ipairs(tab) do
@@ -37,12 +36,12 @@ local function concat(...)
     return res
 end
 
-local function worklayout()
+function worklayout()
     hs.hotkey.bind({ "alt", "ctrl", "cmd" }, "l", function()
         local u = hs.geometry.unitrect
         -- set the layout
         local left = {
-            { "kitty", nil, WORK_LEFT_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
+            -- { "Alacritty", 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/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}#macbook";
+            commandline -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName}";
             commandline --function execute
           '';
         };

modules/darwin/system.nix

@@ -1,9 +1,7 @@
-{ pkgs, ... }: {
+{ ... }: {
 
   services.nix-daemon.enable = true;
 
-  environment.shells = [ pkgs.fish ];
-
   security.pam.enableSudoTouchIdAuth = true;
 
   system = {

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 nixpkgs#"'
+bind -M insert \cn 'commandline -r "nix run github:NixOS/nixpkgs/nixpkgs-unstable#"'
-bind -M default \cn 'commandline -r "nix run nixpkgs#"'
+bind -M default \cn 'commandline -r "nix run github:NixOS/nixpkgs/nixpkgs-unstable#"'
 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 nixpkgs#$program -- $argv[2..-1]"
+                commandline -r "nix run github:NixOS/nixpkgs/nixpkgs-unstable#$program -- $argv[2..-1]"
             else
-                commandline -r "nix run nixpkgs#$program"
+                commandline -r "nix run github:NixOS/nixpkgs/nixpkgs-unstable#$program"
             end
             commandline -f execute
           '';