Combine scripts and custom packages

home-manager/opdavies/PW05CH3L.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 
 {
   imports = [ ../common ];
@@ -37,6 +37,12 @@
     };
   };
 
+  home.packages = with pkgs; [
+    tag-release
+    todos-add
+    update-all-git-repos
+  ];
+
   xdg.configFile."pam-gnupg".text = ''
     C0D940F9A390F286FCAAE8439D501171E39D0A47
   '';

home-manager/opdavies/t480.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 
 {
   imports = [
@@ -96,6 +96,19 @@
       };
   };
 
+  home.packages = with pkgs; [
+    backup-websites
+    build-glove80
+    displayselect
+    mounter
+    move-firefox-screenshots
+    setbg
+    tag-release
+    todos-add
+    unmounter
+    update-all-git-repos
+  ];
+
   xdg.configFile."pam-gnupg".text = ''
     098EE055DAD2B9CB68154C6759DD38292D2273B6
     1E21B58D69FFEFAD077F152A50FEA938A3413F50

hosts/t480/configuration.nix

@@ -101,12 +101,9 @@
     abook
     acpi
     arandr
-    backup-websites
     brightnessctl
-    build-glove80
     cdrkit
     cpufrequtils
-    displayselect
     dvdbackup
     dvdplusrwtools
     ffmpegthumbnailer
@@ -131,7 +128,6 @@
     sxiv
     tailscale
     ttyper
-    upload-to-files
     xcape
     xsel
     yt-dlp

modules/home-manager/cli/scripts/default.nix

@@ -1,19 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # TODO: separate desktop-only scripts?
-  home.packages =
-    let
-      scriptNames = [
-        "create-script"
-        "mounter"
-        "move-firefox-screenshots"
-        "setbg"
-        "tag-release"
-        "todos-add"
-        "unmounter"
-        "update-all-git-repos"
-      ];
-    in
-    map (name: pkgs.callPackage ./${name}.nix { }) scriptNames;
-}

modules/home-manager/default.nix

@@ -9,7 +9,6 @@
     ./cli/node.nix
     ./cli/notes.nix
     ./cli/ranger.nix
-    ./cli/scripts
     ./cli/starship.nix
     ./cli/sxhkd.nix
     ./cli/tmux-sessionizer.nix

packages/default.nix

@@ -8,12 +8,19 @@ in
 {
   backup-websites = callPackage ./backup-websites.nix { };
   build-glove80 = callPackage ./build-glove80.nix { };
+  create-script = callPackage ./create-script.nix { };
   dev-commit = callPackage ./dev-commit.nix { };
   displayselect = callPackage ./displayselect { };
+  mounter = callPackage ./mounter.nix { };
+  move-firefox-screenshots = callPackage ./move-firefox-screenshots.nix { };
   notes = callPackage ./notes { };
   passmenu-otp = callPackage ./passmenu-otp.nix { };
+  setbg = callPackage ./setbg.nix { };
+  tag-release = callPackage ./tag-release.nix { };
   tmux-sessionizer = callPackage ./tmux-sessionizer { };
-  upload-to-files = callPackage ./upload-to-files.nix { };
+  todos-add = callPackage ./todos-add.nix { };
+  unmounter = callPackage ./unmounter.nix { };
+  update-all-git-repos = callPackage ./update-all-git-repos.nix { };
 
   vimPlugins = prev.vimPlugins // vimPlugins;
 }

packages/upload-to-files.nix

@@ -1,11 +0,0 @@
-{ pkgs }:
-
-with pkgs;
-
-writeShellApplication {
-  name = "upload-to-files";
-
-  text = ''
-    ${pkgs.rsync}/bin/rsync -avz --info=progress2 "$1" ssh.oliverdavies.uk:/var/www/vhosts/files.oliverdavies.uk
-  '';
-}