Compare commits

..

5 Commits

5 changed files with 115 additions and 71 deletions

164
flake.lock generated
View File

@ -43,11 +43,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723405438, "lastModified": 1725753098,
"narHash": "sha256-bpmC2m7OhlDvqgQZdZ2jBLyeIkq/Jld3X4bqRAxBSp8=", "narHash": "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "9312aa28271c91e5d67ecb9def527b2bbcff0e66", "rev": "e4a13203112a036fc7f437d391c7810f3dd5ab52",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -109,11 +109,11 @@
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696727917, "lastModified": 1720809814,
"narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -157,11 +157,11 @@
"base16-vim": { "base16-vim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1722597040, "lastModified": 1716150083,
"narHash": "sha256-F4XRYPXhN47vwBQWPhWS5mBRNNwrgZ+n+n2WsRSh+vQ=", "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"rev": "5a200412c9856085ce726beb4c14c47326c19700", "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -386,6 +386,27 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": {
"inputs": {
"systems": [
"stylix",
"systems"
]
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -469,11 +490,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723399884, "lastModified": 1726036828,
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "086f619dd991a4d355c07837448244029fc2d9ab", "rev": "8a1671642826633586d12ac3158e463c7a50a112",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -542,11 +563,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1722631742, "lastModified": 1725204025,
"narHash": "sha256-HJWmbQo/vseT2vb3yQsbrN/gnlKj21HWRqlZrJp44Os=", "narHash": "sha256-DdPf2Hm/ywtXqQutmxuzvMLgTzuV1nuzbrsahyhB8uU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hypridle", "repo": "hypridle",
"rev": "96d51ec2a749a928cb9d48b1fc0ea4898e73a335", "rev": "22b058b47a57b609e00c5c8a90697f33c7fe1fd3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -567,11 +588,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1723738578, "lastModified": 1726071051,
"narHash": "sha256-TLkmHk6xWEUGpLci1QNyWRC7VFqocgBat2gl1gVXpY4=", "narHash": "sha256-eZPhLQ8DM8AsP+zM1KmUzxWQaiTpOUbFS1xeOyjgwvg=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "12d9901472c6f9128fa8b16c25b3a879d1859e60", "rev": "8b9e385943d1a9fd0f8c6070fa1eae507ae26145",
"revCount": 5095, "revCount": 5213,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -654,11 +675,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721324361, "lastModified": 1725997860,
"narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -704,11 +725,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722869141, "lastModified": 1724966483,
"narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=", "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "0252fd13e78e60fb0da512a212e56007515a49f7", "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -749,11 +770,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722636442, "lastModified": 1725551787,
"narHash": "sha256-+7IS0n3/F0I5j6ZbrVlLcIIPHY3o+/vLAqg/G48sG+w=", "narHash": "sha256-6LgsZHz8w3g4c9bRUwRAR+WIMwFGGf3P1VZQcKNRf2o=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "9d67858b437d4a1299be496d371b66fc0d3e01f6", "rev": "1e531dc49ad36c88b45bf836081a7a2c8927e072",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -764,11 +785,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1719091691, "lastModified": 1725690722,
"narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", "narHash": "sha256-4qWg9sNh5g1qPGO6d/GV2ktY+eDikkBTbWSg5/iD2nY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", "rev": "63f4d0443e32b0dd7189001ee1894066765d18a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -811,11 +832,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723352546, "lastModified": 1725765290,
"narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=", "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06", "rev": "642275444c5a9defce57219c944b3179bf2adaa9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -833,11 +854,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723769240, "lastModified": 1726102277,
"narHash": "sha256-8u6lV2alO1cj8/+2Ua/sFnJ0fm+hwVW8xvLlLd1uFAo=", "narHash": "sha256-PmPZuD75d1JnsFHZNy5tsrGzouiX6o518Hw5Id5svH8=",
"owner": "Silveere", "owner": "Silveere",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "e7e395d07bb008f9d4b4e0007fd4045b8b1e5261", "rev": "5b6d72528876a4c21d23da3a40dd64cd3f24e63c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -856,11 +877,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723772202, "lastModified": 1726105276,
"narHash": "sha256-e8nH/JfdW4OuaYcNnnRKaeB9fPRdCO3y4I3KzhXgE8k=", "narHash": "sha256-L6AA5NEh3V4CBlwUkE7+A5tHbh+T1LvswMXDGygnhwA=",
"owner": "infinidoge", "owner": "infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "77d0ca95f039e4e28f9b64c3f042c574d26a88e2", "rev": "16419da635ec6a436e705541776cea757be47c36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -878,11 +899,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723124175, "lastModified": 1725882169,
"narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=", "narHash": "sha256-v5L+Dh6KdyycIgcdIc6SQ1fRNNvFJmYz02+fyeptA2o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690", "rev": "34b95b3962f5b3436d4bae5091d1b2ff7c1eb180",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -916,11 +937,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1723637854, "lastModified": 1725983898,
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -964,11 +985,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1723703277, "lastModified": 1726042813,
"narHash": "sha256-nk0RaUB5f68BwtXAYy3WAjqFhVKqIl9Z89RGycTa2vk=", "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8b908192e64224420e2d59dfd9b2e4309e154c5d", "rev": "159be5db480d1df880a0135ca0bfed84c2f88353",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -996,11 +1017,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1723556749, "lastModified": 1725930920,
"narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=", "narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4a92571f9207810b559c9eac203d1f4d79830073", "rev": "44a71ff39c182edaf25a7ace5c9454e7cba2c658",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1058,7 +1079,7 @@
"nixpkgs-yt-dlp-2024": "nixpkgs-yt-dlp-2024", "nixpkgs-yt-dlp-2024": "nixpkgs-yt-dlp-2024",
"rust-overlay": "rust-overlay_2", "rust-overlay": "rust-overlay_2",
"stylix": "stylix", "stylix": "stylix",
"systems": "systems_8" "systems": "systems_9"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -1093,11 +1114,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723774846, "lastModified": 1726107922,
"narHash": "sha256-m53hVat6XXiKooV1oUDEMnPcdNKqSn/kAW+g8juSq84=", "narHash": "sha256-G8P6YT/U55G4YILkL/I0NaEqYYoL05Rfs7y/tI4mqqI=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "519f4892641bc04a6ac7c2d260cc68356f9ae90f", "rev": "fb1cf4398436a12f1f8b07da08d94fc72fcb1a69",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1116,20 +1137,22 @@
"base16-tmux": "base16-tmux", "base16-tmux": "base16-tmux",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_5",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": [ "home-manager": [
"home-manager" "home-manager"
], ],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1722946882, "lastModified": 1725290973,
"narHash": "sha256-mxtnMye8gs82tdQbVC+g6v3aPOZlH150f9WyntHIkTg=", "narHash": "sha256-+jwXF9KI0HfvDgpsoJGvOdfOGGSKOrID1wQB79zjUbo=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "5853f1a8bd072f2ebabfc3de3973084353cf6f1e", "rev": "ef81ad9e85e60420cc83d4642619c14b57139d33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1258,6 +1281,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_9": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
@ -1275,11 +1313,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722365976, "lastModified": 1726046979,
"narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=", "narHash": "sha256-6SEsjurq9cdTkITA6d49ncAJe4O/8CgRG5/F//s6Xh8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341", "rev": "e695669fd8e1d1be9eaae40f35e00f8bd8b64c18",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -6,10 +6,7 @@ in
{ {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
nixpkgs.overlays = let nixpkgs.overlays = let
prismlauncher-config = (final: prev: { in lib.mkAfter [ ];
prismlauncher = prev.prismlauncher.override { withWaylandGLFW = true; };
});
in lib.mkAfter [ prismlauncher-config ];
nixfiles.common.wm.autostart = [ nixfiles.common.wm.autostart = [
"steam -silent" "steam -silent"

View File

@ -26,6 +26,7 @@ in
audacity audacity
picard picard
spicetify-cli spicetify-cli
(kodi.withPackages (_: [])) # this is required to get python libs
] ++ [ ] ++ [
yt-dlp yt-dlp
gallery-dl gallery-dl

View File

@ -12,6 +12,11 @@ let
pickFixed = ours: theirs: if versionAtLeast ours.version theirs.version then ours else theirs; pickFixed = ours: theirs: if versionAtLeast ours.version theirs.version then ours else theirs;
pickNewer = ours: theirs: if versionOlder theirs.version ours.version then ours else theirs; pickNewer = ours: theirs: if versionOlder theirs.version ours.version then ours else theirs;
hold = now: days: ours: theirs: let
seconds = days * 24 * 60 * 60;
endTimestamp = now + seconds;
in if now < endTimestamp then ours else theirs;
optionalPkg = cond: val: if cond then val else null; optionalPkg = cond: val: if cond then val else null;
gimp-with-plugins-good = let gimp-with-plugins-good = let
@ -43,6 +48,12 @@ in {
unstable = prev.easyeffects; unstable = prev.easyeffects;
in if updateTime < 1726148749 then stable else unstable; in if updateTime < 1726148749 then stable else unstable;
compsize = let
stable = pkgsStable.compsize;
unstable = prev.compsize;
now = 1724786296;
in hold now 7 stable unstable;
redlib = let redlib = let
redlib-new = final.callPackage nixfiles.packages.${prev.system}.redlib.override {}; redlib-new = final.callPackage nixfiles.packages.${prev.system}.redlib.override {};
inherit (prev) redlib; inherit (prev) redlib;

View File

@ -28,10 +28,7 @@ in
]; ];
}; };
}); });
prismlauncherWayland = (final: prev: { in [ steamGamescopeFix ];
prismlauncher = prev.prismlauncher.override { withWaylandGLFW = true; };
});
in [ steamGamescopeFix prismlauncherWayland ];
programs.steam = { programs.steam = {
enable = lib.mkDefault true; enable = lib.mkDefault true;