From 4ec8771d1ceb02ba091518675c95772e27c718c9 Mon Sep 17 00:00:00 2001 From: Adam0 Date: Fri, 5 Jun 2026 22:30:19 +0200 Subject: [PATCH] attempted fixes --- modules/hosts/desktop/home.nix | 80 ++++++++++++++++---------------- modules/hosts/euclid/default.nix | 3 +- modules/hosts/laptop/home.nix | 69 +++++++++++++-------------- modules/programs/gpg.nix | 12 ++++- modules/programs/tui/btop.nix | 3 ++ modules/services/crowdsec.nix | 22 ++++++++- 6 files changed, 112 insertions(+), 77 deletions(-) diff --git a/modules/hosts/desktop/home.nix b/modules/hosts/desktop/home.nix index e8f83a1..ef3cc7f 100644 --- a/modules/hosts/desktop/home.nix +++ b/modules/hosts/desktop/home.nix @@ -20,52 +20,54 @@ # keep-sorted end ]; - # keep-sorted start block=yes newline_separated=yes - # Enable rocm gpu backend for system monitoring. - programs.btop.gpuBackends = ["rocm"]; + programs = { + # keep-sorted start block=yes newline_separated=yes + # Enable rocm gpu backend for system monitoring. + btop.gpuBackends = ["rocm"]; - # Configure dual monitor setup. - programs.hylix.monitors = [ - { - output = "DP-1"; - mode = "1920x1080@144"; - position = "-1920x96"; - scale = "1"; - extra.vrr = 0; - } + # Configure dual monitor setup. + hylix.monitors = [ + { + output = "DP-1"; + mode = "1920x1080@144"; + position = "-1920x96"; + scale = "1"; + extra.vrr = 0; + } - { - output = "DP-2"; - mode = "2560x1440@170"; - position = "0x0"; - scale = "1"; - } - ]; + { + output = "DP-2"; + mode = "2560x1440@170"; + position = "0x0"; + scale = "1"; + } + ]; - programs.noctalia-shell = { - # keep-sorted start newline_separated=yes - # Keep the desktop weather location in sops. - location.source = "sops"; + noctalia-shell = { + # keep-sorted start newline_separated=yes + # Keep the desktop weather location in sops. + location.source = "sops"; - # Enable gpu acceleration for noctalia. - systemMonitor.enableGpu = true; + # Avoid desktop suspend after idle blanking. + settings.idle.suspendTimeout = mkForce 0; - # Avoid desktop suspend after idle blanking. - settings.idle.suspendTimeout = mkForce 0; - # keep-sorted end - }; + # Enable gpu acceleration for noctalia. + systemMonitor.enableGpu = true; + # keep-sorted end + }; - # Gpu monitoring support for multi-gpu desktop. - programs.nvtop.types = [ - # keep-sorted start - "amd" - "intel" - # keep-sorted end - ]; + # Gpu monitoring support for multi-gpu desktop. + nvtop.types = [ + # keep-sorted start + "amd" + "intel" + # keep-sorted end + ]; - # Browser memory allocation for desktop usage. - programs.zen-browser.profiles.default.preferences.commitSpace = 25698; - # keep-sorted end + # Browser memory allocation for desktop usage. + zen-browser.profiles.default.preferences.commitSpace = 25698; + # keep-sorted end + }; }; }; } diff --git a/modules/hosts/euclid/default.nix b/modules/hosts/euclid/default.nix index 295a8f9..6ce27c3 100644 --- a/modules/hosts/euclid/default.nix +++ b/modules/hosts/euclid/default.nix @@ -31,6 +31,7 @@ options = [ # keep-sorted start "compress=zstd" + "defaults" "noatime" "subvol=${subvol}" # keep-sorted end @@ -40,8 +41,6 @@ # keep-sorted start "/mnt/immich" = mkBtrfsMount "/dev/disk/by-uuid/2262a52f-3110-462e-815a-7717886b8cc7" "@"; "/mnt/media" = mkBtrfsMount "/dev/disk/by-uuid/7bf5484e-67c1-4c67-a20f-cd47b1d6fb21" "@"; - "/mnt/monitor0" = mkBtrfsMount "/dev/disk/by-uuid/7bf5484e-67c1-4c67-a20f-cd47b1d6fb21" "@monitor"; - "/mnt/monitor1" = mkBtrfsMount "/dev/disk/by-uuid/2262a52f-3110-462e-815a-7717886b8cc7" "@monitor"; # keep-sorted end }; }; diff --git a/modules/hosts/laptop/home.nix b/modules/hosts/laptop/home.nix index 0513fa8..44ab9b0 100644 --- a/modules/hosts/laptop/home.nix +++ b/modules/hosts/laptop/home.nix @@ -23,48 +23,49 @@ # keep-sorted end ]; - # Enable laptop hardware features. - programs.nixcord.equibop.camera.enable = true; - - # keep-sorted start block=yes newline_separated=yes - # Enable laptop-specific hyprland features. - programs.hylix = { + programs = { # keep-sorted start block=yes newline_separated=yes - monitors = [ - { - output = "eDP-1"; - mode = "1920x1080@60"; - position = "0x0"; - scale = "1"; - } - ]; - - touch.enable = true; - # keep-sorted end - }; + # Enable laptop-specific hyprland features. + hylix = { + # keep-sorted start block=yes newline_separated=yes + monitors = [ + { + output = "eDP-1"; + mode = "1920x1080@60"; + position = "0x0"; + scale = "1"; + } + ]; - # Enable laptop-specific noctalia features. - programs.noctalia-shell = { - battery.enable = true; - idle = { - # keep-sorted start - brightness.enable = true; - suspend.enable = true; + touch.enable = true; # keep-sorted end }; - }; - # Gpu monitoring for intel integrated graphics. - programs.nvtop.types = ["intel"]; + # Enable laptop hardware features. + nixcord.equibop.camera.enable = true; - # Travel mode configuration for mobile usage. - programs.zen-browser.profiles.default.preferences = { - # keep-sorted start - commitSpace = 13107; - travel.enable = true; + # Enable laptop-specific noctalia features. + noctalia-shell = { + battery.enable = true; + idle = { + # keep-sorted start + brightness.enable = true; + suspend.enable = true; + # keep-sorted end + }; + }; + + nvtop.types = ["intel"]; + + # Travel mode configuration for mobile usage. + zen-browser.profiles.default.preferences = { + # keep-sorted start + commitSpace = 13107; + travel.enable = true; + # keep-sorted end + }; # keep-sorted end }; - # keep-sorted end }; }; } diff --git a/modules/programs/gpg.nix b/modules/programs/gpg.nix index 18ef6c2..f582650 100644 --- a/modules/programs/gpg.nix +++ b/modules/programs/gpg.nix @@ -2,10 +2,13 @@ flake.modules.homeManager.gpg = { # keep-sorted start config, + lib, pkgs, # keep-sorted end ... - }: { + }: let + inherit (lib) mkForce; + in { # keep-sorted start block=yes newline_separated=yes # Supply gcr for the gnome pinentry integration. home.packages = [pkgs.gcr]; @@ -27,6 +30,13 @@ # Use the gnome pinentry for passphrase prompts. pinentry.package = pkgs.pinentry-gnome3; }; + + systemd.user.services.set-SSH_AUTH_SOCK = { + # Avoid the upstream cycle with sockets.target. + Unit.Before = mkForce []; + + Service.Environment = ["GNUPGHOME=${config.programs.gpg.homedir}"]; + }; # keep-sorted end }; } diff --git a/modules/programs/tui/btop.nix b/modules/programs/tui/btop.nix index 272506d..af7225f 100644 --- a/modules/programs/tui/btop.nix +++ b/modules/programs/tui/btop.nix @@ -47,6 +47,9 @@ settings = { # keep-sorted start newline_separated=yes + # Hide btrfs subvolume mounts from disk widgets. + disks_filter = "exclude=/home /nix /root /var/cache /var/lib /var/log"; + # Disable logging. log_level = "DISABLED"; diff --git a/modules/services/crowdsec.nix b/modules/services/crowdsec.nix index 146c742..7827e73 100644 --- a/modules/services/crowdsec.nix +++ b/modules/services/crowdsec.nix @@ -3,9 +3,29 @@ url = "github:TornaxO7/nixpkgs/crowdsec"; }; - flake.modules.nixos.crowdsec = {config, ...}: let + flake.overlays.crowdsec = final: _prev: let + crowdsecPkgs = inputs.nixpkgs-crowdsec.legacyPackages.${final.stdenv.hostPlatform.system}; + in { + inherit + (crowdsecPkgs) + # keep-sorted start + crowdsec + crowdsec-firewall-bouncer + # keep-sorted end + ; + }; + + flake.modules.nixos.crowdsec = { + # keep-sorted start + config, + self, + # keep-sorted end + ... + }: let dataDir = "/var/lib/crowdsec/data"; in { + nixpkgs.overlays = [self.overlays.crowdsec]; + disabledModules = [ # keep-sorted start "services/security/crowdsec-firewall-bouncer.nix" -- 2.51.2