jj, fish, better kanata, etc

hosts/icecube/home.nix

@@ -1,18 +1,18 @@
 { pkgs, ... }: {
-  home.stateVersion = "24.05";
-  home.username = "jonathan";
-  home.homeDirectory = "/home/jonathan";
+  home = {
+
+    stateVersion = "24.05";
+    username = "jonathan";
+    homeDirectory = "/home/jonathan";
+
+    sessionVariables.PATH = "$HOME/.nix-profile/bin:$PATH";
+  };
 
   imports = [
     ../../programs/nvim
-    ../../programs/zsh
+    ../../programs/fish
     ../../programs/tmux
     ../../programs/git
-  ];
-
-  home.sessionVariables.PATH = "$HOME/.nix-profile/bin:$PATH";
-
-  home.packages = with pkgs; [
-    atuin
+    ../../programs/jj
   ];
 }

hosts/kili/home.nix

@@ -1,15 +1,19 @@
-{ pkgs, ... }: {
-  home.stateVersion = "24.05";
-  home.username = "jonathan";
-  home.homeDirectory = "/home/jonathan";
+{ config, pkgs, ... }: {
+  home = {
+    stateVersion = "24.05";
+    username = "jonathan";
+    homeDirectory = "/home/jonathan";
+    packages = with pkgs; [config.programs.neovim.package];
+  };
 
   imports = [
     ../../programs/nvim
-    ../../programs/zsh
+    ../../programs/fish
     ../../programs/kanata
     ../../programs/kitty
     ../../programs/tmux
     ../../programs/git
+    ../../programs/jj
   ];
 
   # use the system-installed version of kitty on arch

hosts/ori/home.nix

@@ -1,45 +1,47 @@
 { pkgs, ... }: {
-  home.stateVersion = "24.05";
-  home.username = "jonathan";
-  home.homeDirectory = "/home/jonathan";
+  home = {
+    stateVersion = "24.05";
+    username = "jonathan";
+    homeDirectory = "/home/jonathan";
+
+    packages = with pkgs; [
+      element-desktop
+      discord-canary
+      comma
+      (python3.withPackages (pip: with pip; [ numpy matplotlib ]))
+      spotify
+      firefox
+      chromium
+      syncthing
+      nixfmt
+      xdg-utils
+      # to copy from the command line (my fish config has an alias `cb` to pipe things to the clipboard)
+      wl-clipboard-rs
+      prismlauncher
+      graphviz-nox
+
+      inkscape
+      gimp
+      xournalpp
+      libreoffice
+
+      dogdns
+
+      jetbrains.rust-rover
+
+      vlc
+      audacity
+    ];
+  };
+
   imports = [
     ../../programs/gnome
     ../../programs/nvim
-    ../../programs/zsh
+    ../../programs/fish
     ../../programs/git
-  ];
-
-  home.packages = with pkgs; [
-    element-desktop
-    atuin
-    discord-canary
-    comma
-    (python3.withPackages (pip: with pip; [ numpy matplotlib ]))
-    spotify
-    firefox
-    chromium
-    syncthing
-    nixfmt
-    xdg-utils
-    # to copy from the command line (my zsh config has an alias `clip` to pipe things to the clipboard)
-    wl-clipboard-rs
-    prismlauncher
-    graphviz-nox
-
-    inkscape
-    gimp
-    xournalpp
-    libreoffice
-
-    dogdns
-
-    jetbrains.rust-rover
-
-    vlc
-    audacity
+    ../../programs/jj
   ];
 
   programs.firefox = { enable = true; };
-
   services.syncthing = { enable = true; };
 }