From 71f5c6dd61c7aea5e694658f427fd8203f07d610 Mon Sep 17 00:00:00 2001 From: Zoty Date: Tue, 23 Jun 2026 15:08:09 -0300 Subject: [PATCH] refactor and cleanup --- modules/_home/default.nix | 1 + modules/_home/niri.nix | 3 +-- modules/core.nix | 1 - modules/den.nix | 5 +++++ modules/dev.nix | 1 + modules/notebook.nix | 19 +------------------ modules/portable.nix | 17 +++++++++++++++++ modules/services.nix | 16 ++++++++-------- modules/work.nix | 20 +------------------- 9 files changed, 35 insertions(+), 48 deletions(-) create mode 100644 modules/portable.nix diff --git a/modules/_home/default.nix b/modules/_home/default.nix index f516112..5ba328b 100644 --- a/modules/_home/default.nix +++ b/modules/_home/default.nix @@ -8,6 +8,7 @@ in { kitty claude-code mpv + obsidian ]; # Symlinks in ~/.jdks/ - path scanned by IntelliJ on Linux by default diff --git a/modules/_home/niri.nix b/modules/_home/niri.nix index 7dd6123..ef309d0 100644 --- a/modules/_home/niri.nix +++ b/modules/_home/niri.nix @@ -1,6 +1,6 @@ { config, pkgs, ... }: let - wallpaper = "${config.home.homeDirectory}/repos/nixos/wallpapers/astronaut.png"; + wallpaper = "${../../wallpapers/astronaut.png}"; in { services.swayidle = { enable = true; @@ -69,7 +69,6 @@ in { text = '' #!/usr/bin/env bash swww-daemon & - sleep 0.5 swww img "${wallpaper}" --transition-type none ''; }; diff --git a/modules/core.nix b/modules/core.nix index 4e9b95a..3c60281 100644 --- a/modules/core.nix +++ b/modules/core.nix @@ -34,7 +34,6 @@ unrar p7zip nvd - obsidian ]; networking.networkmanager.enable = true; diff --git a/modules/den.nix b/modules/den.nix index cc708fd..faf9bf8 100644 --- a/modules/den.nix +++ b/modules/den.nix @@ -26,8 +26,10 @@ in { includes = [ den.provides.hostname den.aspects.core + den.aspects.services den.aspects.wayland den.aspects.niri + den.aspects.portable den.aspects.notebook-specific den.aspects.dev den.aspects.creative @@ -42,8 +44,10 @@ in { includes = [ den.provides.hostname den.aspects.core + den.aspects.services den.aspects.wayland den.aspects.niri + den.aspects.portable den.aspects.work-specific den.aspects.secrets den.aspects.dev @@ -57,6 +61,7 @@ in { includes = [ den.provides.hostname den.aspects.core + den.aspects.services den.aspects.wayland den.aspects.niri den.aspects.desktop-specific diff --git a/modules/dev.nix b/modules/dev.nix index 32b072d..350452e 100644 --- a/modules/dev.nix +++ b/modules/dev.nix @@ -24,6 +24,7 @@ in { # Infrastructure docker-compose + jq # IDE jetbrains.idea diff --git a/modules/notebook.nix b/modules/notebook.nix index c4f9064..6b90a5a 100644 --- a/modules/notebook.nix +++ b/modules/notebook.nix @@ -1,4 +1,4 @@ -{ den, inputs, lib, ... }: { +{ den, inputs, ... }: { den.aspects.notebook-specific.nixos = { pkgs, ... }: { imports = [ ./_hardware/notebook-hardware.nix @@ -11,24 +11,7 @@ enable32Bit = true; }; - security.sudo.wheelNeedsPassword = lib.mkForce true; - - networking.firewall = { - enable = true; - allowedTCPPorts = []; - allowedUDPPorts = []; - }; - services.thermald.enable = true; - powerManagement.enable = true; - - services.tlp = { - enable = true; - settings = { - CPU_SCALING_GOVERNOR_ON_AC = "performance"; - CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - }; - }; boot = { initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ]; diff --git a/modules/portable.nix b/modules/portable.nix new file mode 100644 index 0000000..d004034 --- /dev/null +++ b/modules/portable.nix @@ -0,0 +1,17 @@ +{ den, lib, ... }: { + den.aspects.portable.nixos = { + security.sudo.wheelNeedsPassword = lib.mkForce true; + + networking.firewall.enable = true; + + powerManagement.enable = true; + + services.tlp = { + enable = true; + settings = { + CPU_SCALING_GOVERNOR_ON_AC = "performance"; + CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + }; + }; + }; +} diff --git a/modules/services.nix b/modules/services.nix index 7ca5f8f..da94b56 100644 --- a/modules/services.nix +++ b/modules/services.nix @@ -1,5 +1,5 @@ { den, ... }: { - den.aspects.core.nixos = { pkgs, ... }: { + den.aspects.services.nixos = { services = { libinput.enable = true; fstrim.enable = true; @@ -14,10 +14,10 @@ jack.enable = true; extraConfig.pipewire."92-low-latency" = { "content.properties" = { - "default.clock.rate" = 48000; - "default.clock.quantum" = 256; - "default.clock.min-quantum" = 256; - "default.clock.max-quantum" = 256; + "default.clock.rate" = 48000; + "default.clock.quantum" = 256; + "default.clock.min-quantum" = 256; + "default.clock.max-quantum" = 256; }; }; extraConfig.pipewire-pulse."92-low-latency" = { @@ -25,9 +25,9 @@ { name = "libpipewire-module-protocol-pulse"; args = { - pulse.min.req = "256/48000"; + pulse.min.req = "256/48000"; pulse.default.req = "256/48000"; - pulse.max.req = "256/48000"; + pulse.max.req = "256/48000"; pulse.min.quantum = "256/48000"; pulse.max.quantum = "256/48000"; }; @@ -36,5 +36,5 @@ }; }; }; - }; + }; } diff --git a/modules/work.nix b/modules/work.nix index b2e8f13..759b4dd 100644 --- a/modules/work.nix +++ b/modules/work.nix @@ -1,4 +1,4 @@ -{ den, inputs, lib, config, ... }: { +{ den, inputs, ... }: { den.aspects.work-specific.nixos = { pkgs, config, ... }: { imports = [ ./_hardware/work-hardware.nix @@ -41,24 +41,6 @@ __GLX_VENDOR_LIBRARY_NAME = "nvidia"; }; - security.sudo.wheelNeedsPassword = lib.mkForce true; - - networking.firewall = { - enable = true; - allowedTCPPorts = []; - allowedUDPPorts = []; - }; - - powerManagement.enable = true; - - services.tlp = { - enable = true; - settings = { - CPU_SCALING_GOVERNOR_ON_AC = "performance"; - CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - }; - }; - boot = { initrd.kernelModules = [ "amdgpu" ]; kernelModules = [ "kvm-amd" "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" ];