diff --git a/modules/devos/cachix/default.nix b/modules/global/caches/default.nix similarity index 100% rename from modules/devos/cachix/default.nix rename to modules/global/caches/default.nix diff --git a/modules/devos/cachix/nix-community.nix b/modules/global/caches/nix-community.nix similarity index 100% rename from modules/devos/cachix/nix-community.nix rename to modules/global/caches/nix-community.nix diff --git a/modules/devos/cachix/nrdxp.nix b/modules/global/caches/nrdxp.nix similarity index 100% rename from modules/devos/cachix/nrdxp.nix rename to modules/global/caches/nrdxp.nix diff --git a/modules/devos/cachix/ssh.nix b/modules/global/caches/ssh.nix similarity index 100% rename from modules/devos/cachix/ssh.nix rename to modules/global/caches/ssh.nix diff --git a/modules/devos/hm-system-defaults.nix b/modules/global/hm-system-defaults.nix similarity index 100% rename from modules/devos/hm-system-defaults.nix rename to modules/global/hm-system-defaults.nix diff --git a/modules/devos/nix.nix b/modules/global/nix.nix similarity index 90% rename from modules/devos/nix.nix rename to modules/global/nix.nix index 114bb0c..c23b91c 100644 --- a/modules/devos/nix.nix +++ b/modules/global/nix.nix @@ -43,12 +43,6 @@ with lib; secret-key-files = ${config.secrets.binary-cache-private-key} '' else ""); - # nixPath = [ - # "nixpkgs=${channel.input}" - # "nixos-config=${../../lib/compat/nixos}" - # "home-manager=${inputs.home}" - # ]; - localRegistry = { enable = true; cacheGlobalRegistry = true; @@ -85,13 +79,10 @@ with lib; { # nix n = "nix"; - np = "n profile"; - ni = "np install"; - nr = "np remove"; ns = "n search --no-update-lock-file"; nf = "n flake"; nepl = "n repl ''"; - srch = "ns nixos"; + srch = "ns nixpkgs"; nrb = ifSudo "sudo nixos-rebuild"; mn = '' manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | sk --preview="manix '{}'" | xargs manix diff --git a/modules/devos/options.nix b/modules/global/options.nix similarity index 100% rename from modules/devos/options.nix rename to modules/global/options.nix