From bf82970b9e7aaf61fc040052b7833fee369cf27b Mon Sep 17 00:00:00 2001 From: Nickolaj Jepsen Date: Tue, 20 May 2025 20:05:23 +0200 Subject: [PATCH] refactor: prepare new modules structure --- hosts/default.nix | 29 +++++-------------- {modules => legacy_modules}/apps/chromium.nix | 0 {modules => legacy_modules}/apps/claude.nix | 0 {modules => legacy_modules}/apps/ferdium.nix | 0 {modules => legacy_modules}/apps/firefox.nix | 0 {modules => legacy_modules}/apps/ghostty.nix | 4 +-- {modules => legacy_modules}/apps/obsidian.nix | 0 {modules => legacy_modules}/apps/ollama.nix | 0 {modules => legacy_modules}/apps/pycharm.nix | 0 {modules => legacy_modules}/apps/slack.nix | 0 {modules => legacy_modules}/apps/spotify.nix | 0 .../apps/sublime-merge.nix | 0 {modules => legacy_modules}/apps/vscode.nix | 0 .../desktop/fireproof-shell.nix | 0 {modules => legacy_modules}/desktop/fonts.nix | 0 .../desktop/fuzzel.nix | 0 .../desktop/greetd.nix | 0 .../desktop/gtk/default.nix | 0 .../desktop/gtk/theme.css | 0 .../desktop/hyprland/backgrounds/geometry.svg | 0 .../desktop/hyprland/backgrounds/unknown.svg | 0 .../desktop/hyprland/default.nix | 2 +- .../desktop/hyprland/hypridle.nix | 0 .../desktop/hyprland/hyprlock.nix | 0 .../desktop/hyprland/hyprpaper.nix | 0 .../desktop/hyprland/hyprpolkitagent.nix | 0 {modules => legacy_modules}/desktop/mako.nix | 0 {modules => legacy_modules}/desktop/niri.nix | 0 {modules => legacy_modules}/desktop/qt.nix | 0 .../shell => legacy_modules/dev}/aider.nix | 0 .../dev/clickhouse.nix | 0 {modules => legacy_modules}/dev/docker.nix | 0 .../dev/javascript.nix | 0 {modules => legacy_modules}/dev/just.nix | 0 {modules => legacy_modules}/dev/k8s.nix | 0 {modules => legacy_modules}/dev/postgres.nix | 0 {modules => legacy_modules}/dev/python.nix | 0 {modules => legacy_modules}/dev/tilt.nix | 0 {modules => legacy_modules}/devenv.nix | 1 + {modules => legacy_modules}/graphical.nix | 0 .../hardware/audio.nix | 0 .../hardware/monitors.nix | 0 modules/base/default.nix | 22 ++++++++++++++ .../base/{default-apps.nix => defaults.nix} | 5 ++-- modules/base/envvar.nix | 5 ---- modules/base/home-manager.nix | 24 +++++++++++++++ modules/base/hosts.nix | 17 +++++++++++ modules/base/networking.nix | 14 --------- modules/{hardware => base}/usb.nix | 0 modules/base/user.nix | 19 +----------- modules/{hardware => base}/yubikey.nix | 0 modules/{shell => programs}/comma.nix | 0 modules/{shell => programs}/core.nix | 0 modules/programs/default.nix | 11 +++++++ .../fish/autocomplete.fish | 0 modules/{shell => programs}/fish/default.nix | 0 modules/{shell => programs}/fish/k8s.fish | 0 modules/{shell => programs}/fish/theme.fish | 0 modules/{shell => programs}/git.nix | 0 modules/programs/just.nix | 5 ++++ modules/{shell => programs}/neovim.nix | 0 modules/{shell => programs}/zellij.nix | 0 modules/{shell => programs}/zoxide.nix | 0 modules/required.nix | 18 ------------ modules/shell.nix | 12 -------- 65 files changed, 94 insertions(+), 94 deletions(-) rename {modules => legacy_modules}/apps/chromium.nix (100%) rename {modules => legacy_modules}/apps/claude.nix (100%) rename {modules => legacy_modules}/apps/ferdium.nix (100%) rename {modules => legacy_modules}/apps/firefox.nix (100%) rename {modules => legacy_modules}/apps/ghostty.nix (94%) rename {modules => legacy_modules}/apps/obsidian.nix (100%) rename {modules => legacy_modules}/apps/ollama.nix (100%) rename {modules => legacy_modules}/apps/pycharm.nix (100%) rename {modules => legacy_modules}/apps/slack.nix (100%) rename {modules => legacy_modules}/apps/spotify.nix (100%) rename {modules => legacy_modules}/apps/sublime-merge.nix (100%) rename {modules => legacy_modules}/apps/vscode.nix (100%) rename {modules => legacy_modules}/desktop/fireproof-shell.nix (100%) rename {modules => legacy_modules}/desktop/fonts.nix (100%) rename {modules => legacy_modules}/desktop/fuzzel.nix (100%) rename {modules => legacy_modules}/desktop/greetd.nix (100%) rename {modules => legacy_modules}/desktop/gtk/default.nix (100%) rename {modules => legacy_modules}/desktop/gtk/theme.css (100%) rename {modules => legacy_modules}/desktop/hyprland/backgrounds/geometry.svg (100%) rename {modules => legacy_modules}/desktop/hyprland/backgrounds/unknown.svg (100%) rename {modules => legacy_modules}/desktop/hyprland/default.nix (99%) rename {modules => legacy_modules}/desktop/hyprland/hypridle.nix (100%) rename {modules => legacy_modules}/desktop/hyprland/hyprlock.nix (100%) rename {modules => legacy_modules}/desktop/hyprland/hyprpaper.nix (100%) rename {modules => legacy_modules}/desktop/hyprland/hyprpolkitagent.nix (100%) rename {modules => legacy_modules}/desktop/mako.nix (100%) rename {modules => legacy_modules}/desktop/niri.nix (100%) rename {modules => legacy_modules}/desktop/qt.nix (100%) rename {modules/shell => legacy_modules/dev}/aider.nix (100%) rename {modules => legacy_modules}/dev/clickhouse.nix (100%) rename {modules => legacy_modules}/dev/docker.nix (100%) rename {modules => legacy_modules}/dev/javascript.nix (100%) rename {modules => legacy_modules}/dev/just.nix (100%) rename {modules => legacy_modules}/dev/k8s.nix (100%) rename {modules => legacy_modules}/dev/postgres.nix (100%) rename {modules => legacy_modules}/dev/python.nix (100%) rename {modules => legacy_modules}/dev/tilt.nix (100%) rename {modules => legacy_modules}/devenv.nix (93%) rename {modules => legacy_modules}/graphical.nix (100%) rename {modules => legacy_modules}/hardware/audio.nix (100%) rename {modules => legacy_modules}/hardware/monitors.nix (100%) create mode 100644 modules/base/default.nix rename modules/base/{default-apps.nix => defaults.nix} (68%) delete mode 100644 modules/base/envvar.nix create mode 100644 modules/base/home-manager.nix create mode 100644 modules/base/hosts.nix rename modules/{hardware => base}/usb.nix (100%) rename modules/{hardware => base}/yubikey.nix (100%) rename modules/{shell => programs}/comma.nix (100%) rename modules/{shell => programs}/core.nix (100%) create mode 100644 modules/programs/default.nix rename modules/{shell => programs}/fish/autocomplete.fish (100%) rename modules/{shell => programs}/fish/default.nix (100%) rename modules/{shell => programs}/fish/k8s.fish (100%) rename modules/{shell => programs}/fish/theme.fish (100%) rename modules/{shell => programs}/git.nix (100%) create mode 100644 modules/programs/just.nix rename modules/{shell => programs}/neovim.nix (100%) rename modules/{shell => programs}/zellij.nix (100%) rename modules/{shell => programs}/zoxide.nix (100%) delete mode 100644 modules/required.nix delete mode 100644 modules/shell.nix diff --git a/hosts/default.nix b/hosts/default.nix index b441f94..636f929 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -41,7 +41,8 @@ with lib; let inputs.fireproof-shell.nixosModules.default inputs.niri.nixosModules.niri inputs.zwift.nixosModules.zwift - ../modules/base/user.nix + ../modules/base + ../modules/programs (mkSystemImports hostname) { nixpkgs.config.allowUnfree = true; } ] @@ -57,49 +58,35 @@ in { bootstrap = mkSystem { hostname = "bootstrap"; username = "nixos"; - modules = [ - ../modules/required.nix - ../modules/shell.nix - ]; }; laptop = mkSystem { hostname = "laptop"; username = "nickolaj"; modules = [ - ../modules/required.nix - ../modules/shell.nix - ../modules/graphical.nix - ../modules/devenv.nix + ../legacy_modules/graphical.nix + ../legacy_modules/devenv.nix ]; }; desktop = mkSystem { hostname = "desktop"; username = "nickolaj"; modules = [ - ../modules/required.nix - ../modules/shell.nix - ../modules/graphical.nix - ../modules/devenv.nix + ../legacy_modules/graphical.nix + ../legacy_modules/devenv.nix ]; }; work = mkSystem { hostname = "work"; username = "nickolaj"; modules = [ - ../modules/required.nix - ../modules/shell.nix - ../modules/graphical.nix - ../modules/devenv.nix + ../legacy_modules/graphical.nix + ../legacy_modules/devenv.nix ]; }; homelab = mkSystem { hostname = "homelab"; username = "nickolaj"; - modules = [ - ../modules/required.nix - ../modules/shell.nix - ]; }; }; } diff --git a/modules/apps/chromium.nix b/legacy_modules/apps/chromium.nix similarity index 100% rename from modules/apps/chromium.nix rename to legacy_modules/apps/chromium.nix diff --git a/modules/apps/claude.nix b/legacy_modules/apps/claude.nix similarity index 100% rename from modules/apps/claude.nix rename to legacy_modules/apps/claude.nix diff --git a/modules/apps/ferdium.nix b/legacy_modules/apps/ferdium.nix similarity index 100% rename from modules/apps/ferdium.nix rename to legacy_modules/apps/ferdium.nix diff --git a/modules/apps/firefox.nix b/legacy_modules/apps/firefox.nix similarity index 100% rename from modules/apps/firefox.nix rename to legacy_modules/apps/firefox.nix diff --git a/modules/apps/ghostty.nix b/legacy_modules/apps/ghostty.nix similarity index 94% rename from modules/apps/ghostty.nix rename to legacy_modules/apps/ghostty.nix index 6ea1de6..282871e 100644 --- a/modules/apps/ghostty.nix +++ b/legacy_modules/apps/ghostty.nix @@ -46,7 +46,5 @@ }; }; }; - fireproof.default-apps = { - terminal = "ghostty"; - }; + fireproof.base.defaults.terminal = "ghostty"; } diff --git a/modules/apps/obsidian.nix b/legacy_modules/apps/obsidian.nix similarity index 100% rename from modules/apps/obsidian.nix rename to legacy_modules/apps/obsidian.nix diff --git a/modules/apps/ollama.nix b/legacy_modules/apps/ollama.nix similarity index 100% rename from modules/apps/ollama.nix rename to legacy_modules/apps/ollama.nix diff --git a/modules/apps/pycharm.nix b/legacy_modules/apps/pycharm.nix similarity index 100% rename from modules/apps/pycharm.nix rename to legacy_modules/apps/pycharm.nix diff --git a/modules/apps/slack.nix b/legacy_modules/apps/slack.nix similarity index 100% rename from modules/apps/slack.nix rename to legacy_modules/apps/slack.nix diff --git a/modules/apps/spotify.nix b/legacy_modules/apps/spotify.nix similarity index 100% rename from modules/apps/spotify.nix rename to legacy_modules/apps/spotify.nix diff --git a/modules/apps/sublime-merge.nix b/legacy_modules/apps/sublime-merge.nix similarity index 100% rename from modules/apps/sublime-merge.nix rename to legacy_modules/apps/sublime-merge.nix diff --git a/modules/apps/vscode.nix b/legacy_modules/apps/vscode.nix similarity index 100% rename from modules/apps/vscode.nix rename to legacy_modules/apps/vscode.nix diff --git a/modules/desktop/fireproof-shell.nix b/legacy_modules/desktop/fireproof-shell.nix similarity index 100% rename from modules/desktop/fireproof-shell.nix rename to legacy_modules/desktop/fireproof-shell.nix diff --git a/modules/desktop/fonts.nix b/legacy_modules/desktop/fonts.nix similarity index 100% rename from modules/desktop/fonts.nix rename to legacy_modules/desktop/fonts.nix diff --git a/modules/desktop/fuzzel.nix b/legacy_modules/desktop/fuzzel.nix similarity index 100% rename from modules/desktop/fuzzel.nix rename to legacy_modules/desktop/fuzzel.nix diff --git a/modules/desktop/greetd.nix b/legacy_modules/desktop/greetd.nix similarity index 100% rename from modules/desktop/greetd.nix rename to legacy_modules/desktop/greetd.nix diff --git a/modules/desktop/gtk/default.nix b/legacy_modules/desktop/gtk/default.nix similarity index 100% rename from modules/desktop/gtk/default.nix rename to legacy_modules/desktop/gtk/default.nix diff --git a/modules/desktop/gtk/theme.css b/legacy_modules/desktop/gtk/theme.css similarity index 100% rename from modules/desktop/gtk/theme.css rename to legacy_modules/desktop/gtk/theme.css diff --git a/modules/desktop/hyprland/backgrounds/geometry.svg b/legacy_modules/desktop/hyprland/backgrounds/geometry.svg similarity index 100% rename from modules/desktop/hyprland/backgrounds/geometry.svg rename to legacy_modules/desktop/hyprland/backgrounds/geometry.svg diff --git a/modules/desktop/hyprland/backgrounds/unknown.svg b/legacy_modules/desktop/hyprland/backgrounds/unknown.svg similarity index 100% rename from modules/desktop/hyprland/backgrounds/unknown.svg rename to legacy_modules/desktop/hyprland/backgrounds/unknown.svg diff --git a/modules/desktop/hyprland/default.nix b/legacy_modules/desktop/hyprland/default.nix similarity index 99% rename from modules/desktop/hyprland/default.nix rename to legacy_modules/desktop/hyprland/default.nix index b0f8e7c..608f80c 100644 --- a/modules/desktop/hyprland/default.nix +++ b/legacy_modules/desktop/hyprland/default.nix @@ -233,7 +233,7 @@ in { }; bind = [ - "SUPER, RETURN, exec, ${getExe config.programs.uwsm.package} app -- ${cfg.default-apps.terminal}" + "SUPER, RETURN, exec, ${getExe config.programs.uwsm.package} app -- ${cfg.base.defaults.terminal}" "SUPER, BACKSPACE, killactive" "SUPER, SPACE, exec, astal launcher" "SUPER, semicolon, exec, astal launcher .e" diff --git a/modules/desktop/hyprland/hypridle.nix b/legacy_modules/desktop/hyprland/hypridle.nix similarity index 100% rename from modules/desktop/hyprland/hypridle.nix rename to legacy_modules/desktop/hyprland/hypridle.nix diff --git a/modules/desktop/hyprland/hyprlock.nix b/legacy_modules/desktop/hyprland/hyprlock.nix similarity index 100% rename from modules/desktop/hyprland/hyprlock.nix rename to legacy_modules/desktop/hyprland/hyprlock.nix diff --git a/modules/desktop/hyprland/hyprpaper.nix b/legacy_modules/desktop/hyprland/hyprpaper.nix similarity index 100% rename from modules/desktop/hyprland/hyprpaper.nix rename to legacy_modules/desktop/hyprland/hyprpaper.nix diff --git a/modules/desktop/hyprland/hyprpolkitagent.nix b/legacy_modules/desktop/hyprland/hyprpolkitagent.nix similarity index 100% rename from modules/desktop/hyprland/hyprpolkitagent.nix rename to legacy_modules/desktop/hyprland/hyprpolkitagent.nix diff --git a/modules/desktop/mako.nix b/legacy_modules/desktop/mako.nix similarity index 100% rename from modules/desktop/mako.nix rename to legacy_modules/desktop/mako.nix diff --git a/modules/desktop/niri.nix b/legacy_modules/desktop/niri.nix similarity index 100% rename from modules/desktop/niri.nix rename to legacy_modules/desktop/niri.nix diff --git a/modules/desktop/qt.nix b/legacy_modules/desktop/qt.nix similarity index 100% rename from modules/desktop/qt.nix rename to legacy_modules/desktop/qt.nix diff --git a/modules/shell/aider.nix b/legacy_modules/dev/aider.nix similarity index 100% rename from modules/shell/aider.nix rename to legacy_modules/dev/aider.nix diff --git a/modules/dev/clickhouse.nix b/legacy_modules/dev/clickhouse.nix similarity index 100% rename from modules/dev/clickhouse.nix rename to legacy_modules/dev/clickhouse.nix diff --git a/modules/dev/docker.nix b/legacy_modules/dev/docker.nix similarity index 100% rename from modules/dev/docker.nix rename to legacy_modules/dev/docker.nix diff --git a/modules/dev/javascript.nix b/legacy_modules/dev/javascript.nix similarity index 100% rename from modules/dev/javascript.nix rename to legacy_modules/dev/javascript.nix diff --git a/modules/dev/just.nix b/legacy_modules/dev/just.nix similarity index 100% rename from modules/dev/just.nix rename to legacy_modules/dev/just.nix diff --git a/modules/dev/k8s.nix b/legacy_modules/dev/k8s.nix similarity index 100% rename from modules/dev/k8s.nix rename to legacy_modules/dev/k8s.nix diff --git a/modules/dev/postgres.nix b/legacy_modules/dev/postgres.nix similarity index 100% rename from modules/dev/postgres.nix rename to legacy_modules/dev/postgres.nix diff --git a/modules/dev/python.nix b/legacy_modules/dev/python.nix similarity index 100% rename from modules/dev/python.nix rename to legacy_modules/dev/python.nix diff --git a/modules/dev/tilt.nix b/legacy_modules/dev/tilt.nix similarity index 100% rename from modules/dev/tilt.nix rename to legacy_modules/dev/tilt.nix diff --git a/modules/devenv.nix b/legacy_modules/devenv.nix similarity index 93% rename from modules/devenv.nix rename to legacy_modules/devenv.nix index 45771d5..4ab3186 100644 --- a/modules/devenv.nix +++ b/legacy_modules/devenv.nix @@ -10,6 +10,7 @@ ./dev/docker.nix ./dev/tilt.nix ./dev/postgres.nix + ./dev/aider.nix ./dev/clickhouse.nix ]; } diff --git a/modules/graphical.nix b/legacy_modules/graphical.nix similarity index 100% rename from modules/graphical.nix rename to legacy_modules/graphical.nix diff --git a/modules/hardware/audio.nix b/legacy_modules/hardware/audio.nix similarity index 100% rename from modules/hardware/audio.nix rename to legacy_modules/hardware/audio.nix diff --git a/modules/hardware/monitors.nix b/legacy_modules/hardware/monitors.nix similarity index 100% rename from modules/hardware/monitors.nix rename to legacy_modules/hardware/monitors.nix diff --git a/modules/base/default.nix b/modules/base/default.nix new file mode 100644 index 0000000..ff23298 --- /dev/null +++ b/modules/base/default.nix @@ -0,0 +1,22 @@ +_: { + options.fireproof.base = {}; + + imports = [ + ./boot.nix + ./defaults.nix + ./gc.nix + ./home-manager.nix + ./hosts.nix + ./keyd.nix + ./ld.nix + ./networking.nix + ./nix.nix + ./secrets.nix + ./security.nix + ./ssh.nix + ./time.nix + ./usb.nix + ./user.nix + ./yubikey.nix + ]; +} \ No newline at end of file diff --git a/modules/base/default-apps.nix b/modules/base/defaults.nix similarity index 68% rename from modules/base/default-apps.nix rename to modules/base/defaults.nix index 9a4103a..2a3c461 100644 --- a/modules/base/default-apps.nix +++ b/modules/base/defaults.nix @@ -1,5 +1,6 @@ -{lib, ...}: { - options.fireproof.default-apps = { +{lib, ...}: +{ + options.fireproof.base.defaults = { terminal = lib.mkOption { type = lib.types.str; description = "The terminal to use"; diff --git a/modules/base/envvar.nix b/modules/base/envvar.nix deleted file mode 100644 index 6c380c6..0000000 --- a/modules/base/envvar.nix +++ /dev/null @@ -1,5 +0,0 @@ -{config, ...}: { - environment.variables = { - EDITOR = config.defaults.editor; - }; -} diff --git a/modules/base/home-manager.nix b/modules/base/home-manager.nix new file mode 100644 index 0000000..ed8d76c --- /dev/null +++ b/modules/base/home-manager.nix @@ -0,0 +1,24 @@ +{ + lib, + options, + username, + ... +}: +with lib; { + options.fireproof = { + home-manager = lib.mkOption { + type = options.home-manager.users.type.nestedTypes.elemType; + }; + }; + config = { + home-manager = { + useUserPackages = true; + useGlobalPkgs = true; + }; + home-manager.users.${username} = mkAliasDefinitions options.fireproof.home-manager; + + # set the same version of home-manager as the system + fireproof.home-manager.home.stateVersion = "24.11"; + system.stateVersion = "24.11"; + }; +} diff --git a/modules/base/hosts.nix b/modules/base/hosts.nix new file mode 100644 index 0000000..b86e1c6 --- /dev/null +++ b/modules/base/hosts.nix @@ -0,0 +1,17 @@ +{ + config, + ... +}: { + age.secrets.hosts-private = { + # Contains IP addresses that i have no business sharing + rekeyFile = ../../secrets/hosts-private.age; + }; + + # Inject the private hosts file, because setting networking.hostFiles doesn't work + system.activationScripts.hosts-private = '' + cat /etc/hosts > /etc/hosts.bak + rm /etc/hosts + cat /etc/hosts.bak "${config.age.secrets.hosts-private.path}" >> /etc/hosts + rm /etc/hosts.bak + ''; +} diff --git a/modules/base/networking.nix b/modules/base/networking.nix index c7a8e72..4e044ab 100644 --- a/modules/base/networking.nix +++ b/modules/base/networking.nix @@ -1,21 +1,7 @@ { - config, hostname, ... }: { - age.secrets.hosts-private = { - # Contains IP addresses that i have no business sharing - rekeyFile = ../../secrets/hosts-private.age; - }; - - # Inject the private hosts file, because setting networking.hostFiles doesn't work - system.activationScripts.hosts-private = '' - cat /etc/hosts > /etc/hosts.bak - rm /etc/hosts - cat /etc/hosts.bak "${config.age.secrets.hosts-private.path}" >> /etc/hosts - rm /etc/hosts.bak - ''; - networking = { hostName = hostname; }; diff --git a/modules/hardware/usb.nix b/modules/base/usb.nix similarity index 100% rename from modules/hardware/usb.nix rename to modules/base/usb.nix diff --git a/modules/base/user.nix b/modules/base/user.nix index 2112a35..a880e2a 100644 --- a/modules/base/user.nix +++ b/modules/base/user.nix @@ -1,18 +1,11 @@ { - lib, - options, username, config, ... }: -with lib; let +let inherit (config.age) secrets; in { - options.fireproof = { - home-manager = lib.mkOption { - type = options.home-manager.users.type.nestedTypes.elemType; - }; - }; config = { age.secrets.hashed-user-password.rekeyFile = ../../secrets/hashed-user-password.age; @@ -21,15 +14,5 @@ in { extraGroups = ["wheel"]; hashedPasswordFile = secrets.hashed-user-password.path; }; - - home-manager = { - useUserPackages = true; - useGlobalPkgs = true; - }; - home-manager.users.${username} = mkAliasDefinitions options.fireproof.home-manager; - - # set the same version of home-manager as the system - fireproof.home-manager.home.stateVersion = "24.11"; - system.stateVersion = "24.11"; }; } diff --git a/modules/hardware/yubikey.nix b/modules/base/yubikey.nix similarity index 100% rename from modules/hardware/yubikey.nix rename to modules/base/yubikey.nix diff --git a/modules/shell/comma.nix b/modules/programs/comma.nix similarity index 100% rename from modules/shell/comma.nix rename to modules/programs/comma.nix diff --git a/modules/shell/core.nix b/modules/programs/core.nix similarity index 100% rename from modules/shell/core.nix rename to modules/programs/core.nix diff --git a/modules/programs/default.nix b/modules/programs/default.nix new file mode 100644 index 0000000..8b1c616 --- /dev/null +++ b/modules/programs/default.nix @@ -0,0 +1,11 @@ +_: { + imports = [ + ./fish/default.nix + ./core.nix + ./git.nix + ./just.nix + ./neovim.nix + ./zellij.nix + ./zoxide.nix + ]; +} \ No newline at end of file diff --git a/modules/shell/fish/autocomplete.fish b/modules/programs/fish/autocomplete.fish similarity index 100% rename from modules/shell/fish/autocomplete.fish rename to modules/programs/fish/autocomplete.fish diff --git a/modules/shell/fish/default.nix b/modules/programs/fish/default.nix similarity index 100% rename from modules/shell/fish/default.nix rename to modules/programs/fish/default.nix diff --git a/modules/shell/fish/k8s.fish b/modules/programs/fish/k8s.fish similarity index 100% rename from modules/shell/fish/k8s.fish rename to modules/programs/fish/k8s.fish diff --git a/modules/shell/fish/theme.fish b/modules/programs/fish/theme.fish similarity index 100% rename from modules/shell/fish/theme.fish rename to modules/programs/fish/theme.fish diff --git a/modules/shell/git.nix b/modules/programs/git.nix similarity index 100% rename from modules/shell/git.nix rename to modules/programs/git.nix diff --git a/modules/programs/just.nix b/modules/programs/just.nix new file mode 100644 index 0000000..d5ff3f0 --- /dev/null +++ b/modules/programs/just.nix @@ -0,0 +1,5 @@ +{pkgsUnstable, ...}: { + environment.systemPackages = [ + pkgsUnstable.just + ]; +} diff --git a/modules/shell/neovim.nix b/modules/programs/neovim.nix similarity index 100% rename from modules/shell/neovim.nix rename to modules/programs/neovim.nix diff --git a/modules/shell/zellij.nix b/modules/programs/zellij.nix similarity index 100% rename from modules/shell/zellij.nix rename to modules/programs/zellij.nix diff --git a/modules/shell/zoxide.nix b/modules/programs/zoxide.nix similarity index 100% rename from modules/shell/zoxide.nix rename to modules/programs/zoxide.nix diff --git a/modules/required.nix b/modules/required.nix deleted file mode 100644 index fcf779e..0000000 --- a/modules/required.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - imports = [ - ./base/nix.nix - ./base/networking.nix - ./base/security.nix - ./base/secrets.nix - ./base/boot.nix - ./base/ld.nix - ./base/time.nix - ./base/ssh.nix - ./base/default-apps.nix - ./base/keyd.nix - ./base/gc.nix - ./dev/just.nix - ./hardware/usb.nix - ./hardware/yubikey.nix - ]; -} diff --git a/modules/shell.nix b/modules/shell.nix deleted file mode 100644 index 1d53834..0000000 --- a/modules/shell.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - imports = [ - ./shell/core.nix - ./shell/fish/default.nix - ./shell/git.nix - ./shell/comma.nix - ./shell/neovim.nix - ./shell/zellij.nix - ./shell/zoxide.nix - ./shell/aider.nix - ]; -}