diff --git a/flake.lock b/flake.lock index 35727b3..14f7efc 100644 --- a/flake.lock +++ b/flake.lock @@ -918,11 +918,11 @@ ] }, "locked": { - "lastModified": 1747458668, - "narHash": "sha256-5/PsESjQUuEbPTd+8rHHUItN/cW9USFJAm6y5yksTDQ=", + "lastModified": 1747257007, + "narHash": "sha256-84q5eLj6QM0oUj1YvrT8TZH+RYIf/L/GJQDQ/tTvkR8=", "owner": "notashelf", "repo": "superfreq", - "rev": "6ef0a60002cd95861e3b30e74b62d89bf7f7b905", + "rev": "5531358da2b85cb4e3218ffb4b70373429e7c09e", "type": "github" }, "original": { diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix index c282d5e..7a88c01 100644 --- a/hosts/hermit/configuration.nix +++ b/hosts/hermit/configuration.nix @@ -31,10 +31,7 @@ }; system = { - boot = { - systemd-boot.enable = true; - lanzaboote.enable = true; - }; + boot.systemd-boot.enable = true; impermanence.enable = false; services = { owncloud.enable = true; diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index eb4b8da..7009c3d 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + self, + pkgs, + ... +}: { environment.systemPackages = builtins.attrValues { inherit (pkgs) diff --git a/modules/programs/gui/foot.nix b/modules/programs/gui/foot.nix index 47eb9f4..30a2215 100644 --- a/modules/programs/gui/foot.nix +++ b/modules/programs/gui/foot.nix @@ -17,8 +17,8 @@ title = "foot"; locked-title = "no"; - font = "ComicShannsMono Nerd Font Mono:size=14"; - font-bold = "ComicShannsMono Nerd Font Mono:size=14:style=Bold"; + font = "Iosevka Nerd Font:size=14"; + font-bold = "Iosevka Nerd Font:size=14:style=Bold"; line-height = 20; letter-spacing = 0; diff --git a/modules/services/wayneko/module.nix b/modules/services/wayneko/module.nix index 2eb2a49..fe2f49e 100644 --- a/modules/services/wayneko/module.nix +++ b/modules/services/wayneko/module.nix @@ -4,18 +4,6 @@ ... }: 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"; @@ -28,7 +16,7 @@ in { after = ["graphical-session.target"]; serviceConfig = { - ExecStart = "${getExe custom-wayneko} --layer top --type striped"; + ExecStart = "${getExe pkgs.wayneko} --layer top --follow-pointer false"; Restart = "on-failure"; RestartSec = 1; TimeoutStopSec = 10; diff --git a/modules/style/colors.nix b/modules/style/colors.nix index 800bfc0..07934ae 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 = "Black Metal Venom"; + default = "Gruvbox"; }; slug = mkOption { diff --git a/modules/system/boot/lanzaboote/module.nix b/modules/system/boot/lanzaboote/module.nix index 6df8f4a..e7fd7a5 100644 --- a/modules/system/boot/lanzaboote/module.nix +++ b/modules/system/boot/lanzaboote/module.nix @@ -6,16 +6,12 @@ ... }: 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 cfg.enable { + config = mkIf false { boot = { lanzaboote = { enable = true; diff --git a/modules/system/hardware/power.nix b/modules/system/hardware/power.nix index 7e55a66..3b5ab91 100644 --- a/modules/system/hardware/power.nix +++ b/modules/system/hardware/power.nix @@ -29,54 +29,7 @@ in { hardware.acpilight.enable = false; - 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"; - }; - }; - }; + programs.superfreq.enable = true; services = { upower = { enable = true; diff --git a/packages/helix/colorscheme.nix b/packages/helix/colorscheme.nix index d83c3da..0419d13 100644 --- a/packages/helix/colorscheme.nix +++ b/packages/helix/colorscheme.nix @@ -1,4 +1,4 @@ { - inherits = "base16_transparent"; + inherits = "gruvbox"; "ui.background" = {}; } diff --git a/packages/helix/default.nix b/packages/helix/default.nix index fcb2e40..7d02060 100644 --- a/packages/helix/default.nix +++ b/packages/helix/default.nix @@ -32,7 +32,6 @@ typescript-language-server, vscode-langservers-extracted, simple-completion-language-server, - zls, helix, ... }: let @@ -140,9 +139,6 @@ tinymist # typst lsp vscode-langservers-extracted - - # zig language server - zls ]; nativeBuildInputs = [makeWrapper]; postBuild = '' diff --git a/packages/shell/packages.nix b/packages/shell/packages.nix index 745fc27..e11eef6 100644 --- a/packages/shell/packages.nix +++ b/packages/shell/packages.nix @@ -40,11 +40,10 @@ builtins.attrValues { element difftastic hexyl - yazi gnumake asciinema inetutils - tokei + scc starship onefetch wget