Started moving things into common_home.nix.

hosts/de-lacadie/home.nix

@@ -5,43 +5,18 @@ let
   extra = ../../extra;
   terminal = pkgs.alacritty;
 in {
-  imports = [
-    ../../snippets/gammastep.nix
-    ../../snippets/kdeconnect.nix
-    ../../snippets/ssh.nix
-    ../../snippets/zsh.nix
-    ../../snippets/taskwarrior.nix
-    ../../snippets/kakoune.nix
-    ../../snippets/clifm.nix
-    ../../snippets/git.nix
-    ../../snippets/firefox.nix
-    ../../snippets/thunderbird.nix
-  ];
-  home.username = "alice";
-  home.homeDirectory = "/home/alice";
-
   home.stateVersion = "24.05";
 
+  # Configure default applications as per /snippets/defaults.nix
+  defaultPrograms = with pkgs; {
+    terminal = alacritty;
+    editor = kakoune;
+    browser = firefox;
+    mail = thunderbird;
+  };
+
   # Configure cursor
-  home.pointerCursor = {
+  home.pointerCursor.size = 64;
-    package = pkgs.vanilla-dmz;
-    name = "Vanilla-DMZ";
-    size = 64;
-  };
-
-  # Configure icon theme
-  gtk = {
-    enable = true;
-    iconTheme = {
-      name = "Papirus";
-      package = pkgs.papirus-icon-theme;
-    };
-  };
-
-  # Configure xdg-desktop-portal (for file picker, etc.)
-  # xdg.portal = {
-  #     enable = true;
-  # };
 
   # Install packages
   home.packages = with pkgs;
@@ -50,35 +25,13 @@ in {
       archivo = callPackage ../../pkgs/archivo/archivo.nix { };
       highway-gothic = callPackage ../../pkgs/highway-gothic/highway-gothic.nix { };
       olympus = callPackage ../../pkgs/olympus/package.nix { };
-    in [ gcc tree-sitter ] ++ # Basic dev tools
+    in
-    [ marksman nil ] ++ # Language servers except those installed through package sections
-    [ texliveFull texlab ] ++ # LaTeX
-    # (with ocamlPackages; [
-    #   ocaml
-    #   opam
-    #   dune_3
-    #   dune-release
-    #   merlin
-    #   ocaml-lsp
-    #   odoc
-    #   ocamlformat
-    #   utop
-    # ]) ++ # OCaml
-    # [ rustup ] ++ # Rust
-    # [ go gopls ] ++ # Golang
-    # (with elmPackages; [ elm elm-language-server elm-format elm-test ]) ++
-    [ python3 ] ++ # I guess.....
     [
-      kak-lsp
-      brightnessctl
       jq
       blueman
-      upower
-      glib # provides trash and mount (latter may supplant udisks2?)
     ] ++ # Basic utilities
     [ bitwarden-cli htop snore hledger hledger-ui ]
     ++ # Personalized selection of command-line (CLI/TUI) apps
-    [ terminal ] ++ # Terminal emulator
     [
       imv
       vlc

hosts/randolph/home.nix

@@ -1,31 +1,9 @@
 { pkgs, ... }:
 
 rec {
-  imports = [
-    ../../snippets/defaults.nix
-    ../../snippets/gammastep.nix
-    ../../snippets/kdeconnect.nix
-    ../../snippets/ssh.nix
-    ../../snippets/zsh.nix
-    ../../snippets/taskwarrior.nix
-    ../../snippets/kakoune.nix
-    ../../snippets/emacs.nix
-    ../../snippets/clifm.nix
-    ../../snippets/git.nix
-    ../../snippets/sway.nix
-    ../../snippets/waybar.nix
-    # ../../snippets/i3blocks.nix
-    ../../snippets/firefox.nix
-    ../../snippets/thunderbird.nix
-    # ../../snippets/qutebrowser.nix
-    ../../snippets/imv.nix
-  ];
-
-  home.username = "alice";
-  home.homeDirectory = "/home/alice";
   home.stateVersion = "23.11";
 
-  # Configure default applications
+  # Configure default applications as per /snippets/defaults.nix
   defaultPrograms = with pkgs; {
     terminal = alacritty;
     editor = kakoune;
@@ -34,28 +12,7 @@ rec {
   };
 
   # Configure cursor
-  home.pointerCursor = {
+  home.pointerCursor.size = 256;
-    package = pkgs.vanilla-dmz;
-    name = "Vanilla-DMZ";
-    size = 256;
-  };
-
-  # Configure icon theme
-  gtk = {
-    enable = true;
-    iconTheme = {
-      name = "Papirus";
-      package = pkgs.papirus-icon-theme;
-    };
-  };
-
-  # Configure default apps
-  # xdg.mimeApps = {
-  #   enable = true;
-  #   defaultApplications = {
-  #     "application/pdf" = "org.pwmt.zathura.desktop";
-  #   };
-  # };
 
   # Install packages
   home.packages = with pkgs;
@@ -67,18 +24,8 @@ rec {
       kakmerge = callPackage ../../pkgs/kakmerge/kakmerge.nix { };
       # xdg-terminal-exec = callPackage ../../pkgs/xdg-terminal-exec/xdg-terminal-exec.nix { };
     in
-    [ marksman nil ] ++ # Language servers except those installed through package sections
-    [ texliveFull texlab ] ++ # LaTeX
     [
-      brightnessctl
-      grim
-      slurp
-      wl-clipboard
       blueman
-      upower
-      glib # provides trash and mount (latter may supplant udisks2?)
-      xdg-terminal-exec
-      wdisplays
       kalker
       tldr
     ] ++ # Basic utilities

snippets/common_home.nix

@@ -0,0 +1,45 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./defaults.nix
+    ./gammastep.nix
+    ./kdeconnect.nix
+    ./ssh.nix
+    ./zsh.nix
+    ./taskwarrior.nix
+    ./kakoune.nix
+    ./clifm.nix
+    ./git.nix
+    ./sway.nix
+    ./waybar.nix
+    ./firefox.nix
+    ./thunderbird.nix
+    ./imv.nix
+  ];
+
+  home.username = "alice";
+  home.homeDirectory = "/home/alice";
+
+  # Configure cursor
+  home.pointerCursor = {
+    package = pkgs.vanilla-dmz;
+    name = "Vanilla-DMZ";
+  };
+
+  # Configure icon theme
+  gtk = {
+    enable = true;
+    iconTheme = {
+      name = "Papirus";
+      package = pkgs.papirus-icon-theme;
+    };
+  };
+
+  home.packages = with pkgs;
+  [ marksman nil ] ++ # Language servers for built in languages
+  [ texliveFull texlab ] ++ # LaTeX - remove this eventually and put it in dev
+    # envs
+  [ xdg-terminal-exec glib upower ] ++
+  [];
+}

snippets/sway.nix

@@ -141,5 +141,8 @@ in {
     theme = "android_notification";
   };
 
-  home.packages = with pkgs; [ swaybg bemenu j4-dmenu-desktop swaysome ];
+  home.packages = with pkgs;
+    [ swaybg bemenu j4-dmenu-desktop swaysome ] ++
+    [ brightnessctl grim slurp wl-clipboard wdisplays ]
+    [];
 }