From 1a2402dee76735fd16377afc121611339eb91e46 Mon Sep 17 00:00:00 2001 From: pagedmov Date: Wed, 6 Nov 2024 20:11:37 -0500 Subject: [PATCH] fixup! all of my custom options are now held in an attribute set called movOpts --- flake.nix | 4 +- hosts/desktop/config.nix | 26 +++---- hosts/desktop/home.nix | 65 +++++++++--------- hosts/laptop/home.nix | 2 +- modules/home/default.nix | 62 +++++++++-------- modules/home/environment/gtk.nix | 4 +- modules/home/environment/hyprland.nix | 4 +- modules/home/environment/spicetify.nix | 4 +- modules/home/environment/starship.nix | 4 +- modules/home/environment/stylix.nix | 4 +- modules/home/environment/swaync.nix | 4 +- modules/home/environment/userpkgs.nix | 4 +- modules/home/environment/waybar.nix | 2 +- modules/home/environment/zshell.nix | 4 +- modules/home/files.nix | 2 +- modules/home/programs/autojump.nix | 4 +- modules/home/programs/bat.nix | 4 +- modules/home/programs/btop.nix | 4 +- modules/home/programs/cava.nix | 4 +- modules/home/programs/eza.nix | 4 +- modules/home/programs/firefox.nix | 4 +- modules/home/programs/fuzzel.nix | 4 +- modules/home/programs/fzf.nix | 4 +- modules/home/programs/git.nix | 4 +- modules/home/programs/kitty.nix | 4 +- modules/home/programs/password-store.nix | 4 +- modules/home/programs/yazi.nix | 4 +- modules/home/scripts/default.nix | 76 ++++++++++----------- modules/server/cdn/jellyfin.nix | 2 +- modules/server/glasshaus/caddy.nix | 2 +- modules/sys/default.nix | 28 ++++---- modules/sys/environment/issue.nix | 4 +- modules/sys/environment/nix.nix | 4 +- modules/sys/environment/sddm.nix | 4 +- modules/sys/environment/stylix.nix | 4 +- modules/sys/hardware/bootloader.nix | 5 +- modules/sys/hardware/network.nix | 4 +- modules/sys/hardware/powerprofiles.nix | 4 +- modules/sys/software/nixvim/plugins/lsp.nix | 2 +- 39 files changed, 195 insertions(+), 187 deletions(-) diff --git a/flake.nix b/flake.nix index 5ccc0a4..79f2335 100755 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,6 @@ outputs = { nixpkgs, nur, - home-manager, self, nixvim, stylix, @@ -43,6 +42,9 @@ username = "pagedmov"; in { homeManagerModules.default = ./modules/home; + nixosModules.default = ./modules/sys; + serverModules.default = ./modules/server; + nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; nixosConfigurations = { oganesson = nixpkgs.lib.nixosSystem { diff --git a/hosts/desktop/config.nix b/hosts/desktop/config.nix index 874e5ec..e3b99a3 100755 --- a/hosts/desktop/config.nix +++ b/hosts/desktop/config.nix @@ -5,18 +5,20 @@ ]; # My module options - networkModule.enable = true; - nixSettings.enable = true; - bootLoader.enable = true; - issue.enable = true; - sddmConfig.enable = true; - stylixConfig.enable = true; - gamingPkgs.enable = true; - steamConfig.enable = true; - sysPkgs.enable = true; - sysProgs.enable = true; - sysServices.enable = true; - virtConfig.enable = true; + movOpts = { + networkModule.enable = true; + nixSettings.enable = true; + bootLoader.enable = true; + issue.enable = true; + sddmConfig.enable = true; + stylixConfig.enable = true; + gamingPkgs.enable = true; + steamConfig.enable = true; + sysPkgs.enable = true; + sysProgs.enable = true; + sysServices.enable = true; + virtConfig.enable = true; + }; nix = { settings = { diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 7049d08..e2a32f1 100755 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -24,42 +24,43 @@ in { ]; # My custom home-manager modules + movOpts = { + # modules/home/files + homeFiles.enable = true; - # modules/home/files - homeFiles.enable = true; + # modules/home/environment + hyprlandConfig.enable = true; + autojumpConfig.enable = true; + stylixHomeConfig.enable = true; + waybarConfig.enable = true; + gtkConfig.enable = true; + spicetifyConfig.enable = true; + starshipConfig.enable = true; - # modules/home/environment - hyprlandConfig.enable = true; - autojumpConfig.enable = true; - stylixHomeConfig.enable = true; - waybarConfig.enable = true; - gtkConfig.enable = true; - spicetifyConfig.enable = true; - starshipConfig.enable = true; + # modules/home/programs + btopConfig.enable = true; + swayncConfig.enable = true; + userPkgs.enable = true; + cavaConfig.enable = true; + ezaConfig.enable = true; + firefoxConfig.enable = true; + fuzzelConfig.enable = true; + fzfConfig.enable = true; + gitConfig.enable = true; + kittyConfig.enable = true; + yaziConfig.enable = true; + zshConfig.enable = true; + passConfig.enable = true; + batConfig.enable = true; - # modules/home/programs - btopConfig.enable = true; - swayncConfig.enable = true; - userPkgs.enable = true; - cavaConfig.enable = true; - ezaConfig.enable = true; - firefoxConfig.enable = true; - fuzzelConfig.enable = true; - fzfConfig.enable = true; - gitConfig.enable = true; - kittyConfig.enable = true; - yaziConfig.enable = true; - zshConfig.enable = true; - passConfig.enable = true; - batConfig.enable = true; + # modules/home/scripts + movScripts.enable = true; + movScripts.commandScripts.enable = true; + movScripts.hyprlandControls.enable = true; + movScripts.nixShortcuts.enable = true; + }; - # modules/home/scripts - movScripts.enable = true; - movScripts.commandScripts.enable = true; - movScripts.hyprlandControls.enable = true; - movScripts.nixShortcuts.enable = true; - - dconf.settings = lib.mkIf config.virtConfig.enable { + dconf.settings = lib.mkIf config.movOpts.virtConfig.enable { "org/virt-manager/virt-manager/connections" = { autoconnect = ["qemu:///system"]; uris = ["qemu:///system"]; diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 7049d08..f8592bc 100755 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -59,7 +59,7 @@ in { movScripts.hyprlandControls.enable = true; movScripts.nixShortcuts.enable = true; - dconf.settings = lib.mkIf config.virtConfig.enable { + dconf.settings = lib.mkIf config.movOpts.virtConfig.enable { "org/virt-manager/virt-manager/connections" = { autoconnect = ["qemu:///system"]; uris = ["qemu:///system"]; diff --git a/modules/home/default.nix b/modules/home/default.nix index 005fd6c..8c4d62d 100755 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -15,37 +15,39 @@ ./files.nix ]; - # ./files - homeFiles.enable = lib.mkDefault false; + movOpts = { + # ./files + homeFiles.enable = lib.mkDefault false; - # ./environment - hyprlandConfig.enable = lib.mkDefault false; - autojumpConfig.enable = lib.mkDefault false; - stylixHomeConfig.enable = lib.mkDefault false; - waybarConfig.enable = lib.mkDefault false; - gtkConfig.enable = lib.mkDefault false; - spicetifyConfig.enable = lib.mkDefault false; - starshipConfig.enable = lib.mkDefault false; + # ./environment + hyprlandConfig.enable = lib.mkDefault false; + autojumpConfig.enable = lib.mkDefault false; + stylixHomeConfig.enable = lib.mkDefault false; + waybarConfig.enable = lib.mkDefault false; + gtkConfig.enable = lib.mkDefault false; + spicetifyConfig.enable = lib.mkDefault false; + starshipConfig.enable = lib.mkDefault false; - # ./programs - btopConfig.enable = lib.mkDefault false; - swayncConfig.enable = lib.mkDefault false; - userPkgs.enable = lib.mkDefault false; - cavaConfig.enable = lib.mkDefault false; - ezaConfig.enable = lib.mkDefault false; - firefoxConfig.enable = lib.mkDefault false; - fuzzelConfig.enable = lib.mkDefault false; - fzfConfig.enable = lib.mkDefault false; - gitConfig.enable = lib.mkDefault false; - kittyConfig.enable = lib.mkDefault false; - yaziConfig.enable = lib.mkDefault false; - zshConfig.enable = lib.mkDefault false; - passConfig.enable = lib.mkDefault false; - batConfig.enable = lib.mkDefault false; + # ./programs + btopConfig.enable = lib.mkDefault false; + swayncConfig.enable = lib.mkDefault false; + userPkgs.enable = lib.mkDefault false; + cavaConfig.enable = lib.mkDefault false; + ezaConfig.enable = lib.mkDefault false; + firefoxConfig.enable = lib.mkDefault false; + fuzzelConfig.enable = lib.mkDefault false; + fzfConfig.enable = lib.mkDefault false; + gitConfig.enable = lib.mkDefault false; + kittyConfig.enable = lib.mkDefault false; + yaziConfig.enable = lib.mkDefault false; + zshConfig.enable = lib.mkDefault false; + passConfig.enable = lib.mkDefault false; + batConfig.enable = lib.mkDefault false; - # ./scripts - movScripts.enable = lib.mkDefault false; - movScripts.commandScripts.enable = lib.mkDefault false; - movScripts.hyprlandControls.enable = lib.mkDefault false; - movScripts.nixShortcuts.enable = lib.mkDefault false; + # ./scripts + movScripts.enable = lib.mkDefault false; + movScripts.commandScripts.enable = lib.mkDefault false; + movScripts.hyprlandControls.enable = lib.mkDefault false; + movScripts.nixShortcuts.enable = lib.mkDefault false; + }; } diff --git a/modules/home/environment/gtk.nix b/modules/home/environment/gtk.nix index b7f5c4e..5510ccf 100755 --- a/modules/home/environment/gtk.nix +++ b/modules/home/environment/gtk.nix @@ -1,8 +1,8 @@ {lib, config, pkgs, ... }: { options = { - gtkConfig.enable = lib.mkEnableOption "enable my gtk options"; + movOpts.gtkConfig.enable = lib.mkEnableOption "enable my gtk options"; }; - config = lib.mkIf config.gtkConfig.enable { + config = lib.mkIf config.movOpts.gtkConfig.enable { fonts.fontconfig.enable = true; home.packages = with pkgs; [ (nerdfonts.override { diff --git a/modules/home/environment/hyprland.nix b/modules/home/environment/hyprland.nix index 07caaff..0e5cd96 100755 --- a/modules/home/environment/hyprland.nix +++ b/modules/home/environment/hyprland.nix @@ -12,9 +12,9 @@ scheme = config.lib.stylix.colors; in { options = { - hyprlandConfig.enable = lib.mkEnableOption "enables my hyprland config"; + movOpts.hyprlandConfig.enable = lib.mkEnableOption "enables my hyprland config"; }; - config = lib.mkIf config.hyprlandConfig.enable { + config = lib.mkIf config.movOpts.hyprlandConfig.enable { home.packages = with pkgs; [ swaybg inputs.hypr-contrib.packages.${pkgs.system}.grimblast diff --git a/modules/home/environment/spicetify.nix b/modules/home/environment/spicetify.nix index 04b6d65..fb319be 100755 --- a/modules/home/environment/spicetify.nix +++ b/modules/home/environment/spicetify.nix @@ -4,9 +4,9 @@ in { imports = [inputs.spicetify-nix.homeManagerModules.default]; options = { - spicetifyConfig.enable = lib.mkEnableOption "enable my spicetify options"; + movOpts.spicetifyConfig.enable = lib.mkEnableOption "enable my spicetify options"; }; - config = lib.mkIf config.spicetifyConfig.enable { + config = lib.mkIf config.movOpts.spicetifyConfig.enable { nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "spotify" diff --git a/modules/home/environment/starship.nix b/modules/home/environment/starship.nix index d5801cc..348d91c 100755 --- a/modules/home/environment/starship.nix +++ b/modules/home/environment/starship.nix @@ -1,8 +1,8 @@ {config, lib, inputs, ... }: { options = { - starshipConfig.enable = lib.mkEnableOption "enables my starship configuration"; + movOpts.starshipConfig.enable = lib.mkEnableOption "enables my starship configuration"; }; - config = lib.mkIf config.starshipConfig.enable { + config = lib.mkIf config.movOpts.starshipConfig.enable { programs.starship = { enable = true; enableZshIntegration = false; diff --git a/modules/home/environment/stylix.nix b/modules/home/environment/stylix.nix index 15324f4..6531535 100755 --- a/modules/home/environment/stylix.nix +++ b/modules/home/environment/stylix.nix @@ -1,8 +1,8 @@ {lib, config, pkgs, ... }: { options = { - stylixHomeConfig.enable = lib.mkEnableOption "enables my stylix Home-Manager options"; + movOpts.stylixHomeConfig.enable = lib.mkEnableOption "enables my stylix Home-Manager options"; }; - config = lib.mkIf config.stylixHomeConfig.enable { + config = lib.mkIf config.movOpts.stylixHomeConfig.enable { stylix = { enable = true; autoEnable = true; diff --git a/modules/home/environment/swaync.nix b/modules/home/environment/swaync.nix index a4036de..9101e99 100755 --- a/modules/home/environment/swaync.nix +++ b/modules/home/environment/swaync.nix @@ -1,8 +1,8 @@ {lib, config, pkgs, ...}: { options = { - swayncConfig.enable = lib.mkEnableOption "enables my swaync configuration"; + movOpts.swayncConfig.enable = lib.mkEnableOption "enables my swaync configuration"; }; - config = lib.mkIf config.swayncConfig.enable { + config = lib.mkIf config.movOpts.swayncConfig.enable { home.packages = with pkgs; [swaynotificationcenter]; xdg.configFile."swaync/style.css".text = '' @define-color shadow rgba(0, 0, 0, 0.25); diff --git a/modules/home/environment/userpkgs.nix b/modules/home/environment/userpkgs.nix index 419e6cc..1f33f2e 100755 --- a/modules/home/environment/userpkgs.nix +++ b/modules/home/environment/userpkgs.nix @@ -19,9 +19,9 @@ let in { options = { - userPkgs.enable = lib.mkEnableOption "enables my default user packages"; + movOpts.userPkgs.enable = lib.mkEnableOption "enables my default user packages"; }; - config = lib.mkIf config.userPkgs.enable { + config = lib.mkIf config.movOpts.userPkgs.enable { home.packages = with pkgs; [ nemo diff --git a/modules/home/environment/waybar.nix b/modules/home/environment/waybar.nix index 7a89c31..6f24eb7 100755 --- a/modules/home/environment/waybar.nix +++ b/modules/home/environment/waybar.nix @@ -57,7 +57,7 @@ let ]; in { options = { - waybarConfig.enable = lib.mkEnableOption "enables my waybar configuration"; + movOpts.waybarConfig.enable = lib.mkEnableOption "enables my waybar configuration"; }; config = { programs.waybar = { diff --git a/modules/home/environment/zshell.nix b/modules/home/environment/zshell.nix index 8f6a76c..706e1ac 100755 --- a/modules/home/environment/zshell.nix +++ b/modules/home/environment/zshell.nix @@ -1,8 +1,8 @@ {lib, config, self, ...}: { options = { - zshConfig.enable = lib.mkEnableOption "enables my zsh configuration"; + movOpts.zshConfig.enable = lib.mkEnableOption "enables my zsh configuration"; }; - config = lib.mkIf config.zshConfig.enable { + config = lib.mkIf config.movOpts.zshConfig.enable { programs.zoxide = { enable = true; enableZshIntegration = true; diff --git a/modules/home/files.nix b/modules/home/files.nix index b253d94..cd82118 100755 --- a/modules/home/files.nix +++ b/modules/home/files.nix @@ -28,7 +28,7 @@ let in { options = { - homeFiles.enable = lib.mkEnableOption "enables declared custom files"; + movOpts.homeFiles.enable = lib.mkEnableOption "enables declared custom files"; }; config = { home.file = { diff --git a/modules/home/programs/autojump.nix b/modules/home/programs/autojump.nix index 33e5c49..ad26085 100755 --- a/modules/home/programs/autojump.nix +++ b/modules/home/programs/autojump.nix @@ -1,8 +1,8 @@ {lib, config, ...}: { options = { - autojumpConfig.enable = lib.mkEnableOption "enables my autojump options"; + movOpts.autojumpConfig.enable = lib.mkEnableOption "enables my autojump options"; }; - config = lib.mkIf config.autojumpConfig.enable { + config = lib.mkIf config.movOpts.autojumpConfig.enable { programs.autojump = { enable = true; enableZshIntegration = true; diff --git a/modules/home/programs/bat.nix b/modules/home/programs/bat.nix index dc71d72..0fb6c7e 100755 --- a/modules/home/programs/bat.nix +++ b/modules/home/programs/bat.nix @@ -1,8 +1,8 @@ {lib, config, inputs, ...}: { options = { - batConfig.enable = lib.mkEnableOption "enables my bat options"; + movOpts.batConfig.enable = lib.mkEnableOption "enables my bat options"; }; - config = lib.mkIf config.batConfig.enable { + config = lib.mkIf config.movOpts.batConfig.enable { programs.bat = { enable = true; config = { diff --git a/modules/home/programs/btop.nix b/modules/home/programs/btop.nix index 62559d2..6fa1ac4 100755 --- a/modules/home/programs/btop.nix +++ b/modules/home/programs/btop.nix @@ -1,8 +1,8 @@ {lib, config, pkgs, ...}: { options = { - btopConfig.enable = lib.mkEnableOption "enables my btop config"; + movOpts.btopConfig.enable = lib.mkEnableOption "enables my btop config"; }; - config = lib.mkIf config.btopConfig.enable { + config = lib.mkIf config.movOpts.btopConfig.enable { programs.btop = { enable = true; diff --git a/modules/home/programs/cava.nix b/modules/home/programs/cava.nix index 185079f..09c9b0f 100755 --- a/modules/home/programs/cava.nix +++ b/modules/home/programs/cava.nix @@ -1,8 +1,8 @@ {lib, config, inputs, pkgs, ... }: { options = { - cavaConfig.enable = lib.mkEnableOption "enables my cava settings"; + movOpts.cavaConfig.enable = lib.mkEnableOption "enables my cava settings"; }; - config = lib.mkIf config.cavaConfig.enable { + config = lib.mkIf config.movOpts.cavaConfig.enable { programs.cava = { enable = true; }; diff --git a/modules/home/programs/eza.nix b/modules/home/programs/eza.nix index d81806f..728ea58 100755 --- a/modules/home/programs/eza.nix +++ b/modules/home/programs/eza.nix @@ -1,8 +1,8 @@ {lib, config, ...}: { options = { - ezaConfig.enable = lib.mkEnableOption "enables my eza options"; + movOpts.ezaConfig.enable = lib.mkEnableOption "enables my eza options"; }; - config = lib.mkIf config.ezaConfig.enable { + config = lib.mkIf config.movOpts.ezaConfig.enable { programs.eza = { enable = true; enableZshIntegration = false; diff --git a/modules/home/programs/firefox.nix b/modules/home/programs/firefox.nix index 495615b..d8b0068 100755 --- a/modules/home/programs/firefox.nix +++ b/modules/home/programs/firefox.nix @@ -1,8 +1,8 @@ {lib, config, nur, username, self, ... }: { options = { - firefoxConfig.enable = lib.mkEnableOption "enables my firefox configuration"; + movOpts.firefoxConfig.enable = lib.mkEnableOption "enables my firefox configuration"; }; - config = lib.mkIf config.firefoxConfig.enable { + config = lib.mkIf config.movOpts.firefoxConfig.enable { programs.firefox = { enable = true; policies = { diff --git a/modules/home/programs/fuzzel.nix b/modules/home/programs/fuzzel.nix index dc8865d..a071a1e 100755 --- a/modules/home/programs/fuzzel.nix +++ b/modules/home/programs/fuzzel.nix @@ -1,8 +1,8 @@ {config, lib, ...}: { options = { - fuzzelConfig.enable = lib.mkEnableOption "enables my fuzzel configuration"; + movOpts.fuzzelConfig.enable = lib.mkEnableOption "enables my fuzzel configuration"; }; - config = lib.mkIf config.fuzzelConfig.enable { + config = lib.mkIf config.movOpts.fuzzelConfig.enable { programs.fuzzel = { enable = true; settings = { diff --git a/modules/home/programs/fzf.nix b/modules/home/programs/fzf.nix index 9ec84d1..779aac5 100755 --- a/modules/home/programs/fzf.nix +++ b/modules/home/programs/fzf.nix @@ -1,8 +1,8 @@ {lib, config, ...}: { options = { - fzfConfig.enable = lib.mkEnableOption "enables my fzf options"; + movOpts.fzfConfig.enable = lib.mkEnableOption "enables my fzf options"; }; - config = lib.mkIf config.fzfConfig.enable { + config = lib.mkIf config.movOpts.fzfConfig.enable { programs.fzf = { enable = true; enableZshIntegration = true; diff --git a/modules/home/programs/git.nix b/modules/home/programs/git.nix index 3f3a14f..838d80b 100755 --- a/modules/home/programs/git.nix +++ b/modules/home/programs/git.nix @@ -1,8 +1,8 @@ {lib, config, username, ...}: { options = { - gitConfig.enable = lib.mkEnableOption "enables my git configuration"; + movOpts.gitConfig.enable = lib.mkEnableOption "enables my git configuration"; }; - config = lib.mkIf config.gitConfig.enable { + config = lib.mkIf config.movOpts.gitConfig.enable { programs.git = { enable = true; userEmail = "${username}@gmail.com"; diff --git a/modules/home/programs/kitty.nix b/modules/home/programs/kitty.nix index a17eebd..eb6359f 100755 --- a/modules/home/programs/kitty.nix +++ b/modules/home/programs/kitty.nix @@ -1,8 +1,8 @@ {lib, config, pkgs, ... }: { options = { - kittyConfig.enable = lib.mkEnableOption "enables my kitty configuration"; + movOpts.kittyConfig.enable = lib.mkEnableOption "enables my kitty configuration"; }; - config = lib.mkIf config.kittyConfig.enable { + config = lib.mkIf config.movOpts.kittyConfig.enable { programs.kitty = { enable = true; diff --git a/modules/home/programs/password-store.nix b/modules/home/programs/password-store.nix index 5bed03e..8a8c0ed 100755 --- a/modules/home/programs/password-store.nix +++ b/modules/home/programs/password-store.nix @@ -2,9 +2,9 @@ home = "/home/${username}"; in { options = { - passConfig.enable = lib.mkEnableOption "enables my pass config"; + movOpts.passConfig.enable = lib.mkEnableOption "enables my pass config"; }; - config = lib.mkIf config.passConfig.enable { + config = lib.mkIf config.movOpts.passConfig.enable { programs.password-store = { enable = true; settings = { diff --git a/modules/home/programs/yazi.nix b/modules/home/programs/yazi.nix index 4fa3fba..a9fe6ef 100755 --- a/modules/home/programs/yazi.nix +++ b/modules/home/programs/yazi.nix @@ -1,8 +1,8 @@ {lib, config, ...}: { options = { - yaziConfig.enable = lib.mkEnableOption "enables my yazi config"; + movOpts.yaziConfig.enable = lib.mkEnableOption "enables my yazi config"; }; - config = lib.mkIf config.yaziConfig.enable { + config = lib.mkIf config.movOpts.yaziConfig.enable { programs.yazi = { enable = true; enableZshIntegration = true; diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index d6c5691..08ed0df 100755 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -28,76 +28,76 @@ name: lib.mkEnableOption "${doc}" // { - default = config.movScripts.enable && config.movScripts.${group}.enable; + default = config.movOpts.movScripts.enable && config.movOpts.movScripts.${group}.enable; }; in { options = { - movScripts.enable = lib.mkEnableOption "Enables all pagedmov's scripts"; + movOpts.movScripts.enable = lib.mkEnableOption "Enables all pagedmov's scripts"; # Enable or disable by group - movScripts.commandScripts.enable = + movOpts.movScripts.commandScripts.enable = lib.mkEnableOption "Enables all command scripts"; - movScripts.hyprlandControls.enable = + movOpts.movScripts.hyprlandControls.enable = lib.mkEnableOption "Enables all Hyprland control scripts"; - movScripts.nixShortcuts.enable = + movOpts.movScripts.nixShortcuts.enable = lib.mkEnableOption "Enables all Nix shortcut scripts"; # Individual options using scriptOverride or mkEnableOption directly - movScripts.commandScripts.icanhazip.enable = + movOpts.movScripts.commandScripts.icanhazip.enable = scriptOverride "Enables the icanhazip command" "commandScripts" "icanhazip"; - movScripts.commandScripts.invoke.enable = + movOpts.movScripts.commandScripts.invoke.enable = scriptOverride "Enables the invoke command" "commandScripts" "invoke"; - movScripts.commandScripts.runbg.enable = + movOpts.movScripts.commandScripts.runbg.enable = scriptOverride "Enables the runbg command - written by FrostPhoenix" "commandScripts" "runbg"; - movScripts.commandScripts.splash.enable = + movOpts.movScripts.commandScripts.splash.enable = scriptOverride "Enables the splash screen when opening a terminal" "commandScripts" "splash"; - movScripts.commandScripts.toolbelt.enable = + movOpts.movScripts.commandScripts.toolbelt.enable = scriptOverride "Enables the toolbelt command" "commandScripts" "toolbelt"; - movScripts.commandScripts.viconf.enable = + movOpts.movScripts.commandScripts.viconf.enable = scriptOverride "Enables the viconf command" "commandScripts" "viconf"; - movScripts.hyprlandControls.chpaper.enable = + movOpts.movScripts.hyprlandControls.chpaper.enable = scriptOverride "Enables the chpaper command" "hyprlandControls" "chpaper"; - movScripts.hyprlandControls.scheck.enable = + movOpts.movScripts.hyprlandControls.scheck.enable = scriptOverride "Enables the scheck command" "hyprlandControls" "scheck"; - movScripts.hyprlandControls.chscheme.enable = + movOpts.movScripts.hyprlandControls.chscheme.enable = scriptOverride "Enables the chscheme command" "hyprlandControls" "chscheme"; - movScripts.hyprlandControls.keyring.enable = + movOpts.movScripts.hyprlandControls.keyring.enable = scriptOverride "Enables the keyring command" "hyprlandControls" "keyring"; - movScripts.hyprlandControls.moveonscreen.enable = + movOpts.movScripts.hyprlandControls.moveonscreen.enable = scriptOverride "Ensures floating windows remain on screen" "hyprlandControls" "moveonscreen"; - movScripts.hyprlandControls.switchmon.enable = + movOpts.movScripts.hyprlandControls.switchmon.enable = scriptOverride "Moves cursor to the center of the second monitor" "hyprlandControls" "switchmon"; - movScripts.hyprlandControls.mkscreenshots.enable = + movOpts.movScripts.hyprlandControls.mkscreenshots.enable = scriptOverride "Generates screenshots, and updates the README.md with the current rev hash" "hyprlandControls" "switchmon"; - movScripts.nixShortcuts.garbage-collect.enable = + movOpts.movScripts.nixShortcuts.garbage-collect.enable = scriptOverride "Enables the garbage-collect script" "nixShortcuts" "garbage-collect"; - movScripts.nixShortcuts.nsp.enable = + movOpts.movScripts.nixShortcuts.nsp.enable = scriptOverride "Enables nsp as an alias for 'nix-shell -p'" "nixShortcuts" "nsp"; - movScripts.nixShortcuts.rebuild.enable = + movOpts.movScripts.nixShortcuts.rebuild.enable = scriptOverride "Enables rebuild as an alias for 'sudo nixos-rebuild switch'" "nixShortcuts" "rebuild"; }; - config = lib.mkIf config.movScripts.enable { - home.packages = lib.optionals config.movScripts.commandScripts.invoke.enable [ invoke ] - ++ lib.optionals config.movScripts.commandScripts.runbg.enable [ runbg ] - ++ lib.optionals config.movScripts.commandScripts.icanhazip.enable [ icanhazip ] - ++ lib.optionals config.movScripts.commandScripts.splash.enable [ splash ] - ++ lib.optionals config.movScripts.commandScripts.toolbelt.enable [ toolbelt ] - ++ lib.optionals config.movScripts.commandScripts.viconf.enable [ viconf ] + config = lib.mkIf config.movOpts.movScripts.enable { + home.packages = lib.optionals config.movOpts.movScripts.commandScripts.invoke.enable [ invoke ] + ++ lib.optionals config.movOpts.movScripts.commandScripts.runbg.enable [ runbg ] + ++ lib.optionals config.movOpts.movScripts.commandScripts.icanhazip.enable [ icanhazip ] + ++ lib.optionals config.movOpts.movScripts.commandScripts.splash.enable [ splash ] + ++ lib.optionals config.movOpts.movScripts.commandScripts.toolbelt.enable [ toolbelt ] + ++ lib.optionals config.movOpts.movScripts.commandScripts.viconf.enable [ viconf ] - ++ lib.optionals config.movScripts.hyprlandControls.chpaper.enable [ chpaper ] - ++ lib.optionals config.movScripts.hyprlandControls.scheck.enable [ scheck ] - ++ lib.optionals config.movScripts.hyprlandControls.chscheme.enable [ chscheme ] - ++ lib.optionals config.movScripts.hyprlandControls.keyring.enable [ keyring ] - ++ lib.optionals config.movScripts.hyprlandControls.moveonscreen.enable [ moveonscreen ] - ++ lib.optionals config.movScripts.hyprlandControls.switchmon.enable [ switchmon ] - ++ lib.optionals config.movScripts.hyprlandControls.mkscreenshots.enable [ mkscreenshots ] + ++ lib.optionals config.movOpts.movScripts.hyprlandControls.chpaper.enable [ chpaper ] + ++ lib.optionals config.movOpts.movScripts.hyprlandControls.scheck.enable [ scheck ] + ++ lib.optionals config.movOpts.movScripts.hyprlandControls.chscheme.enable [ chscheme ] + ++ lib.optionals config.movOpts.movScripts.hyprlandControls.keyring.enable [ keyring ] + ++ lib.optionals config.movOpts.movScripts.hyprlandControls.moveonscreen.enable [ moveonscreen ] + ++ lib.optionals config.movOpts.movScripts.hyprlandControls.switchmon.enable [ switchmon ] + ++ lib.optionals config.movOpts.movScripts.hyprlandControls.mkscreenshots.enable [ mkscreenshots ] - ++ lib.optionals config.movScripts.nixShortcuts.garbage-collect.enable [ garbage-collect ] - ++ lib.optionals config.movScripts.nixShortcuts.nsp.enable [ nsp ] - ++ lib.optionals config.movScripts.nixShortcuts.rebuild.enable [ rebuild ]; + ++ lib.optionals config.movOpts.movScripts.nixShortcuts.garbage-collect.enable [ garbage-collect ] + ++ lib.optionals config.movOpts.movScripts.nixShortcuts.nsp.enable [ nsp ] + ++ lib.optionals config.movOpts.movScripts.nixShortcuts.rebuild.enable [ rebuild ]; }; } diff --git a/modules/server/cdn/jellyfin.nix b/modules/server/cdn/jellyfin.nix index d48672e..09b11f2 100755 --- a/modules/server/cdn/jellyfin.nix +++ b/modules/server/cdn/jellyfin.nix @@ -4,7 +4,7 @@ options = { jellyfinConfig.enable = lib.mkEnableOption "Enables the server's jellyfin config"; }; - config = lib.mkIf config.jellyfinConfig.enable { + config = lib.mkIf config.movOpts.jellyfinConfig.enable { services.jellyfin = { enable = true; openFirewall = true; diff --git a/modules/server/glasshaus/caddy.nix b/modules/server/glasshaus/caddy.nix index 6fc57d0..9867f26 100755 --- a/modules/server/glasshaus/caddy.nix +++ b/modules/server/glasshaus/caddy.nix @@ -4,7 +4,7 @@ options = { caddyConfig.enable = lib.mkEnableOption "Enable my caddy config for the glasshaus.info domain name"; }; - config = lib.mkIf config.caddyConfig.enable { + config = lib.mkIf config.movOpts.caddyConfig.enable { services.caddy = { enable = true; configFile = pkgs.writeText "Caddyfile" '' diff --git a/modules/sys/default.nix b/modules/sys/default.nix index e617c81..565d0e0 100755 --- a/modules/sys/default.nix +++ b/modules/sys/default.nix @@ -14,17 +14,19 @@ ./environment ]; - networkModule.enable = lib.mkDefault false; - nixSettings.enable = lib.mkDefault false; - bootLoader.enable = lib.mkDefault false; - issue.enable = lib.mkDefault false; - sddmConfig.enable = lib.mkDefault false; - stylixConfig.enable = lib.mkDefault false; - gamingPkgs.enable = lib.mkDefault false; - steamConfig.enable = lib.mkDefault false; - sysPkgs.enable = lib.mkDefault false; - sysProgs.enable = lib.mkDefault false; - sysServices.enable = lib.mkDefault false; - virtConfig.enable = lib.mkDefault false; - powerProfiles.enable = lib.mkDefault false; + movOpts = { + networkModule.enable = lib.mkDefault false; + nixSettings.enable = lib.mkDefault false; + bootLoader.enable = lib.mkDefault false; + issue.enable = lib.mkDefault false; + sddmConfig.enable = lib.mkDefault false; + stylixConfig.enable = lib.mkDefault false; + gamingPkgs.enable = lib.mkDefault false; + steamConfig.enable = lib.mkDefault false; + sysPkgs.enable = lib.mkDefault false; + sysProgs.enable = lib.mkDefault false; + sysServices.enable = lib.mkDefault false; + virtConfig.enable = lib.mkDefault false; + powerProfiles.enable = lib.mkDefault false; + }; } diff --git a/modules/sys/environment/issue.nix b/modules/sys/environment/issue.nix index 90e89f9..a209a03 100755 --- a/modules/sys/environment/issue.nix +++ b/modules/sys/environment/issue.nix @@ -1,8 +1,8 @@ {lib, config, ...}: { options = { - issue.enable = lib.mkEnableOption "enables custom /etc/issue splash screen for the tty"; + movOpts.issue.enable = lib.mkEnableOption "enables custom /etc/issue splash screen for the tty"; }; - config = lib.mkIf config.issue.enable { + config = lib.mkIf config.movOpts.issue.enable { environment.etc."issue".text = '' \e[38;5;27m▓▓▓▓ \e[38;5;81m▒▒▒▒ ▒▒▒▒ diff --git a/modules/sys/environment/nix.nix b/modules/sys/environment/nix.nix index 8354ff3..1a137b5 100755 --- a/modules/sys/environment/nix.nix +++ b/modules/sys/environment/nix.nix @@ -1,8 +1,8 @@ {lib, config, ... }: { options = { - nixSettings.enable = lib.mkEnableOption "enables my nixos settings"; + movOpts.nixSettings.enable = lib.mkEnableOption "enables my nixos settings"; }; - config = lib.mkIf config.nixSettings.enable { + config = lib.mkIf config.movOpts.nixSettings.enable { system.stateVersion = "24.05"; nixpkgs.config.allowUnfree = true; nix = { diff --git a/modules/sys/environment/sddm.nix b/modules/sys/environment/sddm.nix index 93458e9..86ec82d 100755 --- a/modules/sys/environment/sddm.nix +++ b/modules/sys/environment/sddm.nix @@ -6,9 +6,9 @@ ... }: { options = { - sddmConfig.enable = lib.mkEnableOption "enables custom sddm configuration"; + movOpts.sddmConfig.enable = lib.mkEnableOption "enables custom sddm configuration"; }; - config = lib.mkIf config.sddmConfig.enable { + config = lib.mkIf config.movOpts.sddmConfig.enable { environment.systemPackages = [ ( pkgs.catppuccin-sddm.override { diff --git a/modules/sys/environment/stylix.nix b/modules/sys/environment/stylix.nix index 5f32449..80b5686 100755 --- a/modules/sys/environment/stylix.nix +++ b/modules/sys/environment/stylix.nix @@ -12,9 +12,9 @@ let in { options = { - stylixConfig.enable = lib.mkEnableOption "enables custom stylix options"; + movOpts.stylixConfig.enable = lib.mkEnableOption "enables custom stylix options"; }; - config = lib.mkIf config.stylixConfig.enable { + config = lib.mkIf config.movOpts.stylixConfig.enable { stylix = { enable = true; base16Scheme = "${pkgs.base16-schemes}/share/themes/${scheme}.yaml"; diff --git a/modules/sys/hardware/bootloader.nix b/modules/sys/hardware/bootloader.nix index a7be490..5ac378e 100755 --- a/modules/sys/hardware/bootloader.nix +++ b/modules/sys/hardware/bootloader.nix @@ -1,9 +1,8 @@ {pkgs, lib, config, ...}: { options = { - # make this enabled by default!!! - bootLoader.enable = lib.mkEnableOption "enables bootloader config"; + movOpts.bootLoader.enable = lib.mkEnableOption "enables bootloader config"; }; - config = lib.mkIf config.bootLoader.enable { + config = lib.mkIf config.movOpts.bootLoader.enable { boot = { loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; diff --git a/modules/sys/hardware/network.nix b/modules/sys/hardware/network.nix index 227762b..01fd956 100755 --- a/modules/sys/hardware/network.nix +++ b/modules/sys/hardware/network.nix @@ -1,9 +1,9 @@ {host, lib, config, ...}: { options = { - networkModule.enable = lib.mkEnableOption "enables network configuration"; + movOpts.networkModule.enable = lib.mkEnableOption "enables network configuration"; }; - config = lib.mkIf config.networkModule.enable { + config = lib.mkIf config.movOpts.networkModule.enable { networking = { networkmanager.enable = true; hostName = "${host}"; diff --git a/modules/sys/hardware/powerprofiles.nix b/modules/sys/hardware/powerprofiles.nix index 25377fd..e3ffe5c 100755 --- a/modules/sys/hardware/powerprofiles.nix +++ b/modules/sys/hardware/powerprofiles.nix @@ -1,8 +1,8 @@ {lib, config, ... }: { options = { - powerProfiles.enable = lib.mkEnableOption "enables power profiles"; + movOpts.powerProfiles.enable = lib.mkEnableOption "enables power profiles"; }; - config = lib.mkIf config.powerProfiles.enable { + config = lib.mkIf config.movOpts.powerProfiles.enable { services = { power-profiles-daemon.enable = true; diff --git a/modules/sys/software/nixvim/plugins/lsp.nix b/modules/sys/software/nixvim/plugins/lsp.nix index f8b2659..5dd93b3 100755 --- a/modules/sys/software/nixvim/plugins/lsp.nix +++ b/modules/sys/software/nixvim/plugins/lsp.nix @@ -22,7 +22,7 @@ in nixpkgs.expr = "import { }"; formatting.command = "nixfmt"; options = { - nixos.expr = "(builtins.getFlake \"${flakePath}\").nixosConfigurations.${host}.options"; + nixos.expr = "(builtins.getFlake \"github:pagedMov/nixos-config\").nixosConfigurations.xenon.options"; }; }; };