emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleanup and update stable to 25.05

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-06-21 12:14:52 -04:00
parent 7271dbf2da
commit 1475c512e3
6 changed files with 27 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

126
flake.lock generated
View file

@ -90,11 +90,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1750443503, "lastModified": 1750497756,
"narHash": "sha256-TVDR3EyVhOdgcWKhSa5tFqEKgCzRgADcfaThmimkIFw=", "narHash": "sha256-4UW5oR9kqzs2BnzxeDvEnoMaD1NTmHwf41Wzt8+E6ac=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "4b39688c50935c3b279f1443221573cd54698240", "rev": "b4bf921a1c856836190c9e61e31214aead109c80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -238,7 +238,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -290,39 +290,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": {
"inputs": {
"systems": "systems_9"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"freetype2": { "freetype2": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -523,11 +490,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1750371888, "lastModified": 1750503503,
"narHash": "sha256-+8f8R1PdcmmuOES6GtwgdtXKClvXr6kYPa76AHRoLCs=", "narHash": "sha256-UWxbL6a81GWBg990pcct1dzm4HuWIEd1Q6mpV7bHrnM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hypridle", "repo": "hypridle",
"rev": "cff17e8b52c129dab5b9ca4a6fe214e616e36ab8", "rev": "25578b71370d1ba7bf08127ca4b0959452df4d04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -804,41 +771,6 @@
"type": "github" "type": "github"
} }
}, },
"lix": {
"flake": false,
"locked": {
"lastModified": 1746827285,
"narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=",
"rev": "47aad376c87e2e65967f17099277428e4b3f8e5a",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils_2",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1746838955,
"narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=",
"rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"
}
},
"musnix": { "musnix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -891,11 +823,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1750417464, "lastModified": 1750471128,
"narHash": "sha256-PKOpEqaOn6ZYgNIuP1FF04d+3AYusxSydu764z007ac=", "narHash": "sha256-oR2yjhAPXZDmfFb4UwBeVQcJBtrUNFwufovzN8sTBVc=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "21a26d38e174b418a2649db76505041b8b4eccbb", "rev": "13e7a34df7aa4e7d8ec4dd9df9d5a01973f28f49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -996,7 +928,7 @@
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-lib": "nixpkgs-lib_3", "nixpkgs-lib": "nixpkgs-lib_3",
"systems": "systems_6" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1748538518, "lastModified": 1748538518,
@ -1128,11 +1060,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1750259320, "lastModified": 1750400657,
"narHash": "sha256-H8J4H2XCIMEJ5g6fZ179QfQvsc2dUqhqfBjC8RAHNRY=", "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9ba04bda9249d5d5e5238303c9755de5a49a79c5", "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1144,16 +1076,16 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1750151854, "lastModified": 1750400657,
"narHash": "sha256-3za+1J9FifMetO7E/kwgyW+dp+8pPBNlWKfcBovnn6M=", "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad5c70bcc5cc5178205161b7a7d61a6e80f6d244", "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -1330,7 +1262,6 @@
"hypridle": "hypridle", "hypridle": "hypridle",
"hyprlock": "hyprlock", "hyprlock": "hyprlock",
"isd": "isd", "isd": "isd",
"lix-module": "lix-module",
"musnix": "musnix", "musnix": "musnix",
"nh": "nh", "nh": "nh",
"niri": "niri", "niri": "niri",
@ -1572,21 +1503,6 @@
"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"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
@ -1688,7 +1604,7 @@
}, },
"wezterm": { "wezterm": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"freetype2": "freetype2", "freetype2": "freetype2",
"harfbuzz": "harfbuzz", "harfbuzz": "harfbuzz",
"libpng": "libpng", "libpng": "libpng",
@ -1714,7 +1630,7 @@
}, },
"xwayland-satellite": { "xwayland-satellite": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -1769,7 +1685,7 @@
}, },
"yazi": { "yazi": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],

8
flake.nix
View file

@ -5,12 +5,7 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
@ -183,7 +178,6 @@
inherit system; inherit system;
specialArgs = configArgs; specialArgs = configArgs;
modules = [ modules = [
# inputs.lix-module.nixosModules.default
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
inputs.musnix.nixosModules.musnix inputs.musnix.nixosModules.musnix
inputs.niri.nixosModules.niri inputs.niri.nixosModules.niri

2
hosts/eddie/configuration.nix
View file

@ -57,7 +57,7 @@
}) })
(final: prev: { (final: prev: {
wineWowPackages.stagingFull = pkgs-stable.wineWowPackages.stagingFull.overrideAttrs (old: { wineWowPackages.yabridge = prev.wineWowPackages.yabridge.overrideAttrs (old: {
patches = [ ../../patches/wine-6006.patch ]; patches = [ ../../patches/wine-6006.patch ];
waylandSupport = true; waylandSupport = true;
fontconfigSupport = true; fontconfigSupport = true;

3
modules/home/desktop.nix
View file

@ -68,7 +68,6 @@
polychromatic polychromatic
swayidle
emojify emojify
smile smile
@ -130,7 +129,7 @@
obs-studio-plugins.wlrobs obs-studio-plugins.wlrobs
obs-studio-plugins.obs-gstreamer obs-studio-plugins.obs-gstreamer
wineWowPackages.stagingFull wineWowPackages.yabridge
winetricks winetricks
virt-manager virt-manager

4
modules/home/music.nix
View file

@ -25,10 +25,10 @@
zenity # needed for bitwigh drivenbymoss extension zenity # needed for bitwigh drivenbymoss extension
(yabridge.override { (yabridge.override {
wine = wineWowPackages.stagingFull; wine = wineWowPackages.yabridge;
}) })
(yabridgectl.override { (yabridgectl.override {
wine = wineWowPackages.stagingFull; wine = wineWowPackages.yabridge;
}) })
supercollider-with-plugins supercollider-with-plugins

2
packages/rmpc-latest.nix
View file

@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
owner = "mierak"; owner = "mierak";
repo = "rmpc"; repo = "rmpc";
rev = "master"; rev = "master";
hash = "sha256-dMFqofhhRsibw3D09JLGWK4Zk8n353OCvTV3+G6hAes="; hash = "sha256-EFGC50H74liww9yF2GAIVnuy64CA6H7qoLqlqQ7n3j0=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;