From 8c011c7e50a1a903a6e4d3b74a1acb4f27762a51 Mon Sep 17 00:00:00 2001 From: Chris Kruining Date: Mon, 28 Jul 2025 11:20:21 +0200 Subject: [PATCH] woot. got a working build again --- flake.nix | 17 ++++--- homes/user-configurations/chris.nix | 19 ------- homes/x86_64-linux/chris@manwe/default.nix | 22 +++++++- modules/home/home-manager/default.nix | 10 ++++ modules/home/shell/default.nix | 1 - modules/home/shell/toolset/git/default.nix | 2 - modules/home/themes/default.nix | 27 +++++++++- modules/nixos/desktop/gamescope/default.nix | 5 +- .../default.nix} | 0 .../security/{boot.nix => boot/default.nix} | 0 .../security/{sops.nix => sops/default.nix} | 0 .../security/{sudo.nix => sudo/default.nix} | 0 modules/nixos/theming/default.nix | 50 ------------------- systems/x86_64-linux/manwe/default.nix | 1 - systems/x86_64-linux/orome/default.nix | 7 +-- systems/x86_64-linux/tulkas/default.nix | 1 - 16 files changed, 73 insertions(+), 89 deletions(-) delete mode 100644 homes/user-configurations/chris.nix create mode 100644 modules/home/home-manager/default.nix rename modules/nixos/system/{networking.nix => networking/default.nix} (100%) rename modules/nixos/system/security/{boot.nix => boot/default.nix} (100%) rename modules/nixos/system/security/{sops.nix => sops/default.nix} (100%) rename modules/nixos/system/security/{sudo.nix => sudo/default.nix} (100%) delete mode 100644 modules/nixos/theming/default.nix diff --git a/flake.nix b/flake.nix index e7ed350..63b5789 100644 --- a/flake.nix +++ b/flake.nix @@ -68,14 +68,6 @@ inherit inputs; src = ./.; - channels-config = { - allowUnfree = true; - permittedInsecurePackages = [ - "dotnet-sdk-6.0.428" - "aspnetcore-runtime-6.0.36" - ]; - }; - snowfall = { namespace = "sneeuwvlok"; @@ -85,6 +77,14 @@ }; }; + channels-config = { + allowUnfree = true; + permittedInsecurePackages = [ + "dotnet-sdk-6.0.428" + "aspnetcore-runtime-6.0.36" + ]; + }; + overlays = with inputs; [ fenix.overlays.default nix-minecraft.overlay @@ -92,6 +92,7 @@ ]; homes.modules = with inputs; [ + stylix.homeModules.stylix plasma-manager.homeManagerModules.plasma-manager ]; }; diff --git a/homes/user-configurations/chris.nix b/homes/user-configurations/chris.nix deleted file mode 100644 index 26a170b..0000000 --- a/homes/user-configurations/chris.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - programs.git = { - userName = "Chris Kruining"; - userEmail = "chris@kruining.eu"; - }; - - sneeuwvlok = { - shell = { - default = "zsh"; - corePkgs.enable = true; - }; - - themes = { - enable = true; - theme = "everforest"; - polarity = "dark"; - }; - }; -} \ No newline at end of file diff --git a/homes/x86_64-linux/chris@manwe/default.nix b/homes/x86_64-linux/chris@manwe/default.nix index 530ea5f..7b7c8f3 100644 --- a/homes/x86_64-linux/chris@manwe/default.nix +++ b/homes/x86_64-linux/chris@manwe/default.nix @@ -1,4 +1,22 @@ -{ ... }: +{ osConfig, ... }: { - sneeuwvlok = {}; + home.stateVersion = osConfig.system.stateVersion; + + programs.git = { + userName = "Chris Kruining"; + userEmail = "chris@kruining.eu"; + }; + + sneeuwvlok = { + shell = { + default = "zsh"; + corePkgs.enable = true; + }; + + themes = { + enable = true; + theme = "everforest"; + polarity = "dark"; + }; + }; } diff --git a/modules/home/home-manager/default.nix b/modules/home/home-manager/default.nix new file mode 100644 index 0000000..93bae2e --- /dev/null +++ b/modules/home/home-manager/default.nix @@ -0,0 +1,10 @@ +{ lib, osConfig ? { }, ... }: +let + inherit (lib) mkDefault; +in +{ + systemd.user.startServices = "sd-switch"; + programs.home-manager.enable = true; + + home.stateVersion = mkDefault (osConfig.system.stateVersion or "25.05"); +} \ No newline at end of file diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix index 2a0837c..80aa20a 100644 --- a/modules/home/shell/default.nix +++ b/modules/home/shell/default.nix @@ -21,7 +21,6 @@ in # shell = pkgs."${cfg.default}"; # } else {}) - (mkIf (cfg.corePkgs.enable) { ${namespace}.shell.toolset = mkDefault { bat.enable = true; diff --git a/modules/home/shell/toolset/git/default.nix b/modules/home/shell/toolset/git/default.nix index 48320f4..3edfb60 100644 --- a/modules/home/shell/toolset/git/default.nix +++ b/modules/home/shell/toolset/git/default.nix @@ -76,8 +76,6 @@ in credential.helper = "${pkgs.gitFull}/bin/git-credential-libsecret"; user = { - name = config.${namespace}.user.full_name; - email = config.${namespace}.user.email; signingKey = "~/.ssh/id_rsa.pub"; }; diff --git a/modules/home/themes/default.nix b/modules/home/themes/default.nix index 55bccfe..276e850 100644 --- a/modules/home/themes/default.nix +++ b/modules/home/themes/default.nix @@ -5,6 +5,7 @@ let inherit (lib.types) nullOr enum; cfg = config.${namespace}.themes; + osCfg = osConfig.${namespace}.theming; in { options.${namespace}.themes = { enable = mkEnableOption "Theming (Stylix)"; @@ -23,12 +24,36 @@ in { }; }; - config = mkIf (cfg.enable && osConfig.${namespace}.theming.enable) { + config = mkIf (cfg.enable) { stylix = { + enable = true; + base16Scheme = "${pkgs.base16-schemes}/share/themes/${cfg.theme}.yaml"; image = ./${cfg.theme}.jpg; polarity = cfg.polarity; targets.qt.platform = mkDefault "kde6"; + + fonts = { + serif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Serif"; + }; + + sansSerif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Sans"; + }; + + monospace = { + package = pkgs.nerd-fonts.jetbrains-mono; + name = "JetBrainsMono Nerd Font Mono"; + }; + + emoji = { + package = pkgs.noto-fonts-emoji; + name = "Noto Color Emoji"; + }; + }; }; }; } diff --git a/modules/nixos/desktop/gamescope/default.nix b/modules/nixos/desktop/gamescope/default.nix index 92d4e96..80e6099 100644 --- a/modules/nixos/desktop/gamescope/default.nix +++ b/modules/nixos/desktop/gamescope/default.nix @@ -1,6 +1,6 @@ { lib, config, namespace, inputs, ... }: let - inherit (lib) mkIf mkEnableOption; + inherit (lib) mkIf mkEnableOption mkForce; cfg = config.${namespace}.desktop.gamescope; in @@ -16,6 +16,9 @@ in config = mkIf cfg.enable { ${namespace}.desktop.plasma.enable = true; + services.displayManager.sddm.enable = mkForce false; + services.displayManager.gdm.enable = mkForce false; + jovian = { steam = { enable = true; diff --git a/modules/nixos/system/networking.nix b/modules/nixos/system/networking/default.nix similarity index 100% rename from modules/nixos/system/networking.nix rename to modules/nixos/system/networking/default.nix diff --git a/modules/nixos/system/security/boot.nix b/modules/nixos/system/security/boot/default.nix similarity index 100% rename from modules/nixos/system/security/boot.nix rename to modules/nixos/system/security/boot/default.nix diff --git a/modules/nixos/system/security/sops.nix b/modules/nixos/system/security/sops/default.nix similarity index 100% rename from modules/nixos/system/security/sops.nix rename to modules/nixos/system/security/sops/default.nix diff --git a/modules/nixos/system/security/sudo.nix b/modules/nixos/system/security/sudo/default.nix similarity index 100% rename from modules/nixos/system/security/sudo.nix rename to modules/nixos/system/security/sudo/default.nix diff --git a/modules/nixos/theming/default.nix b/modules/nixos/theming/default.nix deleted file mode 100644 index 78adb94..0000000 --- a/modules/nixos/theming/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ inputs, config, lib, pkgs, namespace, ... }: -let - inherit (lib) mkIf mkEnableOption; - - cfg = config.${namespace}.theming; -in -{ - imports = [ - inputs.stylix.nixosModules.stylix - ]; - - options.${namespace}.theming = { - enable = mkEnableOption "enable theming" // { - default = true; - }; - }; - - config = mkIf cfg.enable { - stylix = { - enable = true; - autoEnable = true; - - # base16Scheme = "${pkgs.base16-schemes}/share/themes/${cfg.theme}.yaml"; - # image = ./${cfg.theme}.jpg; - # polarity = cfg.polarity; - - fonts = { - serif = { - package = pkgs.dejavu_fonts; - name = "DejaVu Serif"; - }; - - sansSerif = { - package = pkgs.dejavu_fonts; - name = "DejaVu Sans"; - }; - - monospace = { - package = pkgs.nerd-fonts.jetbrains-mono; - name = "JetBrainsMono Nerd Font Mono"; - }; - - emoji = { - package = pkgs.noto-fonts-emoji; - name = "Noto Color Emoji"; - }; - }; - }; - }; -} diff --git a/systems/x86_64-linux/manwe/default.nix b/systems/x86_64-linux/manwe/default.nix index 19ea4fb..821e087 100644 --- a/systems/x86_64-linux/manwe/default.nix +++ b/systems/x86_64-linux/manwe/default.nix @@ -20,7 +20,6 @@ in }; desktop.use = "plasma"; - theming.enable = true; }; system.stateVersion = "23.11"; diff --git a/systems/x86_64-linux/orome/default.nix b/systems/x86_64-linux/orome/default.nix index 5d5bf2f..34210ac 100644 --- a/systems/x86_64-linux/orome/default.nix +++ b/systems/x86_64-linux/orome/default.nix @@ -8,9 +8,10 @@ in ]; sneeuwvlok = { - preset = "desktop"; - - bluetooth.enable = true; + hardware.has = { + bluetooth = true; + audio = true; + }; }; system.stateVersion = "23.11"; diff --git a/systems/x86_64-linux/tulkas/default.nix b/systems/x86_64-linux/tulkas/default.nix index 0bbcd60..6aea613 100644 --- a/systems/x86_64-linux/tulkas/default.nix +++ b/systems/x86_64-linux/tulkas/default.nix @@ -20,7 +20,6 @@ in }; desktop.use = "gamescope"; - theming.enable = true; }; system.stateVersion = "23.11";