From 7518153d87231a4920ca0a2ae2c5ff6e00fc780a Mon Sep 17 00:00:00 2001 From: cnst Date: Tue, 29 Jul 2025 21:24:53 +0200 Subject: [PATCH] flake lock and fixes to toothpick --- flake.lock | 42 ++++++++++----------- hosts/kima/modules.nix | 7 +++- hosts/kima/settings.nix | 2 +- modules/default.nix | 1 + modules/nixos/boot/kernel/security.nix | 5 +-- modules/nixos/hardware/graphics/default.nix | 2 - modules/nixos/programs/hyprland/default.nix | 2 +- modules/nixos/services/dbus/default.nix | 1 + modules/nixos/services/psd/default.nix | 18 +++++++++ users/toothpick/modules/default.nix | 1 - users/toothpick/modules/options.nix | 18 --------- 11 files changed, 49 insertions(+), 50 deletions(-) create mode 100644 modules/nixos/services/psd/default.nix delete mode 100644 users/toothpick/modules/options.nix diff --git a/flake.lock b/flake.lock index 1a5f8578..573462b3 100644 --- a/flake.lock +++ b/flake.lock @@ -183,11 +183,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1753685071, - "narHash": "sha256-hf+A5F4yyCisGPN4SvTpO0EkE0dQsp5gwRtRHUs46oY=", + "lastModified": 1753771482, + "narHash": "sha256-7WnYHGi5xT4PCacjM/UVp+k4ZYIIXwCf6CjVqgUnGTQ=", "owner": "nix-community", "repo": "fenix", - "rev": "b3b3e0da43a02ef1e40f4cfe485af70176e6f2e5", + "rev": "8b6da138fb7baefa04a4284c63b2abefdfbd2c6d", "type": "github" }, "original": { @@ -501,11 +501,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1753743762, - "narHash": "sha256-lB5sCJW16WaX+h++uKXDktEBvcv0ZsGBOUaFNwW3WUk=", + "lastModified": 1753800056, + "narHash": "sha256-m3Me2ksbMPsC5HBmetqTpix3tLgJlwMdcMi+XiRpcxo=", "owner": "helix-editor", "repo": "helix", - "rev": "2d5a19f081da1d04607681fe77bbc62a0e84727c", + "rev": "f0be627dcb5b9f780a4bfa6ae012370d7c41d3be", "type": "github" }, "original": { @@ -521,11 +521,11 @@ ] }, "locked": { - "lastModified": 1753761827, - "narHash": "sha256-mrVNT+aF4yR8P8Fx570W2vz+LzukSlf68Yr2YhUJHjo=", + "lastModified": 1753812716, + "narHash": "sha256-OjnjoalP00CyV34zg6T+Un2QoYiHCdRvMbqrweopyyY=", "owner": "nix-community", "repo": "home-manager", - "rev": "50adf8fcaa97c9d64309f2d507ed8be54ea23110", + "rev": "2f588d275ebd8243be6c29e7bf3ec7409baa0aa7", "type": "github" }, "original": { @@ -714,11 +714,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1753733285, - "narHash": "sha256-zEDgKVrDNUxtGCTzNcBjVkeqGazTNXX/fd1zJ/8qApE=", + "lastModified": 1753804949, + "narHash": "sha256-wFobkz11wfdGwi670qN132XQmt2QzgOoQCvujOn6uZ0=", "owner": "hyprwm", "repo": "hyprland", - "rev": "abe29647ae9cf2e6bd40784790b3d99fcc962613", + "rev": "f51be7f20109cd8eae87db96641aead843a3ef0b", "type": "github" }, "original": { @@ -917,11 +917,11 @@ ] }, "locked": { - "lastModified": 1753461596, - "narHash": "sha256-Td+W8vHCCLtYQWPDVESNxk5fgzQawBmkqCS/4noNDiI=", + "lastModified": 1753794465, + "narHash": "sha256-6IowSKLUAjaPgiSgQ3E/8AMpeAi8Xk5pk+0qeG/PblE=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "1e5e62d6e31de0d2610ade4a424d4b696d137a78", + "rev": "71691634e4ba32017325d92eb1870b32f63d9189", "type": "github" }, "original": { @@ -1250,11 +1250,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1753549186, - "narHash": "sha256-Znl7rzuxKg/Mdm6AhimcKynM7V3YeNDIcLjBuoBcmNs=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17f6bd177404d6d43017595c5264756764444ab8", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { @@ -1509,11 +1509,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1753651982, - "narHash": "sha256-RzsKuX6BQntFOhvqbstzOtzkOv0lkW4l8SYu6ffTf74=", + "lastModified": 1753724566, + "narHash": "sha256-DolKhpXhoehwLX+K/4xRRIeppnJHgKk6xWJdqn/vM6w=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "db02cdc7fc8b0e0b9aa1be4110a74620bbac1f98", + "rev": "511c999bea1c3c129b8eba713bb9b809a9003d00", "type": "github" }, "original": { diff --git a/hosts/kima/modules.nix b/hosts/kima/modules.nix index f435988c..fbc9b018 100644 --- a/hosts/kima/modules.nix +++ b/hosts/kima/modules.nix @@ -4,7 +4,7 @@ kernel = { variant = "latest"; hardware = ["amd"]; - extraKernelParams = []; + extraKernelParams = ["fbcon=rotate:1"]; }; loader = { default = { @@ -165,7 +165,7 @@ enable = true; }; gnome-keyring = { - enable = true; + enable = false; }; greetd = { enable = true; @@ -206,6 +206,9 @@ powerd = { enable = false; }; + psd = { + enable = true; + }; samba = { enable = false; }; diff --git a/hosts/kima/settings.nix b/hosts/kima/settings.nix index 4f817a36..290f2060 100644 --- a/hosts/kima/settings.nix +++ b/hosts/kima/settings.nix @@ -22,7 +22,7 @@ height = 1080; refreshRate = 60; position = "2560x0"; - # transform = 3; + transform = 3; workspace = "5"; } { diff --git a/modules/default.nix b/modules/default.nix index 409279e7..e40daa45 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -107,6 +107,7 @@ ./nixos/services/pipewire ./nixos/services/polkit ./nixos/services/powerd + ./nixos/services/psd ./nixos/services/samba ./nixos/services/scx ./nixos/services/udisks diff --git a/modules/nixos/boot/kernel/security.nix b/modules/nixos/boot/kernel/security.nix index dbd3118f..4c73dbc1 100644 --- a/modules/nixos/boot/kernel/security.nix +++ b/modules/nixos/boot/kernel/security.nix @@ -44,13 +44,10 @@ boot.kernelModules = ["tcp_bbr"]; security = { - # allow wayland lockers to unlock the screen - pam.services.hyprlock.text = "auth include login"; + # pam.services.hyprlock.text = "auth include login"; - # userland niceness rtkit.enable = true; - # don't ask for password for wheel group sudo.wheelNeedsPassword = false; }; } diff --git a/modules/nixos/hardware/graphics/default.nix b/modules/nixos/hardware/graphics/default.nix index 9fc8f724..80e76e1e 100644 --- a/modules/nixos/hardware/graphics/default.nix +++ b/modules/nixos/hardware/graphics/default.nix @@ -12,7 +12,6 @@ libva vaapiVdpau libvdpau-va-gl - libGL ]; commonPackages32 = with pkgs.pkgsi686Linux; [ @@ -32,7 +31,6 @@ vulkan-tools wayland wayland-protocols - libGL ]; nvidiaOffloadScript = pkgs.writeShellScriptBin "nvidia-offload" '' diff --git a/modules/nixos/programs/hyprland/default.nix b/modules/nixos/programs/hyprland/default.nix index 3c097f1b..afdd3590 100644 --- a/modules/nixos/programs/hyprland/default.nix +++ b/modules/nixos/programs/hyprland/default.nix @@ -32,7 +32,7 @@ in { programs.hyprland = { enable = true; - # package = pkgs.hyprland; + package = pkgs.hyprland; withUWSM = true; }; environment.variables.NIXOS_OZONE_WL = "1"; diff --git a/modules/nixos/services/dbus/default.nix b/modules/nixos/services/dbus/default.nix index 2c722ff1..ad156956 100644 --- a/modules/nixos/services/dbus/default.nix +++ b/modules/nixos/services/dbus/default.nix @@ -13,6 +13,7 @@ in { config = mkIf cfg.enable { services.dbus = { enable = true; + implementation = "broker"; packages = with pkgs; [ gcr ]; diff --git a/modules/nixos/services/psd/default.nix b/modules/nixos/services/psd/default.nix new file mode 100644 index 00000000..0b405e72 --- /dev/null +++ b/modules/nixos/services/psd/default.nix @@ -0,0 +1,18 @@ +{ + config, + lib, + ... +}: let + inherit (lib) mkIf mkEnableOption; + cfg = config.nixos.services.psd; +in { + options = { + nixos.services.psd.enable = mkEnableOption "Enables Profile Sync Daemon"; + }; + config = mkIf cfg.enable { + services.psd = { + enable = true; + resyncTimer = "10m"; + }; + }; +} diff --git a/users/toothpick/modules/default.nix b/users/toothpick/modules/default.nix index 93ae831c..86de83fe 100644 --- a/users/toothpick/modules/default.nix +++ b/users/toothpick/modules/default.nix @@ -1,6 +1,5 @@ { imports = [ ./home.nix - ./options.nix ]; } diff --git a/users/toothpick/modules/options.nix b/users/toothpick/modules/options.nix deleted file mode 100644 index 5d8834cb..00000000 --- a/users/toothpick/modules/options.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - monitors = [ - { - name = "DVI-D-1"; - width = 1920; - height = 1080; - refreshRate = 144; - workspace = "1"; - primary = true; - } - ]; - theme = { - background = { - lockscreen = "wallpaper_2"; - desktop = "wallpaper_1"; - }; - }; -}