diff --git a/flake.lock b/flake.lock index 4b0e61c..1481241 100644 --- a/flake.lock +++ b/flake.lock @@ -186,6 +186,31 @@ "type": "github" } }, + "hyprland-protocols_2": { + "inputs": { + "nixpkgs": [ + "xdg-desktop-portal-hyprland", + "nixpkgs" + ], + "systems": [ + "xdg-desktop-portal-hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1721326555, + "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -215,6 +240,29 @@ "type": "github" } }, + "hyprlang_2": { + "inputs": { + "hyprutils": "hyprutils_2", + "nixpkgs": [ + "xdg-desktop-portal-hyprland", + "nixpkgs" + ], + "systems": "systems_3" + }, + "locked": { + "lastModified": 1721324361, + "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -240,6 +288,33 @@ "type": "github" } }, + "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "xdg-desktop-portal-hyprland", + "hyprlang", + "nixpkgs" + ], + "systems": [ + "xdg-desktop-portal-hyprland", + "hyprlang", + "systems" + ] + }, + "locked": { + "lastModified": 1721324102, + "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "962582a090bc233c4de9d9897f46794280288989", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -333,13 +408,30 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1722062969, + "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", "hyprland": "hyprland", "nix-minecraft": "nix-minecraft", "nixpkgs": "nixpkgs_3", - "spicetify-nix": "spicetify-nix" + "spicetify-nix": "spicetify-nix", + "xdg-desktop-portal-hyprland": "xdg-desktop-portal-hyprland" } }, "spicetify-nix": { @@ -393,6 +485,57 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "xdg-desktop-portal-hyprland": { + "inputs": { + "hyprland-protocols": "hyprland-protocols_2", + "hyprlang": "hyprlang_2", + "nixpkgs": "nixpkgs_4", + "systems": "systems_4" + }, + "locked": { + "lastModified": 1724073926, + "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "a08ecbbf33598924e93542f737fc6169a26b481e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols", diff --git a/home-manager.nix b/home-manager.nix index 0baaafc..4627a18 100644 --- a/home-manager.nix +++ b/home-manager.nix @@ -127,15 +127,11 @@ ## Desktop environment cliphist grim - libsForQt5.ark mako + polkit-kde-agent slurp swww - # Mail client - thunderbird - protonmail-bridge-gui - ## Theming (nerdfonts.override { fonts = [ @@ -273,9 +269,7 @@ }; }; - # - ## THEMING # - # + ## Theming home.pointerCursor = { package = pkgs.catppuccin-cursors.frappeLavender; name = "catppuccin-frappe-lavender-cursors"; diff --git a/nixos.nix b/nixos.nix index e4c2b77..93c53c1 100644 --- a/nixos.nix +++ b/nixos.nix @@ -22,7 +22,6 @@ in ./hardware-configuration.nix # Include service configuration ./services/archi.nix - ./services/authentication.nix ./services/caddy.nix ./services/forgejo.nix ./services/jellyfin.nix diff --git a/scripts/hyprland/start_services.sh b/scripts/hyprland/start_services.sh index 024ecbc..78453a0 100755 --- a/scripts/hyprland/start_services.sh +++ b/scripts/hyprland/start_services.sh @@ -5,6 +5,11 @@ # dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP & +# +# Start authentication polkit. +# +/nix/store/$(ls -la /nix/store | rg '^d.*polkit-kde-agent.*\d$' | awk '{print $9}')/libexec/polkit-kde-authentication-agent-1 & + # # Start waybar. # @@ -60,8 +65,3 @@ fcitx5 & # Start the blueman applet for managing bluetooth devices # blueman-applet & - -# -# Start the brige between Proton Mail and Thunderbird -# -protonmail-bridge-gui diff --git a/services/authentication.nix b/services/authentication.nix deleted file mode 100644 index 94797f5..0000000 --- a/services/authentication.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: - -{ - # Enable polkit, - security.polkit.enable = true; - - # Install an agent to interface with it. - environment.systemPackages = with pkgs; [ polkit_gnome ]; - - # And enable GNOME keyring for registering keys. - services.gnome.gnome-keyring.enable = true; -}