finalizing server compatibility updates

This commit is contained in:
pagedMov
2024-11-26 13:33:41 -05:00
parent 235f7a208e
commit 8e8f337165
6 changed files with 68 additions and 75 deletions

View File

@@ -97,8 +97,9 @@
modules = [ modules = [
./hosts/server/home.nix ./hosts/server/home.nix
./modules/home/servermodule.nix ./modules/home
stylix.homeManagerModules.stylix stylix.homeManagerModules.stylix
nur.nixosModules.nur
nixvim.homeManagerModules.nixvim nixvim.homeManagerModules.nixvim
]; ];
}; };

View File

@@ -32,19 +32,6 @@
systemPackages = with pkgs; [ acpi brightnessctl cpupower-gui powertop ]; 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 = { users = {
groups.persist = { }; groups.persist = { };
users = { users = {

View File

@@ -2,12 +2,15 @@
imports = [ ./hardware.nix ]; imports = [ ./hardware.nix ];
movOpts = { movOpts = {
sysEnv = { sysEnv = {
nixSettings.enable = true;
issue.enable = true; issue.enable = true;
sddmConfig.enable = true;
stylixConfig.enable = true;
nixSettings.enable = true;
}; };
hardwareCfg = { hardwareCfg = {
networkModule.enable = true; networkModule.enable = true;
bootLoader.enable = true; bootLoader.enable = true;
powerProfiles.enable = true;
}; };
softwareCfg = { softwareCfg = {
sysPkgs.enable = true; sysPkgs.enable = true;

View File

@@ -14,6 +14,7 @@
# modules/home/environment # modules/home/environment
envConfig = { envConfig = {
starshipConfig.enable = true; starshipConfig.enable = true;
stylixHomeConfig.enable = true;
userPkgs.enable = true; userPkgs.enable = true;
zshConfig = { zshConfig = {
shellAliases.enable = true; shellAliases.enable = true;
@@ -26,6 +27,7 @@
# modules/home/programs # modules/home/programs
programConfigs = { programConfigs = {
autojumpConfig.enable = true; autojumpConfig.enable = true;
kittyConfig.enable = true;
btopConfig.enable = true; btopConfig.enable = true;
ezaConfig.enable = true; ezaConfig.enable = true;
fzfConfig.enable = true; fzfConfig.enable = true;

View File

@@ -16,7 +16,7 @@ in {
image = wallpaper; image = wallpaper;
polarity = "dark"; polarity = "dark";
autoEnable = true; autoEnable = true;
opacity.terminal = if !server then 0.5 else null; opacity.terminal = 0.5;
targets = { targets = {
waybar.enable = false; waybar.enable = false;
btop.enable = false; btop.enable = false;

View File

@@ -182,74 +182,74 @@ in {
color15 #${def_scheme.base07} color15 #${def_scheme.base07}
''; '';
".config/kitty/ssh-theme.conf".text = '' ".config/kitty/ssh-theme.conf".text = ''
background #${ssh_scheme.base00} background ${ssh_scheme.base00}
foreground #${ssh_scheme.base05} foreground ${ssh_scheme.base05}
selection_background #${ssh_scheme.base05} selection_background ${ssh_scheme.base05}
selection_foreground #${ssh_scheme.base00} selection_foreground ${ssh_scheme.base00}
url_color #${ssh_scheme.base04} url_color ${ssh_scheme.base04}
cursor #${ssh_scheme.base05} cursor ${ssh_scheme.base05}
active_border_color #${ssh_scheme.base03} active_border_color ${ssh_scheme.base03}
inactive_border_color #${ssh_scheme.base01} inactive_border_color ${ssh_scheme.base01}
active_tab_background #${ssh_scheme.base00} active_tab_background ${ssh_scheme.base00}
active_tab_foreground #${ssh_scheme.base05} active_tab_foreground ${ssh_scheme.base05}
inactive_tab_background #${ssh_scheme.base01} inactive_tab_background ${ssh_scheme.base01}
inactive_tab_foreground #${ssh_scheme.base04} inactive_tab_foreground ${ssh_scheme.base04}
tab_bar_background #${ssh_scheme.base01} tab_bar_background ${ssh_scheme.base01}
# normal # normal
color0 #${ssh_scheme.base01} color0 ${ssh_scheme.base01}
color1 #${ssh_scheme.base08} color1 ${ssh_scheme.base08}
color2 #${ssh_scheme.base0B} color2 ${ssh_scheme.base0B}
color3 #${ssh_scheme.base0A} color3 ${ssh_scheme.base0A}
color4 #${ssh_scheme.base0D} color4 ${ssh_scheme.base0D}
color5 #${ssh_scheme.base0E} color5 ${ssh_scheme.base0E}
color6 #${ssh_scheme.base0C} color6 ${ssh_scheme.base0C}
color7 #${ssh_scheme.base05} color7 ${ssh_scheme.base05}
# bright # bright
color8 #${ssh_scheme.base03} color8 ${ssh_scheme.base03}
color9 #${ssh_scheme.base09} color9 ${ssh_scheme.base09}
color10 #${ssh_scheme.base01} color10 ${ssh_scheme.base01}
color11 #${ssh_scheme.base02} color11 ${ssh_scheme.base02}
color12 #${ssh_scheme.base04} color12 ${ssh_scheme.base04}
color13 #${ssh_scheme.base06} color13 ${ssh_scheme.base06}
color14 #${ssh_scheme.base0F} color14 ${ssh_scheme.base0F}
color15 #${ssh_scheme.base07} color15 ${ssh_scheme.base07}
''; '';
".config/kitty/nix-shell-theme.conf".text = '' ".config/kitty/nix-shell-theme.conf".text = ''
background #${nix-shell_scheme.base00} background ${nix-shell_scheme.base00}
foreground #${nix-shell_scheme.base05} foreground ${nix-shell_scheme.base05}
selection_background #${nix-shell_scheme.base05} selection_background ${nix-shell_scheme.base05}
selection_foreground #${nix-shell_scheme.base00} selection_foreground ${nix-shell_scheme.base00}
url_color #${nix-shell_scheme.base04} url_color ${nix-shell_scheme.base04}
cursor #${nix-shell_scheme.base05} cursor ${nix-shell_scheme.base05}
active_border_color #${nix-shell_scheme.base03} active_border_color ${nix-shell_scheme.base03}
inactive_border_color #${nix-shell_scheme.base01} inactive_border_color ${nix-shell_scheme.base01}
active_tab_background #${nix-shell_scheme.base00} active_tab_background ${nix-shell_scheme.base00}
active_tab_foreground #${nix-shell_scheme.base05} active_tab_foreground ${nix-shell_scheme.base05}
inactive_tab_background #${nix-shell_scheme.base01} inactive_tab_background ${nix-shell_scheme.base01}
inactive_tab_foreground #${nix-shell_scheme.base04} inactive_tab_foreground ${nix-shell_scheme.base04}
tab_bar_background #${nix-shell_scheme.base01} tab_bar_background ${nix-shell_scheme.base01}
# normal # normal
color0 #${nix-shell_scheme.base01} color0 ${nix-shell_scheme.base01}
color1 #${nix-shell_scheme.base08} color1 ${nix-shell_scheme.base08}
color2 #${nix-shell_scheme.base0B} color2 ${nix-shell_scheme.base0B}
color3 #${nix-shell_scheme.base0A} color3 ${nix-shell_scheme.base0A}
color4 #${nix-shell_scheme.base0D} color4 ${nix-shell_scheme.base0D}
color5 #${nix-shell_scheme.base0E} color5 ${nix-shell_scheme.base0E}
color6 #${nix-shell_scheme.base0C} color6 ${nix-shell_scheme.base0C}
color7 #${nix-shell_scheme.base05} color7 ${nix-shell_scheme.base05}
# bright # bright
color8 #${nix-shell_scheme.base03} color8 ${nix-shell_scheme.base03}
color9 #${nix-shell_scheme.base09} color9 ${nix-shell_scheme.base09}
color10 #${nix-shell_scheme.base01} color10 ${nix-shell_scheme.base01}
color11 #${nix-shell_scheme.base02} color11 ${nix-shell_scheme.base02}
color12 #${nix-shell_scheme.base04} color12 ${nix-shell_scheme.base04}
color13 #${nix-shell_scheme.base06} color13 ${nix-shell_scheme.base06}
color14 #${nix-shell_scheme.base0F} color14 ${nix-shell_scheme.base0F}
color15 #${nix-shell_scheme.base07} color15 ${nix-shell_scheme.base07}
''; '';
}; };
}; };