diff --git a/flake.lock b/flake.lock index e0c094a..4b0e61c 100644 --- a/flake.lock +++ b/flake.lock @@ -34,6 +34,22 @@ } }, "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, @@ -49,6 +65,24 @@ "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": [ @@ -56,11 +90,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -110,11 +144,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1724596623, - "narHash": "sha256-pLbNiAfpE8rW2e1Ih7Epi0LfyDmFv+UYU2BXg7Sj66U=", + "lastModified": 1724329681, + "narHash": "sha256-cwYetPD6aAnER0KTLw3l6SvNuprLcPC5AsZBIcOCELY=", "ref": "refs/heads/main", - "rev": "b672118f9238a48a18efd741cbcda387c5552238", - "revCount": 5136, + "rev": "f634b9e61af7dae0ca70379bd207eea45bb417d1", + "revCount": 5127, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -152,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": [ @@ -206,29 +215,6 @@ "type": "github" } }, - "hyprlang_2": { - "inputs": { - "hyprutils": "hyprutils_2", - "nixpkgs": [ - "xdg-desktop-portal-hyprland", - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1721324361, - "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -254,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": [ @@ -306,6 +265,26 @@ "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, @@ -323,6 +302,22 @@ } }, "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=", @@ -338,44 +333,28 @@ "type": "github" } }, - "nixpkgs_3": { - "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", - "nixpkgs": "nixpkgs_2", - "spicetify-nix": "spicetify-nix", - "xdg-desktop-portal-hyprland": "xdg-desktop-portal-hyprland" + "nix-minecraft": "nix-minecraft", + "nixpkgs": "nixpkgs_3", + "spicetify-nix": "spicetify-nix" } }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1724559309, - "narHash": "sha256-9y3yreHjQyyn8bIQmTx1ZkiNGgq1og/PDUZLiE96iJA=", + "lastModified": 1724386575, + "narHash": "sha256-BxhvQ5uX2W9oJ6f/lDuKmgiNVRusLN01mWhJogvHpak=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "8d823dea059ec5de57f276360acbd0601b20e433", + "rev": "0fc9765ae6e9dc0daaebf6549e5e14ff5acff498", "type": "github" }, "original": { @@ -401,52 +380,16 @@ }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", - "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" - } - }, - "xdg-desktop-portal-hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols_2", - "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_3", - "systems": "systems_3" - }, - "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", + "repo": "default", "type": "github" } }, diff --git a/flake.nix b/flake.nix index ebae861..b005030 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,6 @@ }; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - xdg-desktop-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland"; }; outputs = diff --git a/home-manager.nix b/home-manager.nix index 0baaafc..ba99bb9 100644 --- a/home-manager.nix +++ b/home-manager.nix @@ -127,15 +127,10 @@ ## Desktop environment cliphist grim - libsForQt5.ark mako slurp swww - # Mail client - thunderbird - protonmail-bridge-gui - ## Theming (nerdfonts.override { fonts = [ @@ -273,9 +268,7 @@ }; }; - # - ## THEMING # - # + ## Theming home.pointerCursor = { package = pkgs.catppuccin-cursors.frappeLavender; name = "catppuccin-frappe-lavender-cursors"; diff --git a/nixos.nix b/nixos.nix index 092e03e..bfee60c 100644 --- a/nixos.nix +++ b/nixos.nix @@ -6,7 +6,6 @@ config, pkgs, hyprland, - xdg-desktop-portal-hyprland, ... }: @@ -231,7 +230,7 @@ in enable = true; package = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - portalPackage = xdg-desktop-portal-hyprland.packages.${pkgs.stdenv.hostPlatform.system}.default; + portalPackage = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; }; # Enable XDG Desktop Portals. diff --git a/programs/gamemode.ini b/programs/gamemode.ini index b8fa758..4b76c17 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=reset +ioprio=0 ; Sets whether gamemode will inhibit the screensaver when active ; Defaults to 1 diff --git a/programs/obs-studio.nix b/programs/obs-studio.nix index 055ef5c..e6eaea1 100644 --- a/programs/obs-studio.nix +++ b/programs/obs-studio.nix @@ -6,7 +6,6 @@ plugins = with pkgs.obs-studio-plugins; [ input-overlay obs-backgroundremoval - obs-pipewire-audio-capture ]; }; } diff --git a/scripts/hyprland/start_services.sh b/scripts/hyprland/start_services.sh index fa597ef..cb11784 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. # @@ -56,8 +61,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; -}