From 9ad0b231050c153e50c1033232adb1419c43bc06 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Fri, 16 May 2025 10:45:35 +0200 Subject: [PATCH 01/11] flake.lock: bump superfreq to 0.2.0 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 14f7efc..35727b3 100644 --- a/flake.lock +++ b/flake.lock @@ -918,11 +918,11 @@ ] }, "locked": { - "lastModified": 1747257007, - "narHash": "sha256-84q5eLj6QM0oUj1YvrT8TZH+RYIf/L/GJQDQ/tTvkR8=", + "lastModified": 1747458668, + "narHash": "sha256-5/PsESjQUuEbPTd+8rHHUItN/cW9USFJAm6y5yksTDQ=", "owner": "notashelf", "repo": "superfreq", - "rev": "5531358da2b85cb4e3218ffb4b70373429e7c09e", + "rev": "6ef0a60002cd95861e3b30e74b62d89bf7f7b905", "type": "github" }, "original": { From f9688aacb27f86c55288725ffa23135789f8b74e Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Sat, 17 May 2025 23:45:38 +0200 Subject: [PATCH 02/11] lanzaboote: add mkEnableOption --- modules/system/boot/lanzaboote/module.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/system/boot/lanzaboote/module.nix b/modules/system/boot/lanzaboote/module.nix index e7fd7a5..6df8f4a 100644 --- a/modules/system/boot/lanzaboote/module.nix +++ b/modules/system/boot/lanzaboote/module.nix @@ -6,12 +6,16 @@ ... }: let inherit (lib.modules) mkIf; + inherit (lib.options) mkEnableOption; + + cfg = config.modules.system.boot.lanzaboote; in { + options.modules.system.boot.lanzaboote.enable = mkEnableOption "Lanzaboote"; imports = [ inputs.lanzaboote.nixosModules.lanzaboote ]; - config = mkIf false { + config = mkIf cfg.enable { boot = { lanzaboote = { enable = true; From e710c4d5da78ee0539ea4db8bd1495ae72605163 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Sat, 17 May 2025 23:46:28 +0200 Subject: [PATCH 03/11] hermit: enable lanzaboote --- hosts/hermit/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix index 7a88c01..c282d5e 100644 --- a/hosts/hermit/configuration.nix +++ b/hosts/hermit/configuration.nix @@ -31,7 +31,10 @@ }; system = { - boot.systemd-boot.enable = true; + boot = { + systemd-boot.enable = true; + lanzaboote.enable = true; + }; impermanence.enable = false; services = { owncloud.enable = true; From 547385a0d80013a4ef5046fd746aaa4fb75eddb3 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Sat, 17 May 2025 23:46:37 +0200 Subject: [PATCH 04/11] foot: switch to ComicShannsMono --- modules/programs/gui/foot.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/programs/gui/foot.nix b/modules/programs/gui/foot.nix index 30a2215..47eb9f4 100644 --- a/modules/programs/gui/foot.nix +++ b/modules/programs/gui/foot.nix @@ -17,8 +17,8 @@ title = "foot"; locked-title = "no"; - font = "Iosevka Nerd Font:size=14"; - font-bold = "Iosevka Nerd Font:size=14:style=Bold"; + font = "ComicShannsMono Nerd Font Mono:size=14"; + font-bold = "ComicShannsMono Nerd Font Mono:size=14:style=Bold"; line-height = 20; letter-spacing = 0; From 82347ff2910b08cb469460bda7504cec22bff8da Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Sat, 17 May 2025 23:46:48 +0200 Subject: [PATCH 05/11] wayneko: switch to virt's fork I love my zebra cat --- modules/services/wayneko/module.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/services/wayneko/module.nix b/modules/services/wayneko/module.nix index fe2f49e..2eb2a49 100644 --- a/modules/services/wayneko/module.nix +++ b/modules/services/wayneko/module.nix @@ -4,6 +4,18 @@ ... }: let inherit (lib.meta) getExe; + + custom-wayneko = pkgs.wayneko.overrideAttrs { + src = pkgs.fetchFromGitea { + domain = "copeberg.org"; + owner = "virt"; + repo = "wayneko"; + rev = "3ed4e4e1f847213e712fe22e0278ec62c4fa2cf2"; + hash = "sha256-NxNrcQkx82SQ5GRqcJbbgM/Qg3GY8Whu5m5wI3zQi18="; + }; + + hash = ""; + }; in { systemd.user.services.wayneko = { description = "Wayneko, as a systemd service"; @@ -16,7 +28,7 @@ in { after = ["graphical-session.target"]; serviceConfig = { - ExecStart = "${getExe pkgs.wayneko} --layer top --follow-pointer false"; + ExecStart = "${getExe custom-wayneko} --layer top --type striped"; Restart = "on-failure"; RestartSec = 1; TimeoutStopSec = 10; From ba2152117962c58efdf8985325daec95847d9cd9 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Sat, 17 May 2025 23:47:19 +0200 Subject: [PATCH 06/11] power: add sample superfreq config --- modules/system/hardware/power.nix | 49 ++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/modules/system/hardware/power.nix b/modules/system/hardware/power.nix index 3b5ab91..7e55a66 100644 --- a/modules/system/hardware/power.nix +++ b/modules/system/hardware/power.nix @@ -29,7 +29,54 @@ in { hardware.acpilight.enable = false; - programs.superfreq.enable = true; + services.superfreq = { + enable = true; + # sample config from https://github.com/NotAShelf/superfreq#sample-configuration + settings = { + charger = { + # CPU governor to use + governor = "performance"; + # Turbo boost setting: "always", "auto", or "never" + turbo = "auto"; + # Energy Performance Preference + epp = "performance"; + # Energy Performance Bias (0-15 scale or named value) + epb = "balance_performance"; + # Platform profile (if supported) + platform_profile = "performance"; + # Min/max frequency in MHz (optional) + min_freq_mhz = 800; + max_freq_mhz = 3500; + # Optional: Profile-specific battery charge thresholds (overrides global setting) + # battery_charge_thresholds = [40, 80] # Start at 40%, stop at 80% + }; + + battery = { + governor = "powersave"; + turbo = "auto"; + epp = "power"; + epb = "balance_power"; + platform_profile = "low-power"; + min_freq_mhz = 800; + max_freq_mhz = 2500; + }; + + daemon = { + # Base polling interval in seconds + poll_interval_sec = 5; + # Enable adaptive polling that changes with system state + adaptive_interval = true; + # Minimum polling interval for adaptive polling (seconds) + min_poll_interval_sec = 1; + # Maximum polling interval for adaptive polling (seconds) + max_poll_interval_sec = 30; + # Double the polling interval when on battery to save power + throttle_on_battery = true; + # Logging level: Error, Warning, Info, Debug + log_level = "Info"; + }; + }; + }; services = { upower = { enable = true; From 8485ad994f4c459250f18cafcc6b5d2bd59d3156 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Sat, 17 May 2025 23:47:32 +0200 Subject: [PATCH 07/11] style: switch to Black Metal Venom --- modules/style/colors.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/style/colors.nix b/modules/style/colors.nix index 07934ae..800bfc0 100644 --- a/modules/style/colors.nix +++ b/modules/style/colors.nix @@ -35,7 +35,7 @@ in { name = mkOption { type = nullOr (enum ["Catppuccin Mocha" "Zenburn" "Black Metal Venom" "Gruvbox"]); description = "The colorscheme that should be used globally to theme your system."; - default = "Gruvbox"; + default = "Black Metal Venom"; }; slug = mkOption { From 47d11669387ed76d0a5f25d8e422ab3c88550166 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Sat, 17 May 2025 23:47:32 +0200 Subject: [PATCH 08/11] helix/colorscheme: switch to base16_transparent --- packages/helix/colorscheme.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/helix/colorscheme.nix b/packages/helix/colorscheme.nix index 0419d13..d83c3da 100644 --- a/packages/helix/colorscheme.nix +++ b/packages/helix/colorscheme.nix @@ -1,4 +1,4 @@ { - inherits = "gruvbox"; + inherits = "base16_transparent"; "ui.background" = {}; } From 36b64b6c5fb7c736c68c126ee945e696d60b6653 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Sat, 17 May 2025 23:47:50 +0200 Subject: [PATCH 09/11] helix: add Zig language server --- packages/helix/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/helix/default.nix b/packages/helix/default.nix index 7d02060..fcb2e40 100644 --- a/packages/helix/default.nix +++ b/packages/helix/default.nix @@ -32,6 +32,7 @@ typescript-language-server, vscode-langservers-extracted, simple-completion-language-server, + zls, helix, ... }: let @@ -139,6 +140,9 @@ tinymist # typst lsp vscode-langservers-extracted + + # zig language server + zls ]; nativeBuildInputs = [makeWrapper]; postBuild = '' From 3919677cb83d2d4c48385a25ba71fe84f233cfa4 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Sat, 17 May 2025 23:48:48 +0200 Subject: [PATCH 10/11] hermit/packages: add yazi, scc -> tokei --- packages/shell/packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/shell/packages.nix b/packages/shell/packages.nix index e11eef6..745fc27 100644 --- a/packages/shell/packages.nix +++ b/packages/shell/packages.nix @@ -40,10 +40,11 @@ builtins.attrValues { element difftastic hexyl + yazi gnumake asciinema inetutils - scc + tokei starship onefetch wget From 863bb97129673a275ccbd7638fbfa946037b6f72 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Sat, 17 May 2025 23:49:11 +0200 Subject: [PATCH 11/11] hermit/programs: formatting --- hosts/hermit/programs.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index 7009c3d..eb4b8da 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -1,8 +1,4 @@ -{ - self, - pkgs, - ... -}: { +{pkgs, ...}: { environment.systemPackages = builtins.attrValues { inherit (pkgs)