From 43d47fd8a53e4e7f1f2e9606f7907c042efa27db Mon Sep 17 00:00:00 2001 From: Kaybee Date: Sat, 6 Dec 2025 00:12:17 +0100 Subject: [PATCH] Added Stylix Theming to LoyAdjo --- flake.nix | 1 + homes/x86_64-linux/kb@LoyAdjo/default.nix | 16 +++++- homes/x86_64-linux/kb@Ohybke/default.nix | 8 +++ modules/home/suites/desktop/chromium.nix | 2 +- modules/home/suites/desktop/default.nix | 11 ++++ modules/home/suites/desktop/waybar.nix | 10 +--- systems/x86_64-linux/LoyAdjo/default.nix | 34 +++++++------ systems/x86_64-linux/LoyAdjo/stylix.nix | 61 +++++++++++++++++++++++ 8 files changed, 117 insertions(+), 26 deletions(-) create mode 100644 systems/x86_64-linux/LoyAdjo/stylix.nix diff --git a/flake.nix b/flake.nix index ebc19dd..f83a39e 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,7 @@ # Modules for Host LoyAdjo systems.hosts.LoyAdjo.modules = with inputs; [ + stylix.nixosModules.stylix ]; # Modules for Host Rubtrm diff --git a/homes/x86_64-linux/kb@LoyAdjo/default.nix b/homes/x86_64-linux/kb@LoyAdjo/default.nix index b8188c1..8c4e9aa 100644 --- a/homes/x86_64-linux/kb@LoyAdjo/default.nix +++ b/homes/x86_64-linux/kb@LoyAdjo/default.nix @@ -60,7 +60,7 @@ btop fastfetch kb-one.olympus - kicad + #kicad freecad ]; @@ -69,13 +69,25 @@ "--config=/home/kb/.config/syncthing" "--data=/home/kb/sync" ]; - services.safeeyes.enable = true; + services.safeeyes.enable = false; services.gpg-agent.enable = true; services.ssh-agent.enable = true; suites.desktop.enable = true; + suites.desktop.waybar.outputs = [ "DP-4" "DP-5" "DP-6" "DP-7" ]; + + # Fix Stylix Quirks + gtk.gtk2.force = true; + + # Stylix Config + stylix.autoEnable = true; + stylix.targets.waybar.enableLeftBackColors = true; + stylix.targets.waybar.enableCenterBackColors = true; + stylix.targets.waybar.enableRightBackColors = true; + stylix.targets.waybar.font = "sansSerif"; + home.stateVersion = "24.05"; } diff --git a/homes/x86_64-linux/kb@Ohybke/default.nix b/homes/x86_64-linux/kb@Ohybke/default.nix index a3298d3..ec36f38 100644 --- a/homes/x86_64-linux/kb@Ohybke/default.nix +++ b/homes/x86_64-linux/kb@Ohybke/default.nix @@ -61,6 +61,14 @@ ]; suites.desktop.enable = true; + suites.desktop.outputs = [ + "eDP-1" + "DP-2" + "DP-3" + "DP-4" + "HDMI-A-1" + ]; + services.syncthing.enable = true; services.syncthing.extraOptions = [ diff --git a/modules/home/suites/desktop/chromium.nix b/modules/home/suites/desktop/chromium.nix index 83e341a..7551cb7 100644 --- a/modules/home/suites/desktop/chromium.nix +++ b/modules/home/suites/desktop/chromium.nix @@ -49,7 +49,7 @@ in })]) ++ (lib.lists.optionals (cfg.chromium.disableLanguageTool == false) [(createChromiumExtension { # LanguageTool id = "oldceeleldhonbafppcapldpdifcinji"; - sha256 = "sha256-w1xg8/ChWMWzC2+lOQKPqtgzp9o+k5ItPMmzt4huLl4="; + sha256 = "sha256-1fbnl8ggDkDrb6YR5vUhv3sehmMMuUOB8gA2oeFId0s="; version = "10.0.1"; })]) ++ (lib.lists.optionals (cfg.chromium.disableDarkReader == false) [(createChromiumExtension { # dark reader diff --git a/modules/home/suites/desktop/default.nix b/modules/home/suites/desktop/default.nix index b134b51..a8f8247 100644 --- a/modules/home/suites/desktop/default.nix +++ b/modules/home/suites/desktop/default.nix @@ -149,6 +149,17 @@ in { default = cfg.enable; description = "Enable Customized Waybar"; }; + waybar.outputs = lib.mkOption { + type = with lib.types; nullOr (listOf str); + default = [ "eDP-1" ]; + example = [ + "eDP-1" + "DP-2" + "DP-3" + "DP-4" + "HDMI-A-1" + ]; + }; }; config = lib.mkIf cfg.enable { diff --git a/modules/home/suites/desktop/waybar.nix b/modules/home/suites/desktop/waybar.nix index 34a2b38..bdb5e28 100644 --- a/modules/home/suites/desktop/waybar.nix +++ b/modules/home/suites/desktop/waybar.nix @@ -14,13 +14,7 @@ in { #position = "top"; height = 18; spacing = 5; - output = [ - "eDP-1" - "DP-4" - "HDMI-A-1" - "DP-2" - "DP-3" - ]; + output = cfg.outputs; # Waybar Order modules-left = [ "sway/workspaces" @@ -153,8 +147,6 @@ in { background: @base01; padding:0 4 0 4; } - - ''; }; diff --git a/systems/x86_64-linux/LoyAdjo/default.nix b/systems/x86_64-linux/LoyAdjo/default.nix index ce5c599..d0d577c 100644 --- a/systems/x86_64-linux/LoyAdjo/default.nix +++ b/systems/x86_64-linux/LoyAdjo/default.nix @@ -1,14 +1,25 @@ { config, pkgs, lib, ... }: { - imports = - [ - ./hardware.nix - ]; + imports = [ + ./hardware.nix + ./stylix.nix + ]; # Configure Nix nix.package = pkgs.lixPackageSets.stable.lix; nixpkgs.config.allowUnfree = false; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "ungoogled-chromium" + "ungoogled-chromium-unwrapped" + "widevine-cdm" + "veracrypt" + "castlabs-electron" + "steam" + "steam-unwrapped" + "joypixels" + ]; + nixpkgs.config.joypixels.acceptLicense = true; nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.connect-timeout = 5; nix.settings.fallback = true; @@ -51,15 +62,6 @@ # Nix Security nix.settings.trusted-users=[ "remotebuild" ]; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "ungoogled-chromium" - "ungoogled-chromium-unwrapped" - "widevine-cdm" - "veracrypt" - "castlabs-electron" - "steam" - "steam-unwrapped" - ]; nixpkgs.config.permittedInsecurePackages = [ "electron-36.9.5" ]; @@ -102,7 +104,7 @@ console.keyMap = "de"; services.numen = { enable = true; - autoStart = true; + autoStart = false; phrasesPkg = pkgs.kb-one.numen-phrases.override { customWakeWords-en = [ "enable" "voice" "compute" ]; customWakeWords-de = [ "sprach" "schrift" "aktiv" ]; @@ -177,6 +179,10 @@ openFirewall = true; }; + programs.waybar.enable = true; + programs.sway.enable = true; + + # System Packages environment.systemPackages = with pkgs; [ # To search, run: $ nix search wget diff --git a/systems/x86_64-linux/LoyAdjo/stylix.nix b/systems/x86_64-linux/LoyAdjo/stylix.nix new file mode 100644 index 0000000..8ef027f --- /dev/null +++ b/systems/x86_64-linux/LoyAdjo/stylix.nix @@ -0,0 +1,61 @@ +{ config, pkgs, lib, inputs, ... }: +{ + # Configure Home-Manager + home-manager.backupFileExtension = "backup"; + home-manager.sharedModules = [ + { + stylix.enable = true; + } + ]; + + # Configure Stylix + stylix.enable = true; + stylix.image = pkgs.fetchurl { + # MaKeleLele: Space Base + #url = "https://w.wallhaven.cc/full/1j/wallhaven-1j6239.png"; + #hash = "sha256-NM5nyeOQAL0yvXxwLWsshDi1WD7DvIytNofu6GX3dNw="; + # p4r4d0x: Pink Vapourwave + #url = "https://w.wallhaven.cc/full/73/wallhaven-736k8e.jpg"; + #hash = "sha256-xnn8HnrMMQByh6EnIgvHmZzWVQL75tClz/MKtcqEyAM="; + # WallHAven4o: Colorfull Shapes + #url = "https://w.wallhaven.cc/full/ox/wallhaven-ox7e7l.jpg"; + #hash = "sha256-vOXANXLSP8FVluwjFBPbR6XtEIIrZ4xl9O2c+wd/KL0="; + # deleted: Fox Singularity + url = "https://w.wallhaven.cc/full/q2/wallhaven-q2llr5.png"; + hash = "sha256-Sg2Q1tNcwh8Cj+V+xcijvcT6X5eDbC+bfzjqwVtsVMU="; + # delted: Arc Raiders Selfie + #url = "https://w.wallhaven.cc/full/k8/wallhaven-k89ezm.jpg"; + #hash = "sha256-Y7VI+q9oueiglfdqqfPau4XUT6rjvjk7L4716xMjO4Q="; + # delted: Flowers in Window + #url = "https://w.wallhaven.cc/full/83/wallhaven-83ze72.jpg"; + #hash = "sha256-U9CQK6hzk0UwOQlawFp/l0g3LytfkKQcWmCvZ7UMP98="; + # hdkr947: Fox Silhouette + #url = "https://w.wallhaven.cc/full/1k/wallhaven-1k99o9.png"; + #hash = "sha256-XRRk0YjFbBaYWw8D4VQIxVAKSXFlX7Z0oheTzIMw6Q8="; + }; + stylix.polarity = "dark"; + + stylix.fonts = { + serif = { + package = pkgs.kb-one.poly-nerdfont; + name = "Poly Nerd Font"; + }; + + sansSerif = { + package = pkgs.kb-one.sauce-sans-pro; + name = "SauceSansPro Nerd Font"; + }; + + monospace = { + package = pkgs.nerd-fonts.dejavu-sans-mono; + name = "DejaVuSansM Nerd Font"; + }; + + emoji = { + package = pkgs.joypixels; + name = "JoyPixels"; + }; + }; + +} +