From 10ba8f587ddf63bcbb9fb246602201fdf0384594 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 01/10] polkit: properly enable it and enable gnome-keyring --- services/authentication.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 services/authentication.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 dc6a3ff2ad484c97c2fc6a60000b52f2c35cc543 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 02/10] 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 9f71fe932a1a6b6e9bd4d6ad280290605a7bedfe 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 03/10] 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 ebfb0d5b54ffebe78938dffab00071a548f8a9f7 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 04/10] 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 750b94fea1d4c9287aa22523abe8fb6e71451c59 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 05/10] 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 cb11784..fa597ef 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. # @@ -61,3 +56,8 @@ fcitx5 & # Start the blueman applet for managing bluetooth devices # blueman-applet & + +# +# Start the brige between Proton Mail and Thunderbird +# +protonmail-bridge-gui From 14ea84b526ac8aef3d07c65b2fbaafd72bbf6ea6 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Sun, 25 Aug 2024 18:09:03 -0300 Subject: [PATCH 06/10] gamemode: ioprio 0 -> reset --- programs/gamemode.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/gamemode.ini b/programs/gamemode.ini index 4b76c17..b8fa758 100644 --- a/programs/gamemode.ini +++ b/programs/gamemode.ini @@ -20,7 +20,7 @@ renice=0 ; between 0 and 7 here (with 0 being highest priority), or one of the special values ; "off" (to disable) or "reset" (to restore Linux default behavior based on CPU priority), ; currently, only the best-effort class is supported thus you cannot set it here -ioprio=0 +ioprio=reset ; Sets whether gamemode will inhibit the screensaver when active ; Defaults to 1 From 9ddc949fe25740d50eecc654d15347d5dd3e48fe Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Sun, 25 Aug 2024 18:09:26 -0300 Subject: [PATCH 07/10] obs: re-add obs-pipewire-audio-capture --- programs/obs-studio.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/obs-studio.nix b/programs/obs-studio.nix index e6eaea1..055ef5c 100644 --- a/programs/obs-studio.nix +++ b/programs/obs-studio.nix @@ -6,6 +6,7 @@ plugins = with pkgs.obs-studio-plugins; [ input-overlay obs-backgroundremoval + obs-pipewire-audio-capture ]; }; } From 216952179917edba57e69d28412dd0b535a06142 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Sun, 25 Aug 2024 18:10:02 -0300 Subject: [PATCH 08/10] hyprland: use git xdg-desktop-portal-hyprland --- flake.lock | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++--- flake.nix | 3 + nixos.nix | 3 +- 3 files changed, 156 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 4b0e61c..54320dc 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ ] }, "locked": { - "lastModified": 1723986931, - "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -144,11 +144,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1724329681, - "narHash": "sha256-cwYetPD6aAnER0KTLw3l6SvNuprLcPC5AsZBIcOCELY=", + "lastModified": 1724442134, + "narHash": "sha256-RpA3GmcBvd6DLssIWfYKdDfiumLv8w4KIhDaI+//6ls=", "ref": "refs/heads/main", - "rev": "f634b9e61af7dae0ca70379bd207eea45bb417d1", - "revCount": 5127, + "rev": "688fe5c14781c63a1db23d4d02bf239283068ff6", + "revCount": 5131, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -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/flake.nix b/flake.nix index b005030..153777d 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,9 @@ }; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + xdg-desktop-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland"; + + nix-minecraft.url = "github:Infinidoge/nix-minecraft"; }; outputs = diff --git a/nixos.nix b/nixos.nix index bfee60c..092e03e 100644 --- a/nixos.nix +++ b/nixos.nix @@ -6,6 +6,7 @@ config, pkgs, hyprland, + xdg-desktop-portal-hyprland, ... }: @@ -230,7 +231,7 @@ in enable = true; package = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - portalPackage = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; + portalPackage = xdg-desktop-portal-hyprland.packages.${pkgs.stdenv.hostPlatform.system}.default; }; # Enable XDG Desktop Portals. From 79dcee3fcfcc845f43d289b34f105787288b4f95 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Sun, 25 Aug 2024 18:42:16 -0300 Subject: [PATCH 09/10] sync: remove nix-minecraft --- flake.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/flake.nix b/flake.nix index 153777d..ebae861 100644 --- a/flake.nix +++ b/flake.nix @@ -16,8 +16,6 @@ hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; xdg-desktop-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland"; - - nix-minecraft.url = "github:Infinidoge/nix-minecraft"; }; outputs = From c156f85522c60d3c3012d60d8c3cd52ef3541ea7 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Sun, 25 Aug 2024 18:42:20 -0300 Subject: [PATCH 10/10] flake: update --- flake.lock | 122 ++++++++--------------------------------------------- 1 file changed, 18 insertions(+), 104 deletions(-) diff --git a/flake.lock b/flake.lock index 54320dc..e0c094a 100644 --- a/flake.lock +++ b/flake.lock @@ -34,22 +34,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -65,24 +49,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -144,11 +110,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1724442134, - "narHash": "sha256-RpA3GmcBvd6DLssIWfYKdDfiumLv8w4KIhDaI+//6ls=", + "lastModified": 1724596623, + "narHash": "sha256-pLbNiAfpE8rW2e1Ih7Epi0LfyDmFv+UYU2BXg7Sj66U=", "ref": "refs/heads/main", - "rev": "688fe5c14781c63a1db23d4d02bf239283068ff6", - "revCount": 5131, + "rev": "b672118f9238a48a18efd741cbcda387c5552238", + "revCount": 5136, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -247,7 +213,7 @@ "xdg-desktop-portal-hyprland", "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1721324361, @@ -340,26 +306,6 @@ "type": "github" } }, - "nix-minecraft": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1724377000, - "narHash": "sha256-TITxaXuhO8vDScZoE7i7E2BTXoJzZmKTk6qRkmI2d+o=", - "owner": "Infinidoge", - "repo": "nix-minecraft", - "rev": "b464de49b4d6ea8faf1988e02fc59c4908a7ff91", - "type": "github" - }, - "original": { - "owner": "Infinidoge", - "repo": "nix-minecraft", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1724224976, @@ -377,22 +323,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1724224976, "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", @@ -408,7 +338,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1722062969, "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", @@ -428,25 +358,24 @@ "inputs": { "home-manager": "home-manager", "hyprland": "hyprland", - "nix-minecraft": "nix-minecraft", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "spicetify-nix": "spicetify-nix", "xdg-desktop-portal-hyprland": "xdg-desktop-portal-hyprland" } }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1724386575, - "narHash": "sha256-BxhvQ5uX2W9oJ6f/lDuKmgiNVRusLN01mWhJogvHpak=", + "lastModified": 1724559309, + "narHash": "sha256-9y3yreHjQyyn8bIQmTx1ZkiNGgq1og/PDUZLiE96iJA=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "0fc9765ae6e9dc0daaebf6549e5e14ff5acff498", + "rev": "8d823dea059ec5de57f276360acbd0601b20e433", "type": "github" }, "original": { @@ -472,16 +401,16 @@ }, "systems_2": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -500,27 +429,12 @@ "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" + "nixpkgs": "nixpkgs_3", + "systems": "systems_3" }, "locked": { "lastModified": 1724073926,