home-manager modules

Author: alexpearce

flake.nix

@@ -30,7 +30,7 @@
         inherit pkgs;
 
         modules = [
-          ./modules/home.nix
+          ./modules/home-manager
           {
             home = {
               inherit homeDirectory username;

modules/home.nix modules/home-manager/common.nixmodules/home.nix renamed to modules/home-manager/common.nix

@@ -4,10 +4,7 @@
   ...
 }: {
   home = {
-    # Specify packages not explicitly configured below
     packages = with pkgs; [
-      colima
-      docker
       entr
       fd
       httpie
@@ -16,6 +13,7 @@
       jq
       nodejs
       pandoc
+      python3
       ripgrep
       tree
       tree-sitter
@@ -65,19 +63,8 @@
           src = pkgs.fetchFromGitHub {
             owner = "PatrickF1";
             repo = "fzf.fish";
-            rev = "6d8e962f3ed84e42583cec1ec4861d4f0e6c4eb3";
-            sha256 = "sha256-0rnd8oJzLw8x/U7OLqoOMQpK81gRc7DTxZRSHxN9YlM";
-          };
-        }
-        # Need this when using Fish as a default macOS shell in order to pick
-        # up ~/.nix-profile/bin
-        {
-          name = "nix-env";
-          src = pkgs.fetchFromGitHub {
-            owner = "lilyball";
-            repo = "nix-env.fish";
-            rev = "00c6cc762427efe08ac0bd0d1b1d12048d3ca727";
-            sha256 = "1hrl22dd0aaszdanhvddvqz3aq40jp9zi2zn0v1hjnf7fx4bgpma";
+            rev = "8920367cf85eee5218cc25a11e209d46e2591e7a";
+            sha256 = "sha256-T8KYLA/r/gOKvAivKRoeqIwE2pINlxFQtZJHpOy9GMM=";
           };
         }
       ];
@@ -98,27 +85,7 @@
         set fish_color_escape white
         set fish_color_autosuggestion brblack
       '';
-      # Send OSC 133 escape sequences to signal prompt and ouput start and end.
-      interactiveShellInit = ''
-        function terminal_integration_preprompt --on-event fish_prompt
-          printf "\033]133;A;\007"
-        end
-
-        # TODO not used yet.
-        function terminal_integration_postprompt
-          printf "\033]133;B;\007"
-        end
-
-        function terminal_integration_preexec --on-event fish_preexec
-          printf "\033]133;C;\007"
-        end
-
-        function terminal_integration_postexec --on-event fish_postexec
-          printf "\033]133;D;\007"
-        end
-      '';
       shellAliases = {
-        ipython = "ipython --no-banner";
         rm = "rm -i";
         cp = "cp -i";
         mv = "mv -i";
@@ -129,7 +96,6 @@
       # An abbreviation will expand after <space> or <Enter> is hit
       shellAbbrs = {
         b = "bat";
-        ip = "ipython";
         g = "git";
         ga = "git add";
         gap = "git add -p";
@@ -161,8 +127,6 @@
         gswc = "git switch -c";
         gswm = "git switch main";
         h = "http";
-        hme = "home-manager --flake ~/Code/dotfiles edit";
-        hms = "home-manager --flake ~/Code/dotfiles switch";
         iexm = "iex -S mix";
         m = "make";
         o = "open";
@@ -218,10 +182,8 @@
 
     ghostty = {
       enable = true;
-      # Ghostty package is broken on macOS, must install app manually.
-      package = null;
       settings = {
-        theme = "Rose Pine Dawn";
+        theme = "TokyoNight Moon";
         command = "${config.home.profileDirectory}/bin/fish";
         # Move between panes with cmd+opt+{h,j,k,l}.
         keybind = [
@@ -296,7 +258,7 @@
     helix = {
       enable = true;
       settings = {
-        theme = "rose_pine_dawn";
+        theme = "tokyonight_moon";
         editor = {
           bufferline = "multiple";
           color-modes = true;
@@ -337,11 +299,4 @@
       enableFishIntegration = true;
     };
   };
-
-  # Requires telling Hammerspoon to look for configuration in the right place:
-  #   defaults write org.hammerspoon.Hammerspoon MJConfigFile "${XDG_CONFIG_HOME:-$HOME/.config}/hammerspoon/init.lua"
-  xdg.configFile.hammerspoon = {
-    source = ../hammerspoon;
-    recursive = true;
-  };
 }

modules/home-manager/darwin/default.nix

@@ -0,0 +1,59 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
+in {
+  config = lib.mkIf isDarwin {
+    home = {
+      packages = with pkgs; [
+        colima
+        docker
+      ];
+    };
+
+    programs = {
+      fish = {
+        plugins = [
+          # Need this when using Fish as a default macOS shell in order to pick
+          # up ~/.nix-profile/bin
+          {
+            name = "nix-env";
+            src = pkgs.fetchFromGitHub {
+              owner = "lilyball";
+              repo = "nix-env.fish";
+              rev = "7b65bd228429e852c8fdfa07601159130a818cfa";
+              sha256 = "sha256-RG/0rfhgq6aEKNZ0XwIqOaZ6K5S4+/Y5EEMnIdtfPhk=";
+            };
+          }
+        ];
+      };
+
+      git = {
+        settings = {
+          core = {
+            # If git uses `ssh` from Nix the macOS-specific configuration in
+            # `~/.ssh/config` won't be seen as valid
+            # https://github.com/NixOS/nixpkgs/issues/15686#issuecomment-865928923
+            sshCommand = "/usr/bin/ssh";
+          };
+        };
+      };
+
+      ghostty = {
+        # Ghostty package is broken on macOS, must install app manually.
+        package = null;
+      };
+    };
+
+    # Requires telling Hammerspoon to look for configuration in the right place:
+    #   defaults write org.hammerspoon.Hammerspoon MJConfigFile "${XDG_CONFIG_HOME:-$HOME/.config}/hammerspoon/init.lua"
+    xdg.configFile.hammerspoon = {
+      source = ./hammerspoon;
+      recursive = true;
+    };
+  };
+}

…ons/WindowHalfsAndThirds.spoon/docs.json …ons/WindowHalfsAndThirds.spoon/docs.jsonhammerspoon/Spoons/WindowHalfsAndThirds.spoon/docs.json renamed to modules/home-manager/darwin/hammerspoon/Spoons/WindowHalfsAndThirds.spoon/docs.json hammerspoon/Spoons/WindowHalfsAndThirds.spoon/docs.json renamed to modules/home-manager/darwin/hammerspoon/Spoons/WindowHalfsAndThirds.spoon/docs.json

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  imports = [
+    ./common.nix
+    ./darwin
+    ./linux
+  ];
+}

…oons/WindowHalfsAndThirds.spoon/init.lua …oons/WindowHalfsAndThirds.spoon/init.luahammerspoon/Spoons/WindowHalfsAndThirds.spoon/init.lua renamed to modules/home-manager/darwin/hammerspoon/Spoons/WindowHalfsAndThirds.spoon/init.lua hammerspoon/Spoons/WindowHalfsAndThirds.spoon/init.lua renamed to modules/home-manager/darwin/hammerspoon/Spoons/WindowHalfsAndThirds.spoon/init.lua

@@ -0,0 +1,12 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  isLinux = pkgs.stdenv.hostPlatform.isLinux;
+in {
+  config = lib.mkIf isLinux {
+  };
+}

hammerspoon/init.lua …home-manager/darwin/hammerspoon/init.luahammerspoon/init.lua renamed to modules/home-manager/darwin/hammerspoon/init.lua hammerspoon/init.lua renamed to modules/home-manager/darwin/hammerspoon/init.lua

@@ -15,7 +15,7 @@ in {
     useGlobalPkgs = true;
     useUserPackages = true;
     users."${username}" = {
-      imports = [./home.nix];
+      imports = [./home-manager];
       home = {
         inherit homeDirectory username;
         stateVersion = "23.11";