From 3d28f81a56623967dafcfa34696ae6a16d137ccb Mon Sep 17 00:00:00 2001 From: cnst Date: Fri, 13 Dec 2024 21:13:11 +0100 Subject: [PATCH] small changes to polkit and other minor things --- flake.lock | 80 +++++++++---------- hosts/cnix/hardware-configuration.nix | 2 +- hosts/cnix/modules.nix | 7 +- hosts/cnixpad/modules.nix | 7 +- hosts/toothpc/modules.nix | 9 +-- modules/default.nix | 2 +- modules/home/programs/hyprland/startup.nix | 7 +- modules/home/programs/waybar/default.nix | 7 +- .../nixos/hardware/graphics/amd/default.nix | 1 + .../hardware/graphics/nvidia/default.nix | 1 + modules/nixos/hardware/network/default.nix | 13 --- modules/nixos/programs/misc/default.nix | 1 + .../services/polkit/default.nix | 19 ++--- users/cnst/modules.nix | 5 +- users/toothpick/modules.nix | 3 - 15 files changed, 73 insertions(+), 91 deletions(-) rename modules/{home => nixos}/services/polkit/default.nix (53%) diff --git a/flake.lock b/flake.lock index e7386ef6..3dc9f863 100644 --- a/flake.lock +++ b/flake.lock @@ -82,11 +82,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1733967201, - "narHash": "sha256-gfA/6BUhFmrfTMaTNToHm5Lm9c/snG7ED4W/x4vCGJs=", + "lastModified": 1734087975, + "narHash": "sha256-dQYXdA5zGKZ1G5HfPj9Gjf0JRGwXexl/dC9oZW5xOec=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "1559608a73a9211c7f78e7a0a8c13caca9f31006", + "rev": "1174e016e517f60a8cfe00f0a5785e4c8bd17b53", "type": "github" }, "original": { @@ -156,11 +156,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1733899011, - "narHash": "sha256-SpHdn/wQ1Y4YfpJ2WJBT+nFFMSDTtbQPtgFidonsiv0=", + "lastModified": 1734071760, + "narHash": "sha256-i5/1cvgahF0lvtRkg9aKlYr0SuE8hNO7xaqvdkc+qXE=", "owner": "nix-community", "repo": "fenix", - "rev": "24b76cc6d5bebb01947ae7a3e6ac894239abc7be", + "rev": "db0bcf236f561ebbac1204074757c26c53a3d63c", "type": "github" }, "original": { @@ -419,11 +419,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1733858674, - "narHash": "sha256-u5IFTMAd/z9xJLizanF+HPpYOppS+eLgsLgDr2oalL8=", + "lastModified": 1734059364, + "narHash": "sha256-tCMz/tgXOBhshFOfd2ED9e02TeK6tuElD/6rjnKU4Z4=", "owner": "helix-editor", "repo": "helix", - "rev": "89a7cde2f05fbf2eae212d9301301a8377432be5", + "rev": "ce133a2889956c5cc383be0725cdc78eb3277c05", "type": "github" }, "original": { @@ -439,11 +439,11 @@ ] }, "locked": { - "lastModified": 1733873195, - "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1732884235, - "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", + "lastModified": 1733873195, + "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", "owner": "nix-community", "repo": "home-manager", - "rev": "819f682269f4e002884702b87e445c82840c68f2", + "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", "type": "github" }, "original": { @@ -659,11 +659,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1733938069, - "narHash": "sha256-k2R2/rI4+A2bAyjCSwD//vCWZZnQcl38j/DiZzsNCHk=", + "lastModified": 1734005819, + "narHash": "sha256-hbA0aFybdxjpu4Tr4xH57mOLjRMqcop6iBVA0ZFIIx4=", "owner": "hyprwm", "repo": "hyprland", - "rev": "df956a0f6fbcfd7397b2d7b86883c0936c7795ec", + "rev": "aefaeedf5e3f773c923373795267c1633141566c", "type": "github" }, "original": { @@ -929,11 +929,11 @@ ] }, "locked": { - "lastModified": 1732739177, - "narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=", + "lastModified": 1733859890, + "narHash": "sha256-HnA6z2l2W38TJBarvWCcxjTjcpz7JrDj2u2umjYFcEo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8d7b2149e618696d5100c2683af1ffa893f02a75", + "rev": "77ffd839fd9d60d139dc4a2ad6b6d526f4ad5a17", "type": "github" }, "original": { @@ -1057,11 +1057,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1733821969, - "narHash": "sha256-JYAnT6hfRXdBNRCmhZa3XPFv19zbWXi8DDcY9AeNiQI=", + "lastModified": 1733968149, + "narHash": "sha256-ulxjvehU+KoMtLqxJSQJJu97X1eeXOlhKpGDeSR7IMo=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "89887483a47f9e7e849d43e5992f9da54b3e8e0e", + "rev": "43b9832ae7407054aa411d485e701b4a207ce6d3", "type": "github" }, "original": { @@ -1187,11 +1187,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -1266,11 +1266,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -1441,11 +1441,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1733864451, - "narHash": "sha256-gWigNPzzoi2i4sbolxPAAISTWCtNL09Mok5uRVo21kg=", + "lastModified": 1734023787, + "narHash": "sha256-0yBJIYIFNqwg2BuL0410jqdEulKcxnd54vINtzL3tAc=", "owner": "notashelf", "repo": "nvf", - "rev": "73660af2e36e9881c6cf7d82600950785b4cd51d", + "rev": "a0a57757a07941c5523e646f0a97176492704bd4", "type": "github" }, "original": { @@ -3427,11 +3427,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1733814336, - "narHash": "sha256-xKttEMfuf2hzcdiNQucxkvW2vCUe5e9HyfPntOcBSq0=", + "lastModified": 1734022706, + "narHash": "sha256-rIz8/rsTP5N7uLSyFbHZ+ink6EHBKkWFAQPkzhq7/YM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "7b4b83ba916800dfa4b4776790fdf6771c22f82e", + "rev": "9b2e72c40454012cbac8a1aa94d65931e3a7b881", "type": "github" }, "original": { @@ -3735,11 +3735,11 @@ ] }, "locked": { - "lastModified": 1733843154, - "narHash": "sha256-0Ym6ogpL5uOpDuBEEU6ecjT7Yw+Ak5LB51fxdq53VSI=", + "lastModified": 1733973541, + "narHash": "sha256-Reym14RITlg+BuoRY8VjBDmRiDzLGQDc0YHB2aGw3ME=", "ref": "refs/heads/main", - "rev": "af81082a9b35d977e6fccef9c6d6da65134164fd", - "revCount": 59, + "rev": "b8bbf8e474497be705e632172c6e60f669ce23a5", + "revCount": 60, "type": "git", "url": "https://git.sr.ht/~canasta/zen-browser-flake" }, diff --git a/hosts/cnix/hardware-configuration.nix b/hosts/cnix/hardware-configuration.nix index ec9a0a87..4a0d25a2 100644 --- a/hosts/cnix/hardware-configuration.nix +++ b/hosts/cnix/hardware-configuration.nix @@ -13,7 +13,7 @@ kernelModules = []; luks.devices."enc".device = "/dev/disk/by-uuid/1bda09f1-5b2c-4040-ab71-cee54a6df910"; }; - kernelModules = ["kvm-amd"]; + kernelModules = ["amdgpu"]; extraModulePackages = []; supportedFilesystems = ["btrfs"]; }; diff --git a/hosts/cnix/modules.nix b/hosts/cnix/modules.nix index 4e894b36..c48349d4 100644 --- a/hosts/cnix/modules.nix +++ b/hosts/cnix/modules.nix @@ -39,10 +39,6 @@ allowedTCPPorts = [22 80 443]; }; }; - nm-applet = { - enable = true; - indicator = true; - }; }; }; programs = { @@ -179,6 +175,9 @@ pipewire = { enable = true; }; + polkit = { + enable = true; + }; powerd = { enable = true; }; diff --git a/hosts/cnixpad/modules.nix b/hosts/cnixpad/modules.nix index 7562dfa3..c803567d 100644 --- a/hosts/cnixpad/modules.nix +++ b/hosts/cnixpad/modules.nix @@ -39,10 +39,6 @@ allowedTCPPorts = [22 80 443]; }; }; - nm-applet = { - enable = true; - indicator = true; - }; }; }; programs = { @@ -179,6 +175,9 @@ pipewire = { enable = true; }; + polkit = { + enable = true; + }; powerd = { enable = true; }; diff --git a/hosts/toothpc/modules.nix b/hosts/toothpc/modules.nix index 3fbd9278..5b84866c 100644 --- a/hosts/toothpc/modules.nix +++ b/hosts/toothpc/modules.nix @@ -5,7 +5,7 @@ extraBlacklistedModules = []; extraKernelParams = []; hardware = "nvidia"; - variant = "stable"; + variant = "latest"; }; loader = { default = { @@ -42,10 +42,6 @@ allowedTCPPorts = [22 80 443]; }; }; - nm-applet = { - enable = true; - indicator = true; - }; }; }; programs = { @@ -182,6 +178,9 @@ pipewire = { enable = true; }; + polkit = { + enable = true; + }; powerd = { enable = true; }; diff --git a/modules/default.nix b/modules/default.nix index 98a5dd48..04c68528 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -42,7 +42,6 @@ ./home/services/hypridle ./home/services/hyprpaper ./home/services/mako - ./home/services/polkit ./home/services/syncthing ./home/services/udiskie ./home/services/xdg @@ -98,6 +97,7 @@ ./nixos/services/openssh ./nixos/services/pcscd ./nixos/services/pipewire + ./nixos/services/polkit ./nixos/services/powerd ./nixos/services/samba ./nixos/services/scx diff --git a/modules/home/programs/hyprland/startup.nix b/modules/home/programs/hyprland/startup.nix index 7b7debdd..1a2a0683 100644 --- a/modules/home/programs/hyprland/startup.nix +++ b/modules/home/programs/hyprland/startup.nix @@ -28,7 +28,8 @@ in { "uwsm app -- blueman-applet" "uwsm app -- keepassxc" "uwsm app -- pamixer --set-volume 50" - "uwsm app -- solaar -w hide" + "uwsm app -- solaar -w hide -b regular" + "uwsm app -- nm-applet --indicator" ]; }) @@ -37,6 +38,7 @@ in { "uwsm app -- blueman-applet" "uwsm app -- keepassxc" "uwsm app -- pamixer --set-volume 50" + "uwsm app -- nm-applet --indicator" ]; }) @@ -44,7 +46,8 @@ in { wayland.windowManager.hyprland.settings.exec-once = [ "uwsm app -- mullvad-vpn" "uwsm app -- keepassxc" - "uwsm app -- solaar -w hide" + "uwsm app -- solaar -w hide -b regular" + "uwsm app -- nm-applet --indicator" ]; }) ]); diff --git a/modules/home/programs/waybar/default.nix b/modules/home/programs/waybar/default.nix index 335a2143..9e28192d 100644 --- a/modules/home/programs/waybar/default.nix +++ b/modules/home/programs/waybar/default.nix @@ -18,9 +18,10 @@ in { }; systemd.user.services.waybar = { - Unit.After = ["graphical-session.target"]; - Service.Slice = ["app-graphical.slice"]; - Unit.StartLimitBurst = 30; + Unit = { + StartLimitBurst = 30; + After = lib.mkForce "graphical-session.target"; + }; }; }; } diff --git a/modules/nixos/hardware/graphics/amd/default.nix b/modules/nixos/hardware/graphics/amd/default.nix index 855407f4..82de7231 100644 --- a/modules/nixos/hardware/graphics/amd/default.nix +++ b/modules/nixos/hardware/graphics/amd/default.nix @@ -95,6 +95,7 @@ in { wayland_git scx.rustscheds rocmPackages.rocm-smi + libGL ]; }) ]); diff --git a/modules/nixos/hardware/graphics/nvidia/default.nix b/modules/nixos/hardware/graphics/nvidia/default.nix index bc419530..a0334d76 100644 --- a/modules/nixos/hardware/graphics/nvidia/default.nix +++ b/modules/nixos/hardware/graphics/nvidia/default.nix @@ -32,6 +32,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ egl-wayland + libGL ]; hardware = { graphics = { diff --git a/modules/nixos/hardware/network/default.nix b/modules/nixos/hardware/network/default.nix index d3d4656f..71252cfa 100644 --- a/modules/nixos/hardware/network/default.nix +++ b/modules/nixos/hardware/network/default.nix @@ -27,14 +27,6 @@ in { default = {}; description = "Network interface configurations."; }; - nm-applet = { - enable = mkEnableOption "Enables the nm-applet service."; - indicator = mkOption { - type = types.bool; - default = false; - description = "Enables the nm-applet indicator."; - }; - }; }; }; @@ -59,10 +51,5 @@ in { wants = ["nftables.service"]; after = ["nftables.service"]; }; - - programs.nm-applet = { - enable = cfg.nm-applet.enable; - indicator = cfg.nm-applet.indicator; - }; }; } diff --git a/modules/nixos/programs/misc/default.nix b/modules/nixos/programs/misc/default.nix index 59b2cfc2..b520a4da 100644 --- a/modules/nixos/programs/misc/default.nix +++ b/modules/nixos/programs/misc/default.nix @@ -24,6 +24,7 @@ in { pkgs.nodejs_22 pkgs.tree pkgs.gnome-disk-utility + pkgs.networkmanagerapplet ] (mkIf cfg.desktop.enable [ pkgs.protonup diff --git a/modules/home/services/polkit/default.nix b/modules/nixos/services/polkit/default.nix similarity index 53% rename from modules/home/services/polkit/default.nix rename to modules/nixos/services/polkit/default.nix index 9d5b37f9..3177180f 100644 --- a/modules/home/services/polkit/default.nix +++ b/modules/nixos/services/polkit/default.nix @@ -5,28 +5,25 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.services.polkit; + cfg = config.nixos.services.polkit; in { options = { - home.services.polkit.enable = mkEnableOption "Enables polkit"; + nixos.services.polkit.enable = mkEnableOption "Enables polkit"; }; config = mkIf cfg.enable { systemd.user.services.polkit-gnome-authentication-agent-1 = { - Unit.Description = "polkit-gnome-authentication-agent-1"; - - Install = { - WantedBy = ["graphical-session.target"]; - # Wants = ["graphical-session.target"]; - # After = ["graphical-session.target"]; - }; - - Service = { + description = "polkit-gnome-authentication-agent-1"; + serviceConfig = { Type = "simple"; ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; Restart = "on-failure"; RestartSec = 1; TimeoutStopSec = 10; }; + + wantedBy = ["graphical-session.target"]; + wants = ["graphical-session.target"]; + after = ["graphical-session.target"]; }; }; } diff --git a/users/cnst/modules.nix b/users/cnst/modules.nix index 660f459a..2593d700 100644 --- a/users/cnst/modules.nix +++ b/users/cnst/modules.nix @@ -116,7 +116,7 @@ }; services = { blueman-applet = { - enable = true; + enable = false; }; copyq = { enable = false; @@ -141,9 +141,6 @@ mako = { enable = true; }; - polkit = { - enable = true; - }; syncthing = { enable = true; }; diff --git a/users/toothpick/modules.nix b/users/toothpick/modules.nix index 395fad56..9536bb30 100644 --- a/users/toothpick/modules.nix +++ b/users/toothpick/modules.nix @@ -126,9 +126,6 @@ mako = { enable = true; }; - polkit = { - enable = true; - }; syncthing = { enable = false; };