KeksNino/nixos-conf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix xdg-desktop-portal by applying nixpkgs pr

Browse Source
This commit is contained in:
KeksNino
2026-08-06 19:24:17 +02:00
parent 63070a33c4
commit 015a78fe35
5 changed files with 105 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+74 -58
View File
@@ -39,7 +39,9 @@
}, },
"bcdl-free": { "bcdl-free": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1785350661, "lastModified": 1785350661,
@@ -212,11 +214,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1785531816, "lastModified": 1785958398,
"narHash": "sha256-vkMnV0JIyw+g/NmcfoajlGaAO+9a0ezia+FZohQJrik=", "narHash": "sha256-5r/JgsoNMTx+qIh83WkxpujEKBR7PF5ssnh5vYCuSAw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bf9ce9fec78f95f374e8dd3b503863a3ec128ebe", "rev": "a7c70cc290290f373f50cd820403833d250459ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -233,11 +235,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1783963347, "lastModified": 1785531816,
"narHash": "sha256-r376E2XpakiXwModDHIxlvB6qLq4iFVEq730vxOO4JY=", "narHash": "sha256-vkMnV0JIyw+g/NmcfoajlGaAO+9a0ezia+FZohQJrik=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a45a7c451455a51ae740ec3bce4024b312809c29", "rev": "bf9ce9fec78f95f374e8dd3b503863a3ec128ebe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -321,7 +323,7 @@
"hyprutils": "hyprutils", "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"hyprwire": "hyprwire", "hyprwire": "hyprwire",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"systems": "systems_2", "systems": "systems_2",
"xdph": "xdph" "xdph": "xdph"
@@ -455,7 +457,7 @@
"hyprsplit": { "hyprsplit": {
"inputs": { "inputs": {
"hyprland": "hyprland", "hyprland": "hyprland",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1781205112, "lastModified": 1781205112,
@@ -619,15 +621,15 @@
"millennium": { "millennium": {
"inputs": { "inputs": {
"millennium-src": "millennium-src", "millennium-src": "millennium-src",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"dir": "packages/nix", "dir": "packages/nix",
"lastModified": 1785163789, "lastModified": 1785944047,
"narHash": "sha256-nHTGaYBPKqOY4SPTqRJNX8MfV/GuIjgPCUxDHHeinGc=", "narHash": "sha256-5J7dUkGh2cxuAuwalNnNoX1NvuFGkqiGYDU5gg4tkHE=",
"owner": "SteamClientHomebrew", "owner": "SteamClientHomebrew",
"repo": "Millennium", "repo": "Millennium",
"rev": "1375ceda332171907e64e9a9324f9a869f715d6c", "rev": "1b61200b88b7479f8f9c1788364092f2cf270b20",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -672,15 +674,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1785698632, "lastModified": 1778443072,
"narHash": "sha256-wIfKcnvpkHUQBdR/aokjRO9T/L9gzNKYcVR6Qu7Rmzk=", "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5b04e91630b267d6493a88e634bc235cdaad2720", "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -700,23 +703,34 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs-patch-xdg-desktop-portal": {
"flake": false,
"locked": { "locked": {
"lastModified": 1778443072, "narHash": "sha256-9aKeHOkIAHkPU5jptkaJUD10qbP0rqhjkfsSdvFXN3g=",
"narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", "type": "file",
"owner": "NixOS", "url": "https://github.com/NixOS/nixpkgs/pull/548762.diff"
"repo": "nixpkgs", },
"rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", "original": {
"type": "file",
"url": "https://github.com/NixOS/nixpkgs/pull/548762.diff"
}
},
"nixpkgs-patcher": {
"locked": {
"lastModified": 1781789965,
"narHash": "sha256-ZRlWPq2Qms6KbesJrj7cUe2GN7s8BZISfp9ZbrCi2x0=",
"owner": "gepbird",
"repo": "nixpkgs-patcher",
"rev": "d2abed2b94b7955e05b4e2e8a9b8ac45597ecf94",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "gepbird",
"ref": "nixos-unstable", "repo": "nixpkgs-patcher",
"repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1778869304, "lastModified": 1778869304,
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
@@ -732,7 +746,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1781577229, "lastModified": 1781577229,
"narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
@@ -748,13 +762,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1785698632, "lastModified": 1785971067,
"narHash": "sha256-wIfKcnvpkHUQBdR/aokjRO9T/L9gzNKYcVR6Qu7Rmzk=", "narHash": "sha256-fEVOOBW0RQ8OyIMhemdnglUYIdeBP5O9GwD2xlgprzs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5b04e91630b267d6493a88e634bc235cdaad2720", "rev": "66b7412b208c2bdee25124755a7b45f06d7971c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -763,7 +777,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1784555310, "lastModified": 1784555310,
"narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=", "narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=",
@@ -779,7 +793,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1767026758, "lastModified": 1767026758,
"narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=",
@@ -795,7 +809,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1783279667, "lastModified": 1783279667,
"narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=",
@@ -811,13 +825,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1784007870, "lastModified": 1785454630,
"narHash": "sha256-djcLt/JJphyNt4eDY9XTly+/WbCK5lqWq9lSgCmJkkQ=", "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "18b9261cb3294b6d2a06d03f96872827b8fe2698", "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -830,15 +844,15 @@
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_5",
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1785527278, "lastModified": 1785763201,
"narHash": "sha256-rYFSM491MFFA1V6oax5PngXbevGt6n0o8sKhwFoItE0=", "narHash": "sha256-wA373y/B9orM3HatLu9oS+Ke5lmdZyBl/bdjd2gLMq4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "a19efae6c1afe426e8243d79f6dfbab186be6df8", "rev": "c7be49306b23a952c0151cf4bbeacd944ed82f2a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -879,7 +893,9 @@
"hyprsplit": "hyprsplit", "hyprsplit": "hyprsplit",
"millennium": "millennium", "millennium": "millennium",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"nixpkgs-patch-xdg-desktop-portal": "nixpkgs-patch-xdg-desktop-portal",
"nixpkgs-patcher": "nixpkgs-patcher",
"nixvim": "nixvim", "nixvim": "nixvim",
"sls-steam": "sls-steam", "sls-steam": "sls-steam",
"xremap-flake": "xremap-flake", "xremap-flake": "xremap-flake",
@@ -915,11 +931,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1785594941, "lastModified": 1785830347,
"narHash": "sha256-hnbTg0PQYnQx9w/UxVxXRF26srIrSUKVE6rO/uQ/nSo=", "narHash": "sha256-LA56VXRcymN7w9lcDIkgnVTYf1nmb8scPGfTQ6tlHpU=",
"owner": "AceSLS", "owner": "AceSLS",
"repo": "SLSsteam", "repo": "SLSsteam",
"rev": "7cf66365ea533d9fa1ee642a451fbff3f65f4200", "rev": "a1b30e8183651a6d3a016365b18d8893964af7cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1057,15 +1073,15 @@
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_6",
"xremap": "xremap" "xremap": "xremap"
}, },
"locked": { "locked": {
"lastModified": 1782757039, "lastModified": 1785858454,
"narHash": "sha256-4CuFwWsQxoNY4Cxz4+GVEmRrMTR5dUOTKN2eNk1KiEI=", "narHash": "sha256-hMJE6NyEVGbGFiYkUMH/0z9DedcmB0oSMamlvlljWdM=",
"owner": "xremap", "owner": "xremap",
"repo": "nix-flake", "repo": "nix-flake",
"rev": "7f161bede2961279dfde194add6aa53d80a9d26d", "rev": "abbd07e92837c797ae1b98a1ff2c95fc805fe7b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1077,15 +1093,15 @@
"yazi": { "yazi": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_7",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1785650918, "lastModified": 1785901437,
"narHash": "sha256-MicAaPMrueLTI2D2HmXttbhTHeHW3wBIGnYzzueOg68=", "narHash": "sha256-t+gpoQMePLd2YWvvGV8ervuWVdza38I+CNkb2rrBL7U=",
"owner": "sxyazi", "owner": "sxyazi",
"repo": "yazi", "repo": "yazi",
"rev": "bfa01e56da0b7ab63161bd9605cb77000e864603", "rev": "689e0e3319aa1ce3fd73d29e2e96cc538488392c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1097,14 +1113,14 @@
"zen-browser": { "zen-browser": {
"inputs": { "inputs": {
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1785652409, "lastModified": 1785915548,
"narHash": "sha256-0273OvIPfkJcdv0+Z3iPL8+eSRavAwGRCnr+Y6tRjYY=", "narHash": "sha256-uF+QIxu7hhxKgzh7ai2uWVmeiqJYDC1C4fJ4P/IFZ/k=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "12224626d0d1cead79603f19601666360c715379", "rev": "a7504841b8869ef5950c1b71f062ca51ca724a02",
"type": "github" "type": "github"
}, },
"original": { "original": {
flake.nix
+15 -5
View File
@@ -17,10 +17,18 @@
xremap-flake.url = "github:xremap/nix-flake"; xremap-flake.url = "github:xremap/nix-flake";
yazi.url = "github:sxyazi/yazi"; yazi.url = "github:sxyazi/yazi";
millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix";
bcdl-free.url = "git+https://git.pizzasucht.net/KeksNino/free-bandcamp-downloader"; bcdl-free = {
url = "git+https://git.pizzasucht.net/KeksNino/free-bandcamp-downloader";
inputs.nixpkgs.follows = "nixpkgs";
};
nixvim.url = "github:nix-community/nixvim"; nixvim.url = "github:nix-community/nixvim";
hyprsplit.url = "github:shezdy/hyprsplit"; hyprsplit.url = "github:shezdy/hyprsplit";
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
nixpkgs-patcher.url = "github:gepbird/nixpkgs-patcher";
nixpkgs-patch-xdg-desktop-portal = {
url = "https://github.com/NixOS/nixpkgs/pull/548762.diff";
flake = false;
};
}; };
outputs = outputs =
@@ -37,23 +45,25 @@
nixvim, nixvim,
hyprsplit, hyprsplit,
nix-flatpak, nix-flatpak,
nixpkgs-patcher,
... ...
}@inputs: }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
in in
{ {
nixosConfigurations.nixos-desktop = nixpkgs.lib.nixosSystem { nixosConfigurations.nixos-desktop = nixpkgs-patcher.lib.nixosSystem {
specialArgs = { specialArgs = {
inherit inherit system;
inherit (inputs)
sls-steam sls-steam
bcdl-free bcdl-free
xremap-flake xremap-flake
system
nixvim nixvim
nix-flatpak nix-flatpak
; ;
}; };
nixpkgsPatcher.inputs = inputs;
modules = [ modules = [
./hosts/desktop/configuration.nix ./hosts/desktop/configuration.nix
./hosts/desktop/hardware-configuration.nix ./hosts/desktop/hardware-configuration.nix
@@ -64,8 +74,8 @@
gsr-ui.nixosModules.default gsr-ui.nixosModules.default
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
yazi.overlays.default
millennium.overlays.default millennium.overlays.default
yazi.overlays.default
]; ];
home-manager.users.user = import ./hosts/desktop/home-manager/home.nix; home-manager.users.user = import ./hosts/desktop/home-manager/home.nix;
hosts/desktop/configuration.nix
+5 -1
View File
@@ -169,7 +169,7 @@ in
programs.steam = { programs.steam = {
enable = true; enable = true;
extraCompatPackages = with pkgs; [ proton-ge-bin ]; extraCompatPackages = with pkgs; [ proton-ge-bin ];
package = pkgs.millennium-steam.override { package = pkgs.steam.override {
extraEnv = { extraEnv = {
LD_AUDIT = "${sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam}/library-inject.so:${ LD_AUDIT = "${sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam}/library-inject.so:${
sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam
@@ -192,6 +192,10 @@ in
libx11 # libX11.so.6 libx11 # libX11.so.6
wayland wayland
krb5 krb5
qt6.qtdeclarative
qt6.qtbase
qt6.qtwayland
brotli
]); ]);
}; };
hosts/desktop/home-manager/programs.nix
+7
View File
@@ -15,6 +15,10 @@
programs.distrobox.enable = true; programs.distrobox.enable = true;
services.podman.enable = true; services.podman.enable = true;
programs.distrobox.settings = {
container_user_custom_home = "$HOME/distrobox";
};
programs.rofi.enable = true; programs.rofi.enable = true;
programs.rofi.plugins = [ pkgs.rofi-calc ]; programs.rofi.plugins = [ pkgs.rofi-calc ];
@@ -38,9 +42,12 @@
programs.imv.enable = true; programs.imv.enable = true;
programs.aria2.enable = true; programs.aria2.enable = true;
programs.ripgrep.enable = true; programs.ripgrep.enable = true;
programs.librewolf.enable = true;
programs.pywal = { programs.pywal = {
enable = true; enable = true;
package = pkgs.pywal16; package = pkgs.pywal16;
}; };
programs.java.enable = true;
} }
hosts/desktop/packages.nix
+4
View File
@@ -63,6 +63,10 @@
signal-desktop signal-desktop
file file
ntfs3g ntfs3g
teams-for-linux
nvtopPackages.amd
android-tools
scrcpy
]; ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [