From 7bc9c6ba5238593e5f596505f47ebd9d34d297f7 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Fri, 23 Aug 2024 20:50:19 -0300 Subject: [PATCH 1/7] flake: update --- flake.lock | 145 +---------------------------------------------------- 1 file changed, 1 insertion(+), 144 deletions(-) diff --git a/flake.lock b/flake.lock index 1481241..4b0e61c 100644 --- a/flake.lock +++ b/flake.lock @@ -186,31 +186,6 @@ "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": [ @@ -240,29 +215,6 @@ "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": [ @@ -288,33 +240,6 @@ "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": [ @@ -408,30 +333,13 @@ "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", - "xdg-desktop-portal-hyprland": "xdg-desktop-portal-hyprland" + "spicetify-nix": "spicetify-nix" } }, "spicetify-nix": { @@ -485,57 +393,6 @@ "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", From 11783be6376599c771245a233e72deeb61c494a6 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Fri, 23 Aug 2024 20:50:44 -0300 Subject: [PATCH 2/7] polkit: remove kde agent --- home-manager.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager.nix b/home-manager.nix index 4627a18..ba99bb9 100644 --- a/home-manager.nix +++ b/home-manager.nix @@ -128,7 +128,6 @@ cliphist grim mako - polkit-kde-agent slurp swww From 831faf129600ae13642cb53d6640f66e10178f12 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Fri, 23 Aug 2024 20:51:05 -0300 Subject: [PATCH 3/7] polkit: properly enable it and enable gnome-keyring --- nixos.nix | 1 + services/authentication.nix | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 services/authentication.nix diff --git a/nixos.nix b/nixos.nix index 93c53c1..e4c2b77 100644 --- a/nixos.nix +++ b/nixos.nix @@ -22,6 +22,7 @@ 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/services/authentication.nix b/services/authentication.nix new file mode 100644 index 0000000..94797f5 --- /dev/null +++ b/services/authentication.nix @@ -0,0 +1,12 @@ +{ 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; +} From 367b0d7b58f0044a3f4ab64e67827f82f22ce0de Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Fri, 23 Aug 2024 20:51:21 -0300 Subject: [PATCH 4/7] hm: add thunderbird and protonmail-bridge-gui --- home-manager.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager.nix b/home-manager.nix index ba99bb9..177a56d 100644 --- a/home-manager.nix +++ b/home-manager.nix @@ -131,6 +131,10 @@ slurp swww + # Mail client + thunderbird + protonmail-bridge-gui + ## Theming (nerdfonts.override { fonts = [ From 7fb68d945a9f30cbe444a77f6b27923f06b2248b Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Fri, 23 Aug 2024 20:51:32 -0300 Subject: [PATCH 5/7] hm: adjust theming section header --- home-manager.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home-manager.nix b/home-manager.nix index 177a56d..d1f05a1 100644 --- a/home-manager.nix +++ b/home-manager.nix @@ -272,7 +272,9 @@ }; }; - ## Theming + # + ## THEMING # + # home.pointerCursor = { package = pkgs.catppuccin-cursors.frappeLavender; name = "catppuccin-frappe-lavender-cursors"; From 1f2b67f9bd6635bdb6b20c0eb6ea26a08a451e94 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Fri, 23 Aug 2024 20:51:40 -0300 Subject: [PATCH 6/7] hm: add ark package for thunar --- home-manager.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager.nix b/home-manager.nix index d1f05a1..0baaafc 100644 --- a/home-manager.nix +++ b/home-manager.nix @@ -127,6 +127,7 @@ ## Desktop environment cliphist grim + libsForQt5.ark mako slurp swww From 6c23d64d82457290aafcfbd04e2ddc901af10879 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Fri, 23 Aug 2024 20:52:00 -0300 Subject: [PATCH 7/7] hyprland: start protonmail-bridge-gui with the wm --- scripts/hyprland/start_services.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/hyprland/start_services.sh b/scripts/hyprland/start_services.sh index 78453a0..024ecbc 100755 --- a/scripts/hyprland/start_services.sh +++ b/scripts/hyprland/start_services.sh @@ -5,11 +5,6 @@ # 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. # @@ -65,3 +60,8 @@ fcitx5 & # Start the blueman applet for managing bluetooth devices # blueman-applet & + +# +# Start the brige between Proton Mail and Thunderbird +# +protonmail-bridge-gui