From 1d284c943292b51fda5438b8e433a3489adc54a2 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 5 Apr 2025 11:25:37 +0100 Subject: [PATCH] Extract a scripts mixin --- flake.nix | 2 -- hosts/PW05CH3L/configuration.nix | 1 + hosts/t480/configuration.nix | 1 + modules/home-manager/cli/default.nix | 7 ------ modules/home-manager/default.nix | 22 ------------------- .../cli/bin => mixins/scripts}/default.nix | 2 +- .../scripts}/scripts/create-script | 0 .../bin => mixins/scripts}/scripts/git-abort | 0 .../scripts}/scripts/git-bare-clone | 0 .../scripts}/scripts/git-continue | 0 .../bin => mixins/scripts}/scripts/git-sync | 0 .../cli/bin => mixins/scripts}/scripts/git-up | 0 .../scripts}/scripts/import-gzip-database | 0 .../scripts}/scripts/main-or-master-branch | 0 .../bin => mixins/scripts}/scripts/mounter | 0 .../scripts}/scripts/move-firefox-screenshots | 0 .../scripts}/scripts/new-drupal-module | 0 .../cli/bin => mixins/scripts}/scripts/setbg | 0 .../scripts}/scripts/start-traefik | 0 .../scripts/stop-all-docker-containers | 0 .../scripts}/scripts/stop-traefik | 0 .../scripts}/scripts/tag-release | 0 .../bin => mixins/scripts}/scripts/unmounter | 0 .../scripts}/scripts/update-all-git-repos | 0 24 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 modules/home-manager/cli/default.nix delete mode 100644 modules/home-manager/default.nix rename modules/{home-manager/cli/bin => mixins/scripts}/default.nix (77%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/create-script (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/git-abort (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/git-bare-clone (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/git-continue (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/git-sync (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/git-up (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/import-gzip-database (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/main-or-master-branch (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/mounter (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/move-firefox-screenshots (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/new-drupal-module (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/setbg (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/start-traefik (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/stop-all-docker-containers (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/stop-traefik (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/tag-release (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/unmounter (100%) rename modules/{home-manager/cli/bin => mixins/scripts}/scripts/update-all-git-repos (100%) diff --git a/flake.nix b/flake.nix index 0f583c7e..df52100d 100644 --- a/flake.nix +++ b/flake.nix @@ -60,8 +60,6 @@ overlays = import ./overlays { inherit inputs; }; - homeManagerModules.default = ./modules/home-manager; - nixosConfigurations = { lemp11 = nixpkgs.lib.nixosSystem { specialArgs = specialArgs // { diff --git a/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix index 5af1193f..f083bc9c 100644 --- a/hosts/PW05CH3L/configuration.nix +++ b/hosts/PW05CH3L/configuration.nix @@ -11,6 +11,7 @@ ../../modules/mixins/node.nix ../../modules/mixins/phpactor ../../modules/mixins/ranger.nix + ../../modules/mixins/scripts ../../modules/mixins/starship.nix ../../modules/mixins/tmux.nix ../../modules/mixins/zsh diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix index 2dd0de9f..764c5c4f 100644 --- a/hosts/t480/configuration.nix +++ b/hosts/t480/configuration.nix @@ -26,6 +26,7 @@ ../../modules/mixins/pipewire.nix ../../modules/mixins/ranger.nix ../../modules/mixins/screenkey.nix + ../../modules/mixins/scripts ../../modules/mixins/starship.nix ../../modules/mixins/thunar.nix ../../modules/mixins/tmux.nix diff --git a/modules/home-manager/cli/default.nix b/modules/home-manager/cli/default.nix deleted file mode 100644 index ca9a84dd..00000000 --- a/modules/home-manager/cli/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - imports = [ - ./bin - ]; -} diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix deleted file mode 100644 index ad904a83..00000000 --- a/modules/home-manager/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - config, - inputs, - lib, - self, - pkgs, - ... -}: - -{ - imports = [ - (import ./cli { - inherit - config - inputs - lib - self - pkgs - ; - }) - ]; -} diff --git a/modules/home-manager/cli/bin/default.nix b/modules/mixins/scripts/default.nix similarity index 77% rename from modules/home-manager/cli/bin/default.nix rename to modules/mixins/scripts/default.nix index 2da9de18..448d89a9 100644 --- a/modules/home-manager/cli/bin/default.nix +++ b/modules/mixins/scripts/default.nix @@ -1,5 +1,5 @@ { - home = { + home-manager.users.opdavies.home = { sessionPath = [ "$HOME/.local/bin" ]; file.".local/bin" = { diff --git a/modules/home-manager/cli/bin/scripts/create-script b/modules/mixins/scripts/scripts/create-script similarity index 100% rename from modules/home-manager/cli/bin/scripts/create-script rename to modules/mixins/scripts/scripts/create-script diff --git a/modules/home-manager/cli/bin/scripts/git-abort b/modules/mixins/scripts/scripts/git-abort similarity index 100% rename from modules/home-manager/cli/bin/scripts/git-abort rename to modules/mixins/scripts/scripts/git-abort diff --git a/modules/home-manager/cli/bin/scripts/git-bare-clone b/modules/mixins/scripts/scripts/git-bare-clone similarity index 100% rename from modules/home-manager/cli/bin/scripts/git-bare-clone rename to modules/mixins/scripts/scripts/git-bare-clone diff --git a/modules/home-manager/cli/bin/scripts/git-continue b/modules/mixins/scripts/scripts/git-continue similarity index 100% rename from modules/home-manager/cli/bin/scripts/git-continue rename to modules/mixins/scripts/scripts/git-continue diff --git a/modules/home-manager/cli/bin/scripts/git-sync b/modules/mixins/scripts/scripts/git-sync similarity index 100% rename from modules/home-manager/cli/bin/scripts/git-sync rename to modules/mixins/scripts/scripts/git-sync diff --git a/modules/home-manager/cli/bin/scripts/git-up b/modules/mixins/scripts/scripts/git-up similarity index 100% rename from modules/home-manager/cli/bin/scripts/git-up rename to modules/mixins/scripts/scripts/git-up diff --git a/modules/home-manager/cli/bin/scripts/import-gzip-database b/modules/mixins/scripts/scripts/import-gzip-database similarity index 100% rename from modules/home-manager/cli/bin/scripts/import-gzip-database rename to modules/mixins/scripts/scripts/import-gzip-database diff --git a/modules/home-manager/cli/bin/scripts/main-or-master-branch b/modules/mixins/scripts/scripts/main-or-master-branch similarity index 100% rename from modules/home-manager/cli/bin/scripts/main-or-master-branch rename to modules/mixins/scripts/scripts/main-or-master-branch diff --git a/modules/home-manager/cli/bin/scripts/mounter b/modules/mixins/scripts/scripts/mounter similarity index 100% rename from modules/home-manager/cli/bin/scripts/mounter rename to modules/mixins/scripts/scripts/mounter diff --git a/modules/home-manager/cli/bin/scripts/move-firefox-screenshots b/modules/mixins/scripts/scripts/move-firefox-screenshots similarity index 100% rename from modules/home-manager/cli/bin/scripts/move-firefox-screenshots rename to modules/mixins/scripts/scripts/move-firefox-screenshots diff --git a/modules/home-manager/cli/bin/scripts/new-drupal-module b/modules/mixins/scripts/scripts/new-drupal-module similarity index 100% rename from modules/home-manager/cli/bin/scripts/new-drupal-module rename to modules/mixins/scripts/scripts/new-drupal-module diff --git a/modules/home-manager/cli/bin/scripts/setbg b/modules/mixins/scripts/scripts/setbg similarity index 100% rename from modules/home-manager/cli/bin/scripts/setbg rename to modules/mixins/scripts/scripts/setbg diff --git a/modules/home-manager/cli/bin/scripts/start-traefik b/modules/mixins/scripts/scripts/start-traefik similarity index 100% rename from modules/home-manager/cli/bin/scripts/start-traefik rename to modules/mixins/scripts/scripts/start-traefik diff --git a/modules/home-manager/cli/bin/scripts/stop-all-docker-containers b/modules/mixins/scripts/scripts/stop-all-docker-containers similarity index 100% rename from modules/home-manager/cli/bin/scripts/stop-all-docker-containers rename to modules/mixins/scripts/scripts/stop-all-docker-containers diff --git a/modules/home-manager/cli/bin/scripts/stop-traefik b/modules/mixins/scripts/scripts/stop-traefik similarity index 100% rename from modules/home-manager/cli/bin/scripts/stop-traefik rename to modules/mixins/scripts/scripts/stop-traefik diff --git a/modules/home-manager/cli/bin/scripts/tag-release b/modules/mixins/scripts/scripts/tag-release similarity index 100% rename from modules/home-manager/cli/bin/scripts/tag-release rename to modules/mixins/scripts/scripts/tag-release diff --git a/modules/home-manager/cli/bin/scripts/unmounter b/modules/mixins/scripts/scripts/unmounter similarity index 100% rename from modules/home-manager/cli/bin/scripts/unmounter rename to modules/mixins/scripts/scripts/unmounter diff --git a/modules/home-manager/cli/bin/scripts/update-all-git-repos b/modules/mixins/scripts/scripts/update-all-git-repos similarity index 100% rename from modules/home-manager/cli/bin/scripts/update-all-git-repos rename to modules/mixins/scripts/scripts/update-all-git-repos