diff --git a/modules/features/desktop/default.nix b/modules/features/desktop/default.nix index b7d5fce..f6f9870 100644 --- a/modules/features/desktop/default.nix +++ b/modules/features/desktop/default.nix @@ -12,9 +12,6 @@ # modules to include imports = [ - # theme module - #self.nixosModules.theme1 - # window manager self.nixosModules.niri @@ -59,22 +56,16 @@ ]; loader = { timeout = 5; # 5 second timeout to default selection - #grub = { - #splashImage = null; # hides splashimage - #timeoutStyle = "hidden"; # hides timeout - #}; }; plymouth = { # enables plymouth boot animations - enable = false; + enable = true; extraConfig = "ShowDelay=0"; - #theme = "sygil-plymouth"; - #themePackages = sygil-plymouth; - #themePackages = with pkgs; [ - #(adi1090x-plymouth-themes.override { - #selected_themes = [ "circle" ]; - #}) - #]; + themePackages = with pkgs; [ + (adi1090x-plymouth-themes.override { + selected_themes = [ "circle" ]; + }) + ]; }; }; @@ -83,28 +74,6 @@ enable = true; }; - # I put fonts here because i didn't know where tf else to put them lol - # duplicate to home-manager config ? - fonts = { - packages = - with pkgs; - [ - spleen - terminus_font - terminus_font_ttf - nerd-fonts.symbols-only - ] - ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); - fontDir.enable = true; - fontconfig = { - defaultFonts = { - serif = [ "spleen-32x64" ]; - sansSerif = [ "spleen-32x64" ]; - monospace = [ "TerminusTTF" ]; - }; - }; - }; - }; } diff --git a/modules/features/desktop/noctalia.nix b/modules/features/desktop/noctalia.nix index 8de348f..0193e5b 100644 --- a/modules/features/desktop/noctalia.nix +++ b/modules/features/desktop/noctalia.nix @@ -150,9 +150,6 @@ }; }; - # noctalia menu settings - #controlCenter = { }; - }; }; diff --git a/modules/features/desktop/wofi.nix b/modules/features/desktop/wofi.nix index 28ffa92..ed25c6f 100755 --- a/modules/features/desktop/wofi.nix +++ b/modules/features/desktop/wofi.nix @@ -52,10 +52,10 @@ disable_prime = false; }; - # NOT YET IMPLEMENTED - # wofi theme - #style = '' ''; }; + }; + }; + } diff --git a/modules/features/stylix.nix b/modules/features/stylix.nix index 670996b..2b84eed 100644 --- a/modules/features/stylix.nix +++ b/modules/features/stylix.nix @@ -2,6 +2,7 @@ { + # autogenerated theme flake.nixosModules.theme-autogen = { config, @@ -11,7 +12,10 @@ }: let + + # set wallpaper here wallpaper = ../../assets/media/wallpapers/mimaKirigoe.jpg; + in { @@ -70,9 +74,6 @@ home-manager.users.serenity = { - # for stylix home manager module - #imports = [ inputs.stylix.homeModules.stylix ]; - # copies avatar from flake into home home.file."Avatar" = { source = ../../assets/media/avatar.png; @@ -99,15 +100,6 @@ # application icons to use #icons = { }; - # firefox tweaks - targets.firefox = { - enable = true; - #colorTheme.enable = true; - colors.enable = true; - fonts.enable = true; - profileNames = [ "default" ]; - }; - }; }; diff --git a/modules/features/terminal/kitty.nix b/modules/features/terminal/kitty.nix index db57f50..423aeb9 100644 --- a/modules/features/terminal/kitty.nix +++ b/modules/features/terminal/kitty.nix @@ -35,12 +35,6 @@ enableGitIntegration = true; shellIntegration.enableFishIntegration = true; - # font settings - #font = { - #name = "spleen 32x64"; - #size = 12; - #}; - # kitty settings settings = { @@ -53,6 +47,7 @@ scrollback_lines = 10000; enable_audio_bell = false; update_check_interval = 0; + background_blur = 2; # cursor settings cursor_shape = "Underline"; @@ -69,11 +64,6 @@ hide_window_decorations = true; show_window_resize_notification = false; - # Colours - # NOT YET IMPLEMENTED - background_blur = 2; - #background_opacity = "0.82"; - }; # misecellaneous kitty config diff --git a/modules/features/terminal/yazi.nix b/modules/features/terminal/yazi.nix index 5a44072..e3df7b3 100644 --- a/modules/features/terminal/yazi.nix +++ b/modules/features/terminal/yazi.nix @@ -39,9 +39,6 @@ }; }; - # NOT YET IMPLEMENTED - #theme = { }; - }; }; diff --git a/modules/features/virtualisation.nix b/modules/features/virtualisation.nix index 5017a6b..871ca86 100644 --- a/modules/features/virtualisation.nix +++ b/modules/features/virtualisation.nix @@ -28,11 +28,8 @@ enable = true; }; - environment = { - systemPackages = with pkgs; [ - dnsmasq # for vm networking - ]; - }; + # for vm networking + environment.systemPackages = with pkgs; [ dnsmasq ]; # virtualisation settings virtualisation = { diff --git a/modules/hosts/hades/configuration.nix b/modules/hosts/hades/configuration.nix index 3cd3ad8..69e78d1 100644 --- a/modules/hosts/hades/configuration.nix +++ b/modules/hosts/hades/configuration.nix @@ -15,9 +15,6 @@ # set hostname networking.hostName = "hades"; - # specify kernel to use - disable if wanting zfs support - #boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; - # bootloader settings boot.loader = { systemd-boot.enable = true; diff --git a/modules/hosts/hades/hardware.nix b/modules/hosts/hades/hardware.nix index aa2567e..ac43e70 100644 --- a/modules/hosts/hades/hardware.nix +++ b/modules/hosts/hades/hardware.nix @@ -14,7 +14,7 @@ { - # important i think lol + # important imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -22,7 +22,7 @@ # bootloader boot.loader.systemd-boot.enable = true; - # shrug + # kernel modules to include boot.initrd.availableKernelModules = [ "ehci_pci" "xhci_pci"