youthlic/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update flake inputs and pin nixpkgs for grub error

Browse source
This commit is contained in:
ulic-youthlic 2025-02-21 20:41:55 +08:00
parent 5f63d93d3d
commit 5ecc477c5f
Signed by: youthlic
GPG key ID: 63E86C3C14A0D721
2 changed files with 136 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

193
flake.lock generated
View file

@ -70,11 +70,11 @@
"bt-tracker": { "bt-tracker": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1740010165, "lastModified": 1740125374,
"narHash": "sha256-CO1ccysv3+hRC4N/F4yKfVDPKBuk6elXWzuVy3II+yY=", "narHash": "sha256-wv+eodEArJsVoVa3NohgNUsUMs31m1oMPqgWovUxuu4=",
"owner": "XIU2", "owner": "XIU2",
"repo": "TrackersListCollection", "repo": "TrackersListCollection",
"rev": "b78cfcbf8ecb2b6f2b6500cfc54ff3150d95b259", "rev": "310a64b1ce830bbbef6b5aaa6f6f031e4c6a6e2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -101,14 +101,16 @@
"dae": { "dae": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1739818508, "lastModified": 1740074809,
"narHash": "sha256-j1mObDf568t5Sof0sVmTntt4WTRJSM1s5pjSl9UinpI=", "narHash": "sha256-81CDZ0y1J1OgIblNl3HdLyuB8oxi3vN5AwP9a5t/ZGo=",
"owner": "daeuniverse", "owner": "daeuniverse",
"repo": "flake.nix", "repo": "flake.nix",
"rev": "f155ec22984400cf90e150a0ad8ba4137a57c2fe", "rev": "c186ea01695ba98dab1b397e7a02833b9f12789e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -120,7 +122,9 @@
"deploy-rs": { "deploy-rs": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": "nixpkgs_2", "nixpkgs": [
"nixpkgs"
],
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
@ -256,11 +260,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1730504689, "lastModified": 1738453229,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "506278e768c2a08bec68eb62932193e341f55c90", "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -470,7 +474,9 @@
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": [
"nixpkgs"
],
"zig": "zig", "zig": "zig",
"zig2nix": "zig2nix" "zig2nix": "zig2nix"
}, },
@ -563,11 +569,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1739984309, "lastModified": 1740074307,
"narHash": "sha256-NYD+O0kYuPfyVx46aVmMiLloYUrmO3iEue4iRJEaNUs=", "narHash": "sha256-1duOlzdBv61aLohv45urOtqqzwi3RPcG/JTtxx0V4K8=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "6304e7b2a76b7bd8dbefdb9e29384d3c99a22984", "rev": "0deb8bbce6f33124f3434c94c22f5177cb8caa9f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -584,11 +590,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739992710, "lastModified": 1740060750,
"narHash": "sha256-9kEscmGnXHjSgcqyJR4TzzHhska4yz1inSQs6HuO9qU=", "narHash": "sha256-FOC9OzJ5Ckh6VjzGSRh4F3UCUOdM8NrzQT19PQcQJ44=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1c189f011447810af939a886ba7bee33532bb1f9", "rev": "0c0b0ac8af6ca76b1fcb514483a9bd73c18f1e8c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -681,17 +687,19 @@
"inputs": { "inputs": {
"niri-stable": "niri-stable", "niri-stable": "niri-stable",
"niri-unstable": "niri-unstable", "niri-unstable": "niri-unstable",
"nixpkgs": "nixpkgs_3", "nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2",
"xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-stable": "xwayland-satellite-stable",
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1740007509, "lastModified": 1740124252,
"narHash": "sha256-U8ln+d0ganReAnGlLIeztx0cMnlAPgzzZb/AzOMNAmw=", "narHash": "sha256-s/wpy4RFcfsn5vPLC9LhMgoxdd7ReWRssWdxUgBym8s=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "99ce4a9c380052c384243b3d4e47a8aaf149cb3a", "rev": "f989ca59d48550c3fd7021917647775969c26d54",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -720,11 +728,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1739940569, "lastModified": 1740117926,
"narHash": "sha256-r624MtdcINkMlyXvvizg8b6Ig1fv4lLvjdgKM2ejaS0=", "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "74787843430cff26c5308e95051b7e9f5dc4252c", "rev": "b94a5db8790339cf9134873d8b490be69e02ac71",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -832,15 +840,15 @@
"nixos-cosmic": { "nixos-cosmic": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1740019415, "lastModified": 1740106782,
"narHash": "sha256-/zTPI91ovj8GirYjfp+mipAxny64drl7Af6nnCN7K6g=", "narHash": "sha256-T0H/uMO2Q06lz1CpN2Czxppvq9SN4McT3s/aQzKLn/k=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "ca158e1d3824b4b4cbaaf258a6a9123a21d9049c", "rev": "4be261f1b28465016f1476beabcd67fa000b04a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -851,11 +859,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1739798439, "lastModified": 1740089251,
"narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -867,11 +875,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1730531603, "lastModified": 1739866667,
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -899,14 +907,14 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1730504152, "lastModified": 1738452942,
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
} }
}, },
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
@ -979,11 +987,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1739624908, "lastModified": 1739923778,
"narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a60651b217d2e529729cbc7d989c19f3941b9250", "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -994,22 +1002,6 @@
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": {
"lastModified": 1738136902,
"narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable_2": {
"locked": { "locked": {
"lastModified": 1731676054, "lastModified": 1731676054,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
@ -1043,64 +1035,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1702272962, "lastModified": 1730531603,
"narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1739866667,
"narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1739580444,
"narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8bb37161a0488b89830168b81c48aed11569cb93",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1736798957,
"narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -1123,11 +1067,11 @@
"nur-rycee": { "nur-rycee": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1740024204, "lastModified": 1740110615,
"narHash": "sha256-viDhtYFp/Rg9OzpJoh+NWbhHvzSRpAQF1wmN9eh0RKs=", "narHash": "sha256-GJVXn9bgEF8zCPJvpYJvS39MUMyZkX4Ab4I6RoUKECw=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "b23719a0efe8ee5538fe379beaeedbada52d962b", "rev": "ba3db5f76a6f352664d3398bdd11b09562831927",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -1140,11 +1084,11 @@
"nur-xddxdd": { "nur-xddxdd": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1739441197, "lastModified": 1740133916,
"narHash": "sha256-gR7mSdxQ6NHEybZJRBR7+Dk2X/8StmMusyyV7cPtXVw=", "narHash": "sha256-1PIIuqd4Tfv9smr7AiMlMO+5VD3H9rwIiuzkNdXm2BE=",
"owner": "xddxdd", "owner": "xddxdd",
"repo": "nur-packages", "repo": "nur-packages",
"rev": "d688cba68f05d424121c33fd249850b28d43dff4", "rev": "421f8479fe17d475000babd9691cf6a007b38bd9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1165,7 +1109,7 @@
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-darwin": "nixpkgs-darwin",
"nixpkgs-unstable": "nixpkgs-unstable_2", "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur", "nur": "nur",
"rust-overlay": "rust-overlay_2", "rust-overlay": "rust-overlay_2",
"winapps": "winapps" "winapps": "winapps"
@ -1200,10 +1144,7 @@
"niri-flake": "niri-flake", "niri-flake": "niri-flake",
"nixos-cosmic": "nixos-cosmic", "nixos-cosmic": "nixos-cosmic",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": [ "nixpkgs": "nixpkgs_2",
"nixos-cosmic",
"nixpkgs"
],
"nur-rycee": "nur-rycee", "nur-rycee": "nur-rycee",
"nur-xddxdd": "nur-xddxdd", "nur-xddxdd": "nur-xddxdd",
"oskars-dotfiles": "oskars-dotfiles", "oskars-dotfiles": "oskars-dotfiles",
@ -1285,7 +1226,9 @@
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_3", "home-manager": "home-manager_3",
"nixpkgs": "nixpkgs_5", "nixpkgs": [
"nixpkgs"
],
"systems": "systems_8", "systems": "systems_8",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
@ -1294,11 +1237,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1739909171, "lastModified": 1740055719,
"narHash": "sha256-GmuW8XkOF6lSEQBeXzUCyr6tetbbxX8wpNJlwFqT/9E=", "narHash": "sha256-6UaZqK8+7byU2ORz6YpGccjDDoEd95Btr6qE6qbg5YM=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "aeb550add3bfa1ce3ce249c3b3dad71ebb018318", "rev": "c424b22396c5e40d2513ce03f94d0aa6d9cdd38f",
"type": "github" "type": "github"
}, },
"original": { "original": {

86
flake.nix
View file

@ -3,7 +3,13 @@
inputs = { inputs = {
# nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.follows = "nixos-cosmic/nixpkgs"; # nixpkgs.follows = "nixos-cosmic/nixpkgs";
nixpkgs = {
type = "github";
owner = "NixOS";
repo = "nixpkgs";
ref = "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d";
};
lix-module = { lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module"; url = "git+https://git.lix.systems/lix-project/nixos-module";
@ -11,79 +17,123 @@
}; };
helix = { helix = {
url = "github:helix-editor/helix/master"; type = "github";
owner = "helix-editor";
repo = "helix";
ref = "master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; type = "github";
owner = "nix-community";
repo = "home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
oskars-dotfiles = { oskars-dotfiles = {
url = "github:oskardotglobal/.dotfiles/nix"; type = "github";
owner = "oskardotglobal";
repo = ".dotfiles";
ref = "nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
niri-flake = { niri-flake = {
url = "github:sodiboo/niri-flake"; type = "github";
owner = "sodiboo";
repo = "niri-flake";
inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-cosmic = { nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic"; type = "github";
owner = "lilyinstarlight";
repo = "nixos-cosmic";
}; };
ghostty = { ghostty = {
url = "github:ghostty-org/ghostty"; type = "github";
owner = "ghostty-org";
repo = "ghostty";
inputs.nixpkgs-unstable.follows = "nixpkgs";
}; };
nixos-hardware = { nixos-hardware = {
url = "github:NixOS/nixos-hardware/master"; type = "github";
owner = "NixOS";
repo = "nixos-hardware";
ref = "master";
}; };
dae = { dae = {
url = "github:daeuniverse/flake.nix"; type = "github";
owner = "daeuniverse";
repo = "flake.nix";
inputs.nixpkgs.follows = "nixpkgs";
}; };
flake-parts = { flake-parts = {
url = "github:hercules-ci/flake-parts"; type = "github";
owner = "hercules-ci";
repo = "flake-parts";
}; };
flake-utils = { flake-utils = {
url = "github:numtide/flake-utils"; type = "github";
owner = "numtide";
repo = "flake-utils";
}; };
nur-xddxdd = { nur-xddxdd = {
url = "github:xddxdd/nur-packages/master"; type = "github";
owner = "xddxdd";
repo = "nur-packages";
ref = "master";
flake = false; flake = false;
}; };
nur-rycee = { nur-rycee = {
url = "gitlab:rycee/nur-expressions/master"; type = "gitlab";
owner = "rycee";
repo = "nur-expressions";
ref = "master";
flake = false; flake = false;
}; };
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; type = "github";
owner = "Mic92";
repo = "sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
stylix = { stylix = {
url = "github:danth/stylix"; type = "github";
owner = "danth";
repo = "stylix";
inputs.nixpkgs.follows = "nixpkgs";
}; };
disko = { disko = {
url = "github:nix-community/disko"; type = "github";
owner = "nix-community";
repo = "disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
bt-tracker = { bt-tracker = {
url = "github:XIU2/TrackersListCollection"; type = "github";
owner = "XIU2";
repo = "TrackersListCollection";
flake = false; flake = false;
}; };
deploy-rs = { deploy-rs = {
url = "github:serokell/deploy-rs"; type = "github";
owner = "serokell";
repo = "deploy-rs";
inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = outputs =