From 54b43e42031c299a70f8307ebc2dd9d49122c383 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 3 May 2025 16:50:27 +0100 Subject: [PATCH] Remove `features` --- home/opdavies/PW05CH3L.nix | 68 ++++++------ home/opdavies/lemp11.nix | 12 +-- home/opdavies/nixedo.nix | 10 +- home/opdavies/t480.nix | 100 +++++++++--------- hosts/PW05CH3L/configuration.nix | 8 +- hosts/lemp11/configuration.nix | 12 +-- hosts/nixedo/configuration.nix | 8 +- hosts/nixedo/homelab.nix | 2 +- hosts/nixedo/modules/audiobookshelf.nix | 4 +- .../modules/containers/tubearchivist.nix | 4 +- hosts/nixedo/modules/default.nix | 2 +- hosts/nixedo/modules/forgejo.nix | 4 +- hosts/nixedo/modules/immich.nix | 4 +- hosts/nixedo/modules/jellyfin.nix | 4 +- hosts/nixedo/modules/paperless.nix | 4 +- hosts/nixedo/services/homepage/default.nix | 4 +- hosts/nixedo/services/homepage/services.nix | 2 +- hosts/nixedo/services/uptime-kuma.nix | 4 +- hosts/nixedo/services/vaultwarden.nix | 4 +- hosts/t480/configuration.nix | 46 ++++---- hosts/t490/configuration.nix | 12 +-- hosts/t490/services/redshift.nix | 4 +- modules/home-manager/cli/bluetuith.nix | 4 +- modules/home-manager/cli/direnv.nix | 4 +- modules/home-manager/cli/fzf.nix | 4 +- modules/home-manager/cli/git.nix | 4 +- modules/home-manager/cli/node.nix | 4 +- modules/home-manager/cli/notes.nix | 4 +- modules/home-manager/cli/ranger.nix | 4 +- modules/home-manager/cli/starship.nix | 4 +- modules/home-manager/cli/tmux-sessionizer.nix | 4 +- modules/home-manager/cli/tmux.nix | 4 +- modules/home-manager/cli/zsh/default.nix | 4 +- .../home-manager/coding/neovim/default.nix | 4 +- .../home-manager/coding/phpactor/default.nix | 4 +- .../home-manager/desktop/browsers/firefox.nix | 4 +- .../desktop/browsers/qutebrowser.nix | 4 +- modules/home-manager/desktop/flameshot.nix | 4 +- modules/home-manager/desktop/gtk.nix | 4 +- .../home-manager/desktop/media/handbrake.nix | 4 +- .../home-manager/desktop/media/makemkv.nix | 4 +- modules/home-manager/desktop/media/mpv.nix | 4 +- modules/nixos/cli/docker.nix | 4 +- modules/nixos/cli/password-store.nix | 4 +- modules/nixos/cli/podman.nix | 4 +- modules/nixos/core/bluetooth.nix | 4 +- modules/nixos/core/openssh.nix | 4 +- modules/nixos/core/pipewire.nix | 4 +- modules/nixos/core/xbanish.nix | 4 +- modules/nixos/core/zram.nix | 4 +- modules/nixos/desktop/dconf.nix | 4 +- modules/nixos/desktop/dwm/default.nix | 4 +- modules/nixos/desktop/fonts.nix | 4 +- modules/nixos/desktop/media/makemkv.nix | 4 +- modules/nixos/desktop/st.nix | 4 +- modules/nixos/desktop/thunar.nix | 4 +- .../nixos/homelab/gitea-actions-runner.nix | 4 +- users/opdavies.nix | 4 +- 58 files changed, 224 insertions(+), 242 deletions(-) diff --git a/home/opdavies/PW05CH3L.nix b/home/opdavies/PW05CH3L.nix index 44720f29..1282e998 100644 --- a/home/opdavies/PW05CH3L.nix +++ b/home/opdavies/PW05CH3L.nix @@ -3,46 +3,44 @@ { imports = [ ../common ]; - features = { - cli = { - direnv.enable = true; - fzf.enable = true; + cli = { + direnv.enable = true; + fzf.enable = true; - git = { - enable = true; + git = { + enable = true; - user.emailAddress = "oliver.davies@tfw.wales"; - }; - - node.enable = true; - ranger.enable = true; - starship.enable = true; - tmux.enable = true; - - tmux-sessionizer = { - enable = true; - - directories = - let - inherit (config.xdg.userDirs) documents extraConfig; - - repos = extraConfig.XDG_REPOS_DIR; - in - options.features.cli.tmux-sessionizer.directories.default - ++ [ - repos - "${repos}/*" - documents - ]; - }; - - zsh.enable = true; + user.emailAddress = "oliver.davies@tfw.wales"; }; - coding = { - neovim.enable = true; - phpactor.enable = true; + node.enable = true; + ranger.enable = true; + starship.enable = true; + tmux.enable = true; + + tmux-sessionizer = { + enable = true; + + directories = + let + inherit (config.xdg.userDirs) documents extraConfig; + + repos = extraConfig.XDG_REPOS_DIR; + in + options.cli.tmux-sessionizer.directories.default + ++ [ + repos + "${repos}/*" + documents + ]; }; + + zsh.enable = true; + }; + + coding = { + neovim.enable = true; + phpactor.enable = true; }; xdg.configFile."pam-gnupg".text = '' diff --git a/home/opdavies/lemp11.nix b/home/opdavies/lemp11.nix index 1917a2db..925d863d 100644 --- a/home/opdavies/lemp11.nix +++ b/home/opdavies/lemp11.nix @@ -1,13 +1,11 @@ { imports = [ ../common ]; - features = { - cli.zsh.enable = true; + cli.zsh.enable = true; - desktop.media = { - handbrake.enable = true; - makemkv.enable = true; - mpv.enable = true; - }; + desktop.media = { + handbrake.enable = true; + makemkv.enable = true; + mpv.enable = true; }; } diff --git a/home/opdavies/nixedo.nix b/home/opdavies/nixedo.nix index 51ddf98a..636f67d1 100644 --- a/home/opdavies/nixedo.nix +++ b/home/opdavies/nixedo.nix @@ -1,11 +1,9 @@ { imports = [ ../common ]; - features = { - cli = { - fzf.enable = true; - starship.enable = true; - zsh.enable = true; - }; + cli = { + fzf.enable = true; + starship.enable = true; + zsh.enable = true; }; } diff --git a/home/opdavies/t480.nix b/home/opdavies/t480.nix index 407a4807..5035f03a 100644 --- a/home/opdavies/t480.nix +++ b/home/opdavies/t480.nix @@ -3,68 +3,66 @@ { imports = [ ../common ]; - features = { - cli = { - bluetuith.enable = true; - direnv.enable = true; - fzf.enable = true; + cli = { + bluetuith.enable = true; + direnv.enable = true; + fzf.enable = true; - git = { - enable = true; + git = { + enable = true; - user.emailAddress = "oliver@oliverdavies.uk"; - }; - - node.enable = true; - notes.enable = true; - ranger.enable = true; - starship.enable = true; - tmux.enable = true; - - tmux-sessionizer = { - enable = true; - - directories = - let - inherit (config.xdg.userDirs) documents extraConfig; - - repos = extraConfig.XDG_REPOS_DIR; - in - options.features.cli.tmux-sessionizer.directories.default - ++ [ - repos - "${repos}/*" - documents - ]; - }; - - zsh.enable = true; + user.emailAddress = "oliver@oliverdavies.uk"; }; - coding = { - neovim.enable = true; - phpactor.enable = true; + node.enable = true; + notes.enable = true; + ranger.enable = true; + starship.enable = true; + tmux.enable = true; + + tmux-sessionizer = { + enable = true; + + directories = + let + inherit (config.xdg.userDirs) documents extraConfig; + + repos = extraConfig.XDG_REPOS_DIR; + in + options.cli.tmux-sessionizer.directories.default + ++ [ + repos + "${repos}/*" + documents + ]; }; - desktop = { - browsers = { - firefox = { - enable = true; + zsh.enable = true; + }; - homepageUrl = "https://nixedo.oliverdavies.uk"; - }; + coding = { + neovim.enable = true; + phpactor.enable = true; + }; - qutebrowser.enable = true; + desktop = { + browsers = { + firefox = { + enable = true; + + homepageUrl = "https://nixedo.oliverdavies.uk"; }; - flameshot.enable = true; - gtk.enable = true; + qutebrowser.enable = true; + }; - media = { - handbrake.enable = true; - makemkv.enable = true; - mpv.enable = true; - }; + flameshot.enable = true; + gtk.enable = true; + + media = { + handbrake.enable = true; + makemkv.enable = true; + mpv.enable = true; }; }; diff --git a/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix index ac37da82..75f7b504 100644 --- a/hosts/PW05CH3L/configuration.nix +++ b/hosts/PW05CH3L/configuration.nix @@ -7,11 +7,9 @@ ./modules/wiki.nix ]; - features = { - cli = { - docker.enable = true; - password-store.enable = true; - }; + cli = { + docker.enable = true; + password-store.enable = true; }; wsl = { diff --git a/hosts/lemp11/configuration.nix b/hosts/lemp11/configuration.nix index 7580a61f..0c7c292c 100644 --- a/hosts/lemp11/configuration.nix +++ b/hosts/lemp11/configuration.nix @@ -11,15 +11,13 @@ ../../users/eric.nix ]; - features = { - core = { - bluetooth.enable = true; - zram.enable = true; - }; - - desktop.media.makemkv.enable = true; + core = { + bluetooth.enable = true; + zram.enable = true; }; + desktop.media.makemkv.enable = true; + # Bootloader. boot = { loader = { diff --git a/hosts/nixedo/configuration.nix b/hosts/nixedo/configuration.nix index 71450ffc..36051781 100644 --- a/hosts/nixedo/configuration.nix +++ b/hosts/nixedo/configuration.nix @@ -16,11 +16,9 @@ ../../users/opdavies.nix ]; - features = { - core.openssh.enable = true; - cli.podman.enable = true; - desktop.dconf.enable = true; - }; + core.openssh.enable = true; + cli.podman.enable = true; + desktop.dconf.enable = true; services.logind.lidSwitchExternalPower = "ignore"; diff --git a/hosts/nixedo/homelab.nix b/hosts/nixedo/homelab.nix index 16854bf8..cd08e4d6 100644 --- a/hosts/nixedo/homelab.nix +++ b/hosts/nixedo/homelab.nix @@ -3,7 +3,7 @@ postgresqlBackup.enable = true; }; - features.homelab = { + homelab = { enable = true; domain = "oliverdavies.uk"; diff --git a/hosts/nixedo/modules/audiobookshelf.nix b/hosts/nixedo/modules/audiobookshelf.nix index 5b494839..8e30bdd4 100644 --- a/hosts/nixedo/modules/audiobookshelf.nix +++ b/hosts/nixedo/modules/audiobookshelf.nix @@ -4,11 +4,11 @@ with lib; let cfg = homelab.services.${service}; - homelab = config.features.homelab; + homelab = config.homelab; service = "audiobookshelf"; in { - options.features.homelab.services.${service} = { + options.homelab.services.${service} = { enable = mkEnableOption "Enable ${service}"; url = mkOption { diff --git a/hosts/nixedo/modules/containers/tubearchivist.nix b/hosts/nixedo/modules/containers/tubearchivist.nix index 95cb26e0..8dfa947e 100644 --- a/hosts/nixedo/modules/containers/tubearchivist.nix +++ b/hosts/nixedo/modules/containers/tubearchivist.nix @@ -10,10 +10,10 @@ with lib; let cfg = homelab.services.${service}; service = "tubearchivist"; - homelab = config.features.homelab; + homelab = config.homelab; in { - options.features.homelab.services.${service} = { + options.homelab.services.${service} = { enable = mkEnableOption "Enable ${service}"; port = mkOption { diff --git a/hosts/nixedo/modules/default.nix b/hosts/nixedo/modules/default.nix index f9d47226..d5be97bb 100644 --- a/hosts/nixedo/modules/default.nix +++ b/hosts/nixedo/modules/default.nix @@ -3,7 +3,7 @@ with lib; { - options.features.homelab = { + options.homelab = { enable = mkEnableOption "Enable homelab services and configuration"; domain = mkOption { diff --git a/hosts/nixedo/modules/forgejo.nix b/hosts/nixedo/modules/forgejo.nix index be51de4d..4e63544c 100644 --- a/hosts/nixedo/modules/forgejo.nix +++ b/hosts/nixedo/modules/forgejo.nix @@ -4,11 +4,11 @@ with lib; let cfg = homelab.services.${service}; - homelab = config.features.homelab; + homelab = config.homelab; service = "forgejo"; in { - options.features.homelab.services.${service} = { + options.homelab.services.${service} = { enable = mkEnableOption "Enable ${service}"; url = mkOption { diff --git a/hosts/nixedo/modules/immich.nix b/hosts/nixedo/modules/immich.nix index 76f13072..51a7a472 100644 --- a/hosts/nixedo/modules/immich.nix +++ b/hosts/nixedo/modules/immich.nix @@ -9,11 +9,11 @@ with lib; let cfg = homelab.services.${service}; - homelab = config.features.homelab; + homelab = config.homelab; service = "immich"; in { - options.features.homelab.services.${service} = { + options.homelab.services.${service} = { enable = mkEnableOption "Enable ${service}"; url = mkOption { diff --git a/hosts/nixedo/modules/jellyfin.nix b/hosts/nixedo/modules/jellyfin.nix index 07992fbb..1d08c62a 100644 --- a/hosts/nixedo/modules/jellyfin.nix +++ b/hosts/nixedo/modules/jellyfin.nix @@ -4,11 +4,11 @@ with lib; let cfg = homelab.services.${service}; - homelab = config.features.homelab; + homelab = config.homelab; service = "jellyfin"; in { - options.features.homelab.services.${service} = { + options.homelab.services.${service} = { enable = mkEnableOption "Enable ${service}"; url = mkOption { diff --git a/hosts/nixedo/modules/paperless.nix b/hosts/nixedo/modules/paperless.nix index 6444fd31..8735b560 100644 --- a/hosts/nixedo/modules/paperless.nix +++ b/hosts/nixedo/modules/paperless.nix @@ -4,11 +4,11 @@ with lib; let cfg = homelab.services.paperless; - homelab = config.features.homelab; + homelab = config.homelab; service = "paperless"; in { - options.features.homelab.services.${service} = { + options.homelab.services.${service} = { enable = mkEnableOption "Enable ${service}"; url = mkOption { diff --git a/hosts/nixedo/services/homepage/default.nix b/hosts/nixedo/services/homepage/default.nix index 26cbc41d..18d20af2 100644 --- a/hosts/nixedo/services/homepage/default.nix +++ b/hosts/nixedo/services/homepage/default.nix @@ -9,12 +9,12 @@ with lib; let cfg = homelab.services.${service}; - homelab = config.features.homelab; + homelab = config.homelab; opts = options.services.${service}; service = "homepage-dashboard"; in { - options.features.homelab.services.${service} = { + options.homelab.services.${service} = { enable = mkEnableOption "Enable ${service}"; port = mkOption { diff --git a/hosts/nixedo/services/homepage/services.nix b/hosts/nixedo/services/homepage/services.nix index a0c3c232..52c8cec8 100644 --- a/hosts/nixedo/services/homepage/services.nix +++ b/hosts/nixedo/services/homepage/services.nix @@ -3,7 +3,7 @@ with lib; let - homelab = config.features.homelab.services; + homelab = config.homelab.services; homepageCategories = [ "Media" diff --git a/hosts/nixedo/services/uptime-kuma.nix b/hosts/nixedo/services/uptime-kuma.nix index bdda45b5..2bdb1487 100644 --- a/hosts/nixedo/services/uptime-kuma.nix +++ b/hosts/nixedo/services/uptime-kuma.nix @@ -4,11 +4,11 @@ with lib; let cfg = homelab.services.${service}; - homelab = config.features.homelab; + homelab = config.homelab; service = "uptime-kuma"; in { - options.features.homelab.services.${service} = { + options.homelab.services.${service} = { enable = mkEnableOption "Enable ${service}"; url = mkOption { diff --git a/hosts/nixedo/services/vaultwarden.nix b/hosts/nixedo/services/vaultwarden.nix index fa964665..8c00fc13 100644 --- a/hosts/nixedo/services/vaultwarden.nix +++ b/hosts/nixedo/services/vaultwarden.nix @@ -9,11 +9,11 @@ with lib; let cfg = homelab.services.${service}; - homelab = config.features.homelab; + homelab = config.homelab; service = "vaultwarden"; in { - options.features.homelab.services.${service} = { + options.homelab.services.${service} = { enable = mkEnableOption "Enable ${service}"; url = mkOption { diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix index 4e4a2dc9..61796b4f 100644 --- a/hosts/t480/configuration.nix +++ b/hosts/t480/configuration.nix @@ -12,33 +12,31 @@ ../../users/opdavies.nix ]; - features = { - cli.password-store = { - enable = true; + cli.password-store = { + enable = true; - extensions = with pkgs.passExtensions; [ - pass-audit - pass-otp - pass-update - ]; - }; + extensions = with pkgs.passExtensions; [ + pass-audit + pass-otp + pass-update + ]; + }; - core = { - bluetooth.enable = true; - openssh.enable = true; - pipewire.enable = true; - xbanish.enable = true; - zram.enable = true; - }; + core = { + bluetooth.enable = true; + openssh.enable = true; + pipewire.enable = true; + xbanish.enable = true; + zram.enable = true; + }; - desktop = { - dconf.enable = true; - dwm.enable = true; - fonts.enable = true; - media.makemkv.enable = true; - st.enable = true; - thunar.enable = true; - }; + desktop = { + dconf.enable = true; + dwm.enable = true; + fonts.enable = true; + media.makemkv.enable = true; + st.enable = true; + thunar.enable = true; }; boot = { diff --git a/hosts/t490/configuration.nix b/hosts/t490/configuration.nix index 925d17f3..8c737772 100644 --- a/hosts/t490/configuration.nix +++ b/hosts/t490/configuration.nix @@ -14,15 +14,13 @@ ../../users/opdavies.nix ]; - features = { - core = { - bluetooth.enable = true; - zram.enable = true; - }; - - desktop.dconf.enable = true; + core = { + bluetooth.enable = true; + zram.enable = true; }; + desktop.dconf.enable = true; + boot = { loader = { systemd-boot = { diff --git a/hosts/t490/services/redshift.nix b/hosts/t490/services/redshift.nix index 2bd9d4a1..f7e3bc71 100644 --- a/hosts/t490/services/redshift.nix +++ b/hosts/t490/services/redshift.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.redshift; + cfg = config.redshift; in { - options.features.redshift.enable = mkEnableOption "Enable redshift"; + options.redshift.enable = mkEnableOption "Enable redshift"; config = mkIf cfg.enable { location = { diff --git a/modules/home-manager/cli/bluetuith.nix b/modules/home-manager/cli/bluetuith.nix index fff34766..b699183f 100644 --- a/modules/home-manager/cli/bluetuith.nix +++ b/modules/home-manager/cli/bluetuith.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.cli.bluetuith; + cfg = config.cli.bluetuith; in { - options.features.cli.bluetuith.enable = mkEnableOption "Enable bluetuith"; + options.cli.bluetuith.enable = mkEnableOption "Enable bluetuith"; config = mkIf cfg.enable { home.packages = with pkgs; [ diff --git a/modules/home-manager/cli/direnv.nix b/modules/home-manager/cli/direnv.nix index 7c8d924b..875e27c3 100644 --- a/modules/home-manager/cli/direnv.nix +++ b/modules/home-manager/cli/direnv.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.cli.direnv; + cfg = config.cli.direnv; in { - options.features.cli.direnv.enable = mkEnableOption "Enable direnv"; + options.cli.direnv.enable = mkEnableOption "Enable direnv"; config = mkIf cfg.enable { programs.direnv = { diff --git a/modules/home-manager/cli/fzf.nix b/modules/home-manager/cli/fzf.nix index aae36ec1..2abbe2a1 100644 --- a/modules/home-manager/cli/fzf.nix +++ b/modules/home-manager/cli/fzf.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.cli.fzf; + cfg = config.cli.fzf; in { - options.features.cli.fzf.enable = mkEnableOption "Enable fzf"; + options.cli.fzf.enable = mkEnableOption "Enable fzf"; config = mkIf cfg.enable { programs.fzf = { diff --git a/modules/home-manager/cli/git.nix b/modules/home-manager/cli/git.nix index 5c678b0d..b49097ff 100644 --- a/modules/home-manager/cli/git.nix +++ b/modules/home-manager/cli/git.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.cli.git; + cfg = config.cli.git; in { - options.features.cli.git = { + options.cli.git = { enable = mkEnableOption "Enable git"; user = mkOption { diff --git a/modules/home-manager/cli/node.nix b/modules/home-manager/cli/node.nix index fba772c1..b0db6874 100644 --- a/modules/home-manager/cli/node.nix +++ b/modules/home-manager/cli/node.nix @@ -3,12 +3,12 @@ with lib; let - cfg = config.features.cli.node; + cfg = config.cli.node; inherit (config.xdg) configHome dataHome stateHome; in { - options.features.cli.node.enable = mkEnableOption "Enable node"; + options.cli.node.enable = mkEnableOption "Enable node"; config = mkIf cfg.enable { xdg.configFile."${config.home.sessionVariables.NPM_CONFIG_USERCONFIG}".text = '' diff --git a/modules/home-manager/cli/notes.nix b/modules/home-manager/cli/notes.nix index 686e2e09..ce16e525 100644 --- a/modules/home-manager/cli/notes.nix +++ b/modules/home-manager/cli/notes.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.cli.notes; + cfg = config.cli.notes; in { - options.features.cli.notes.enable = mkEnableOption "Enable notes"; + options.cli.notes.enable = mkEnableOption "Enable notes"; config = mkIf cfg.enable { xdg = { diff --git a/modules/home-manager/cli/ranger.nix b/modules/home-manager/cli/ranger.nix index 8fdc10cb..7a05fd57 100644 --- a/modules/home-manager/cli/ranger.nix +++ b/modules/home-manager/cli/ranger.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.cli.ranger; + cfg = config.cli.ranger; in { - options.features.cli.ranger.enable = mkEnableOption "Enable ranger"; + options.cli.ranger.enable = mkEnableOption "Enable ranger"; config = mkIf cfg.enable { programs.ranger.enable = true; diff --git a/modules/home-manager/cli/starship.nix b/modules/home-manager/cli/starship.nix index 57cc4f6d..a3673af6 100644 --- a/modules/home-manager/cli/starship.nix +++ b/modules/home-manager/cli/starship.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.cli.starship; + cfg = config.cli.starship; in { - options.features.cli.starship.enable = mkEnableOption "Enable starship"; + options.cli.starship.enable = mkEnableOption "Enable starship"; config = mkIf cfg.enable { programs.starship = diff --git a/modules/home-manager/cli/tmux-sessionizer.nix b/modules/home-manager/cli/tmux-sessionizer.nix index 5d945da3..20e82fa8 100644 --- a/modules/home-manager/cli/tmux-sessionizer.nix +++ b/modules/home-manager/cli/tmux-sessionizer.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.cli.tmux-sessionizer; + cfg = config.cli.tmux-sessionizer; in { - options.features.cli.tmux-sessionizer = { + options.cli.tmux-sessionizer = { enable = mkEnableOption "Enable tmux-sessionizer"; directories = mkOption { diff --git a/modules/home-manager/cli/tmux.nix b/modules/home-manager/cli/tmux.nix index 4ecf7d10..fb12514b 100644 --- a/modules/home-manager/cli/tmux.nix +++ b/modules/home-manager/cli/tmux.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.cli.tmux; + cfg = config.cli.tmux; in { - options.features.cli.tmux.enable = mkEnableOption "Enable tmux"; + options.cli.tmux.enable = mkEnableOption "Enable tmux"; config = mkIf cfg.enable { programs.tmux = { diff --git a/modules/home-manager/cli/zsh/default.nix b/modules/home-manager/cli/zsh/default.nix index ab60177c..ff44e389 100644 --- a/modules/home-manager/cli/zsh/default.nix +++ b/modules/home-manager/cli/zsh/default.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.cli.zsh; + cfg = config.cli.zsh; in { - options.features.cli.zsh.enable = mkEnableOption "Enable zsh"; + options.cli.zsh.enable = mkEnableOption "Enable zsh"; config = mkIf cfg.enable { programs.zsh = { diff --git a/modules/home-manager/coding/neovim/default.nix b/modules/home-manager/coding/neovim/default.nix index bd0b5b4c..6bf7c980 100644 --- a/modules/home-manager/coding/neovim/default.nix +++ b/modules/home-manager/coding/neovim/default.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.coding.neovim; + cfg = config.coding.neovim; in { - options.features.coding.neovim.enable = mkEnableOption "Enable neovim"; + options.coding.neovim.enable = mkEnableOption "Enable neovim"; config = mkIf cfg.enable { programs.neovim = diff --git a/modules/home-manager/coding/phpactor/default.nix b/modules/home-manager/coding/phpactor/default.nix index 6563aab7..17f4c681 100644 --- a/modules/home-manager/coding/phpactor/default.nix +++ b/modules/home-manager/coding/phpactor/default.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.coding.phpactor; + cfg = config.coding.phpactor; in { - options.features.coding.phpactor.enable = lib.mkEnableOption "Enable phpactor"; + options.coding.phpactor.enable = lib.mkEnableOption "Enable phpactor"; config = mkIf cfg.enable { home.packages = with pkgs; [ diff --git a/modules/home-manager/desktop/browsers/firefox.nix b/modules/home-manager/desktop/browsers/firefox.nix index dbee93d6..4b2b7418 100644 --- a/modules/home-manager/desktop/browsers/firefox.nix +++ b/modules/home-manager/desktop/browsers/firefox.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.desktop.browsers.firefox; + cfg = config.desktop.browsers.firefox; in { - options.features.desktop.browsers.firefox = { + options.desktop.browsers.firefox = { enable = mkEnableOption "Enable firefox"; homepageUrl = mkOption { diff --git a/modules/home-manager/desktop/browsers/qutebrowser.nix b/modules/home-manager/desktop/browsers/qutebrowser.nix index ff115fe7..ec90d979 100644 --- a/modules/home-manager/desktop/browsers/qutebrowser.nix +++ b/modules/home-manager/desktop/browsers/qutebrowser.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.desktop.browsers.qutebrowser; + cfg = config.desktop.browsers.qutebrowser; in { - options.features.desktop.browsers.qutebrowser.enable = + options.desktop.browsers.qutebrowser.enable = mkEnableOption "Enable qutebrowser"; config = mkIf cfg.enable { diff --git a/modules/home-manager/desktop/flameshot.nix b/modules/home-manager/desktop/flameshot.nix index bf0ba018..f8d51be9 100644 --- a/modules/home-manager/desktop/flameshot.nix +++ b/modules/home-manager/desktop/flameshot.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.desktop.flameshot; + cfg = config.desktop.flameshot; in { - options.features.desktop.flameshot.enable = mkEnableOption "Enable flameshot"; + options.desktop.flameshot.enable = mkEnableOption "Enable flameshot"; config = mkIf cfg.enable { services.flameshot = { diff --git a/modules/home-manager/desktop/gtk.nix b/modules/home-manager/desktop/gtk.nix index 3f737bc7..84b2fefc 100644 --- a/modules/home-manager/desktop/gtk.nix +++ b/modules/home-manager/desktop/gtk.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.desktop.gtk; + cfg = config.desktop.gtk; in { - options.features.desktop.gtk.enable = mkEnableOption "Enable gtk"; + options.desktop.gtk.enable = mkEnableOption "Enable gtk"; config = mkIf cfg.enable { gtk = with pkgs; { diff --git a/modules/home-manager/desktop/media/handbrake.nix b/modules/home-manager/desktop/media/handbrake.nix index e9e0c65b..5da7514e 100644 --- a/modules/home-manager/desktop/media/handbrake.nix +++ b/modules/home-manager/desktop/media/handbrake.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.desktop.media.handbrake; + cfg = config.desktop.media.handbrake; in { - options.features.desktop.media.handbrake.enable = mkEnableOption "Enable handbrake"; + options.desktop.media.handbrake.enable = mkEnableOption "Enable handbrake"; config = mkIf cfg.enable { home.packages = with pkgs; [ diff --git a/modules/home-manager/desktop/media/makemkv.nix b/modules/home-manager/desktop/media/makemkv.nix index 01ee6c04..5cfa207c 100644 --- a/modules/home-manager/desktop/media/makemkv.nix +++ b/modules/home-manager/desktop/media/makemkv.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.desktop.media.makemkv; + cfg = config.desktop.media.makemkv; in { - options.features.desktop.media.makemkv.enable = mkEnableOption "Enable makemkv"; + options.desktop.media.makemkv.enable = mkEnableOption "Enable makemkv"; config = mkIf cfg.enable { home.packages = with pkgs; [ diff --git a/modules/home-manager/desktop/media/mpv.nix b/modules/home-manager/desktop/media/mpv.nix index 1da587e7..1a59cbda 100644 --- a/modules/home-manager/desktop/media/mpv.nix +++ b/modules/home-manager/desktop/media/mpv.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.desktop.media.mpv; + cfg = config.desktop.media.mpv; in { - options.features.desktop.media.mpv.enable = mkEnableOption "Enable mpv"; + options.desktop.media.mpv.enable = mkEnableOption "Enable mpv"; config = mkIf cfg.enable { programs.mpv = { diff --git a/modules/nixos/cli/docker.nix b/modules/nixos/cli/docker.nix index 916a7cae..fc27bcbe 100644 --- a/modules/nixos/cli/docker.nix +++ b/modules/nixos/cli/docker.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.cli.docker; + cfg = config.cli.docker; in { - options.features.cli.docker.enable = mkEnableOption "Enable docker"; + options.cli.docker.enable = mkEnableOption "Enable docker"; config = mkIf cfg.enable { virtualisation = { diff --git a/modules/nixos/cli/password-store.nix b/modules/nixos/cli/password-store.nix index 61331aee..362cc7dd 100644 --- a/modules/nixos/cli/password-store.nix +++ b/modules/nixos/cli/password-store.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.cli.password-store; + cfg = config.cli.password-store; in { - options.features.cli.password-store = { + options.cli.password-store = { enable = mkEnableOption "Enable pass"; extensions = mkOption { diff --git a/modules/nixos/cli/podman.nix b/modules/nixos/cli/podman.nix index edda7492..5375ded5 100644 --- a/modules/nixos/cli/podman.nix +++ b/modules/nixos/cli/podman.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.cli.podman; + cfg = config.cli.podman; in { - options.features.cli.podman.enable = mkEnableOption "Enable podman"; + options.cli.podman.enable = mkEnableOption "Enable podman"; config = mkIf cfg.enable { virtualisation = { diff --git a/modules/nixos/core/bluetooth.nix b/modules/nixos/core/bluetooth.nix index dbf51398..4a2bfad7 100644 --- a/modules/nixos/core/bluetooth.nix +++ b/modules/nixos/core/bluetooth.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.core.bluetooth; + cfg = config.core.bluetooth; in { - options.features.core.bluetooth.enable = mkEnableOption "Enable bluetooth"; + options.core.bluetooth.enable = mkEnableOption "Enable bluetooth"; config = mkIf cfg.enable { hardware.bluetooth.enable = true; diff --git a/modules/nixos/core/openssh.nix b/modules/nixos/core/openssh.nix index 3d09487e..b248ab34 100644 --- a/modules/nixos/core/openssh.nix +++ b/modules/nixos/core/openssh.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.core.openssh; + cfg = config.core.openssh; in { - options.features.core.openssh.enable = mkEnableOption "Enable openssh"; + options.core.openssh.enable = mkEnableOption "Enable openssh"; config = mkIf cfg.enable { services.openssh = { diff --git a/modules/nixos/core/pipewire.nix b/modules/nixos/core/pipewire.nix index 557846bd..26e8014b 100644 --- a/modules/nixos/core/pipewire.nix +++ b/modules/nixos/core/pipewire.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.core.pipewire; + cfg = config.core.pipewire; in { - options.features.core.pipewire.enable = mkEnableOption "Enable pipewire"; + options.core.pipewire.enable = mkEnableOption "Enable pipewire"; config = mkIf cfg.enable { services.pipewire = { diff --git a/modules/nixos/core/xbanish.nix b/modules/nixos/core/xbanish.nix index 723eeff9..41142461 100644 --- a/modules/nixos/core/xbanish.nix +++ b/modules/nixos/core/xbanish.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.core.xbanish; + cfg = config.core.xbanish; in { - options.features.core.xbanish.enable = mkEnableOption "Enable xbanish"; + options.core.xbanish.enable = mkEnableOption "Enable xbanish"; config = mkIf cfg.enable { services.xbanish.enable = true; diff --git a/modules/nixos/core/zram.nix b/modules/nixos/core/zram.nix index a0d0046a..fe980915 100644 --- a/modules/nixos/core/zram.nix +++ b/modules/nixos/core/zram.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.core.zram; + cfg = config.core.zram; in { - options.features.core.zram.enable = mkEnableOption "Enable zram"; + options.core.zram.enable = mkEnableOption "Enable zram"; config = mkIf cfg.enable { zramSwap = { diff --git a/modules/nixos/desktop/dconf.nix b/modules/nixos/desktop/dconf.nix index eebbfa2c..ee0c51e7 100644 --- a/modules/nixos/desktop/dconf.nix +++ b/modules/nixos/desktop/dconf.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.desktop.dconf; + cfg = config.desktop.dconf; in { - options.features.desktop.dconf.enable = mkEnableOption "Enable dconf"; + options.desktop.dconf.enable = mkEnableOption "Enable dconf"; config = mkIf cfg.enable { programs.dconf.enable = true; diff --git a/modules/nixos/desktop/dwm/default.nix b/modules/nixos/desktop/dwm/default.nix index 2f9f4a40..31c1c999 100644 --- a/modules/nixos/desktop/dwm/default.nix +++ b/modules/nixos/desktop/dwm/default.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.desktop.dwm; + cfg = config.desktop.dwm; in { - options.features.desktop.dwm.enable = mkEnableOption "Enable dwm"; + options.desktop.dwm.enable = mkEnableOption "Enable dwm"; config = mkIf cfg.enable { services = { diff --git a/modules/nixos/desktop/fonts.nix b/modules/nixos/desktop/fonts.nix index 371b2fe1..8c49a2f6 100644 --- a/modules/nixos/desktop/fonts.nix +++ b/modules/nixos/desktop/fonts.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.desktop.fonts; + cfg = config.desktop.fonts; in { - options.features.desktop.fonts.enable = mkEnableOption "Enable fonts"; + options.desktop.fonts.enable = mkEnableOption "Enable fonts"; config = mkIf cfg.enable { fonts = { diff --git a/modules/nixos/desktop/media/makemkv.nix b/modules/nixos/desktop/media/makemkv.nix index 2b25b7aa..2d30d7ea 100644 --- a/modules/nixos/desktop/media/makemkv.nix +++ b/modules/nixos/desktop/media/makemkv.nix @@ -3,10 +3,10 @@ with lib; let - cfg = config.features.desktop.media.makemkv; + cfg = config.desktop.media.makemkv; in { - options.features.desktop.media.makemkv.enable = mkEnableOption "Enable makemkv"; + options.desktop.media.makemkv.enable = mkEnableOption "Enable makemkv"; config = mkIf cfg.enable { boot.kernelModules = [ "sg" ]; diff --git a/modules/nixos/desktop/st.nix b/modules/nixos/desktop/st.nix index 00e9b6e4..17422966 100644 --- a/modules/nixos/desktop/st.nix +++ b/modules/nixos/desktop/st.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.desktop.st; + cfg = config.desktop.st; in { - options.features.desktop.st.enable = mkEnableOption "Enable st"; + options.desktop.st.enable = mkEnableOption "Enable st"; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/desktop/thunar.nix b/modules/nixos/desktop/thunar.nix index 4e9676ab..b6b08214 100644 --- a/modules/nixos/desktop/thunar.nix +++ b/modules/nixos/desktop/thunar.nix @@ -8,10 +8,10 @@ with lib; let - cfg = config.features.desktop.thunar; + cfg = config.desktop.thunar; in { - options.features.desktop.thunar.enable = mkEnableOption "Enable thunar"; + options.desktop.thunar.enable = mkEnableOption "Enable thunar"; config = mkIf cfg.enable { programs.thunar = { diff --git a/modules/nixos/homelab/gitea-actions-runner.nix b/modules/nixos/homelab/gitea-actions-runner.nix index 2e961eef..9318e22e 100644 --- a/modules/nixos/homelab/gitea-actions-runner.nix +++ b/modules/nixos/homelab/gitea-actions-runner.nix @@ -10,11 +10,11 @@ with lib; let cfg = homelab.services.${service}; - homelab = config.features.homelab; + homelab = config.homelab; service = "gitea-actions-runner"; in { - options.features.homelab.services.${service} = { + options.homelab.services.${service} = { enable = mkEnableOption "Enable ${service}"; }; diff --git a/users/opdavies.nix b/users/opdavies.nix index 275a315f..6180d2b2 100644 --- a/users/opdavies.nix +++ b/users/opdavies.nix @@ -18,8 +18,8 @@ with lib; "networkmanager" "wheel" ] - ++ optional config.features.cli.docker.enable "docker" - ++ optional config.features.cli.podman.enable "podman"; + ++ optional config.cli.docker.enable "docker" + ++ optional config.cli.podman.enable "podman"; packages = with pkgs; [ qrencode