From 8e8f3371651313e6762c4e4d68af872c1cfd4945 Mon Sep 17 00:00:00 2001 From: pagedMov Date: Tue, 26 Nov 2024 13:33:41 -0500 Subject: [PATCH] finalizing server compatibility updates --- flake.nix | 5 +- hosts/laptop/config.nix | 13 --- hosts/server/config.nix | 5 +- hosts/server/home.nix | 2 + modules/home/environment/stylixhome.nix | 2 +- modules/home/files.nix | 116 ++++++++++++------------ 6 files changed, 68 insertions(+), 75 deletions(-) diff --git a/flake.nix b/flake.nix index 0534d21..ef32ea8 100755 --- a/flake.nix +++ b/flake.nix @@ -97,8 +97,9 @@ modules = [ ./hosts/server/home.nix - ./modules/home/servermodule.nix - stylix.homeManagerModules.stylix + ./modules/home + stylix.homeManagerModules.stylix + nur.nixosModules.nur nixvim.homeManagerModules.nixvim ]; }; diff --git a/hosts/laptop/config.nix b/hosts/laptop/config.nix index bc2d61e..8f75438 100755 --- a/hosts/laptop/config.nix +++ b/hosts/laptop/config.nix @@ -32,19 +32,6 @@ systemPackages = with pkgs; [ acpi brightnessctl cpupower-gui powertop ]; }; - nix = { - settings = { - auto-optimise-store = true; - experimental-features = [ "nix-command" "flakes" ]; - substituters = [ "https://nix-gaming.cachix.org" ]; - }; - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; - }; - }; - users = { groups.persist = { }; users = { diff --git a/hosts/server/config.nix b/hosts/server/config.nix index ae1d981..d4642ec 100755 --- a/hosts/server/config.nix +++ b/hosts/server/config.nix @@ -2,12 +2,15 @@ imports = [ ./hardware.nix ]; movOpts = { sysEnv = { - nixSettings.enable = true; issue.enable = true; + sddmConfig.enable = true; + stylixConfig.enable = true; + nixSettings.enable = true; }; hardwareCfg = { networkModule.enable = true; bootLoader.enable = true; + powerProfiles.enable = true; }; softwareCfg = { sysPkgs.enable = true; diff --git a/hosts/server/home.nix b/hosts/server/home.nix index ce4e6da..f373788 100755 --- a/hosts/server/home.nix +++ b/hosts/server/home.nix @@ -14,6 +14,7 @@ # modules/home/environment envConfig = { starshipConfig.enable = true; + stylixHomeConfig.enable = true; userPkgs.enable = true; zshConfig = { shellAliases.enable = true; @@ -26,6 +27,7 @@ # modules/home/programs programConfigs = { autojumpConfig.enable = true; + kittyConfig.enable = true; btopConfig.enable = true; ezaConfig.enable = true; fzfConfig.enable = true; diff --git a/modules/home/environment/stylixhome.nix b/modules/home/environment/stylixhome.nix index ba0c5d4..ea2aa8e 100755 --- a/modules/home/environment/stylixhome.nix +++ b/modules/home/environment/stylixhome.nix @@ -16,7 +16,7 @@ in { image = wallpaper; polarity = "dark"; autoEnable = true; - opacity.terminal = if !server then 0.5 else null; + opacity.terminal = 0.5; targets = { waybar.enable = false; btop.enable = false; diff --git a/modules/home/files.nix b/modules/home/files.nix index 74784b9..3ebac23 100755 --- a/modules/home/files.nix +++ b/modules/home/files.nix @@ -182,74 +182,74 @@ in { color15 #${def_scheme.base07} ''; ".config/kitty/ssh-theme.conf".text = '' - background #${ssh_scheme.base00} - foreground #${ssh_scheme.base05} - selection_background #${ssh_scheme.base05} - selection_foreground #${ssh_scheme.base00} - url_color #${ssh_scheme.base04} - cursor #${ssh_scheme.base05} - active_border_color #${ssh_scheme.base03} - inactive_border_color #${ssh_scheme.base01} - active_tab_background #${ssh_scheme.base00} - active_tab_foreground #${ssh_scheme.base05} - inactive_tab_background #${ssh_scheme.base01} - inactive_tab_foreground #${ssh_scheme.base04} - tab_bar_background #${ssh_scheme.base01} + background ${ssh_scheme.base00} + foreground ${ssh_scheme.base05} + selection_background ${ssh_scheme.base05} + selection_foreground ${ssh_scheme.base00} + url_color ${ssh_scheme.base04} + cursor ${ssh_scheme.base05} + active_border_color ${ssh_scheme.base03} + inactive_border_color ${ssh_scheme.base01} + active_tab_background ${ssh_scheme.base00} + active_tab_foreground ${ssh_scheme.base05} + inactive_tab_background ${ssh_scheme.base01} + inactive_tab_foreground ${ssh_scheme.base04} + tab_bar_background ${ssh_scheme.base01} # normal - color0 #${ssh_scheme.base01} - color1 #${ssh_scheme.base08} - color2 #${ssh_scheme.base0B} - color3 #${ssh_scheme.base0A} - color4 #${ssh_scheme.base0D} - color5 #${ssh_scheme.base0E} - color6 #${ssh_scheme.base0C} - color7 #${ssh_scheme.base05} + color0 ${ssh_scheme.base01} + color1 ${ssh_scheme.base08} + color2 ${ssh_scheme.base0B} + color3 ${ssh_scheme.base0A} + color4 ${ssh_scheme.base0D} + color5 ${ssh_scheme.base0E} + color6 ${ssh_scheme.base0C} + color7 ${ssh_scheme.base05} # bright - color8 #${ssh_scheme.base03} - color9 #${ssh_scheme.base09} - color10 #${ssh_scheme.base01} - color11 #${ssh_scheme.base02} - color12 #${ssh_scheme.base04} - color13 #${ssh_scheme.base06} - color14 #${ssh_scheme.base0F} - color15 #${ssh_scheme.base07} + color8 ${ssh_scheme.base03} + color9 ${ssh_scheme.base09} + color10 ${ssh_scheme.base01} + color11 ${ssh_scheme.base02} + color12 ${ssh_scheme.base04} + color13 ${ssh_scheme.base06} + color14 ${ssh_scheme.base0F} + color15 ${ssh_scheme.base07} ''; ".config/kitty/nix-shell-theme.conf".text = '' - background #${nix-shell_scheme.base00} - foreground #${nix-shell_scheme.base05} - selection_background #${nix-shell_scheme.base05} - selection_foreground #${nix-shell_scheme.base00} - url_color #${nix-shell_scheme.base04} - cursor #${nix-shell_scheme.base05} - active_border_color #${nix-shell_scheme.base03} - inactive_border_color #${nix-shell_scheme.base01} - active_tab_background #${nix-shell_scheme.base00} - active_tab_foreground #${nix-shell_scheme.base05} - inactive_tab_background #${nix-shell_scheme.base01} - inactive_tab_foreground #${nix-shell_scheme.base04} - tab_bar_background #${nix-shell_scheme.base01} + background ${nix-shell_scheme.base00} + foreground ${nix-shell_scheme.base05} + selection_background ${nix-shell_scheme.base05} + selection_foreground ${nix-shell_scheme.base00} + url_color ${nix-shell_scheme.base04} + cursor ${nix-shell_scheme.base05} + active_border_color ${nix-shell_scheme.base03} + inactive_border_color ${nix-shell_scheme.base01} + active_tab_background ${nix-shell_scheme.base00} + active_tab_foreground ${nix-shell_scheme.base05} + inactive_tab_background ${nix-shell_scheme.base01} + inactive_tab_foreground ${nix-shell_scheme.base04} + tab_bar_background ${nix-shell_scheme.base01} # normal - color0 #${nix-shell_scheme.base01} - color1 #${nix-shell_scheme.base08} - color2 #${nix-shell_scheme.base0B} - color3 #${nix-shell_scheme.base0A} - color4 #${nix-shell_scheme.base0D} - color5 #${nix-shell_scheme.base0E} - color6 #${nix-shell_scheme.base0C} - color7 #${nix-shell_scheme.base05} + color0 ${nix-shell_scheme.base01} + color1 ${nix-shell_scheme.base08} + color2 ${nix-shell_scheme.base0B} + color3 ${nix-shell_scheme.base0A} + color4 ${nix-shell_scheme.base0D} + color5 ${nix-shell_scheme.base0E} + color6 ${nix-shell_scheme.base0C} + color7 ${nix-shell_scheme.base05} # bright - color8 #${nix-shell_scheme.base03} - color9 #${nix-shell_scheme.base09} - color10 #${nix-shell_scheme.base01} - color11 #${nix-shell_scheme.base02} - color12 #${nix-shell_scheme.base04} - color13 #${nix-shell_scheme.base06} - color14 #${nix-shell_scheme.base0F} - color15 #${nix-shell_scheme.base07} + color8 ${nix-shell_scheme.base03} + color9 ${nix-shell_scheme.base09} + color10 ${nix-shell_scheme.base01} + color11 ${nix-shell_scheme.base02} + color12 ${nix-shell_scheme.base04} + color13 ${nix-shell_scheme.base06} + color14 ${nix-shell_scheme.base0F} + color15 ${nix-shell_scheme.base07} ''; }; };