From cb7c985616fda84e78c2e51e22ca1be1ccd3f24e Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 20 Feb 2025 14:11:24 +0800 Subject: [PATCH 1/6] switch to lix --- flake.lock | 98 ++++++++++++++++++++++++++++++++++++--- flake.nix | 5 ++ nixos/modules/default.nix | 1 + 3 files changed, 98 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 926b30e..c602d40 100644 --- a/flake.lock +++ b/flake.lock @@ -379,7 +379,25 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" + }, + "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" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_7" }, "locked": { "lastModified": 1710146030, @@ -395,7 +413,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { "systems": [ "stylix", @@ -416,6 +434,21 @@ "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" + } + }, "fromYaml": { "flake": false, "locked": { @@ -607,6 +640,43 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1738174211, + "narHash": "sha256-eYmp1mKM4kULV1W+EBtCPk6LmKWl2REivaYfGRl+AWo=", + "rev": "64e33a7e09a0d1faacf2fd3f6ebd647fe4d8346a", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/64e33a7e09a0d1faacf2fd3f6ebd647fe4d8346a.tar.gz?rev=64e33a7e09a0d1faacf2fd3f6ebd647fe4d8346a" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils_4", + "flakey-profile": "flakey-profile", + "lix": "lix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1738176840, + "narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=", + "ref": "refs/heads/main", + "rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e", + "revCount": 133, + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + } + }, "niri-flake": { "inputs": { "niri-stable": "niri-stable", @@ -675,7 +745,7 @@ "nixpkgs" ], "nixpkgs-wine": "nixpkgs-wine", - "systems": "systems_5", + "systems": "systems_6", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -1126,6 +1196,7 @@ "ghostty": "ghostty", "helix": "helix", "home-manager": "home-manager", + "lix-module": "lix-module", "niri-flake": "niri-flake", "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", @@ -1210,12 +1281,12 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", "nixpkgs": "nixpkgs_5", - "systems": "systems_7", + "systems": "systems_8", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1342,6 +1413,21 @@ "type": "github" } }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -1493,7 +1579,7 @@ "winapps": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ "oskars-dotfiles", "nixpkgs" diff --git a/flake.nix b/flake.nix index 8d1f268..12d7d72 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,11 @@ # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.follows = "nixos-cosmic/nixpkgs"; + lix-module = { + url = "git+https://git.lix.systems/lix-project/nixos-module"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + helix = { url = "github:helix-editor/helix/master"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 4584228..aaa71ca 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -14,6 +14,7 @@ sops-nix.nixosModules.sops stylix.nixosModules.stylix disko.nixosModules.disko + lix-module.nixosModules.default ]) ++ [ ./containers From 384c4546943d3531eabce7a2a6f1b62a1723cf2d Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 20 Feb 2025 15:27:00 +0800 Subject: [PATCH 2/6] update flake inputs --- flake.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index c602d40..e0489f2 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1739952560, - "narHash": "sha256-q8XiwAvzI4TQiEfGek2fv44w3Sbhp+n5+LCDoDiQoas=", + "lastModified": 1740010165, + "narHash": "sha256-CO1ccysv3+hRC4N/F4yKfVDPKBuk6elXWzuVy3II+yY=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "c85ae1eb9ef2227c03697d832f3dfa478f4488d2", + "rev": "b78cfcbf8ecb2b6f2b6500cfc54ff3150d95b259", "type": "github" }, "original": { @@ -563,11 +563,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1739979006, - "narHash": "sha256-B/GPEfoUdX33U4F65pKPRm8AwElQP5hYply+HC9YMDo=", + "lastModified": 1739984309, + "narHash": "sha256-NYD+O0kYuPfyVx46aVmMiLloYUrmO3iEue4iRJEaNUs=", "owner": "helix-editor", "repo": "helix", - "rev": "d031260180cf87dd713438f6bb1a6e7879dbb613", + "rev": "6304e7b2a76b7bd8dbefdb9e29384d3c99a22984", "type": "github" }, "original": { @@ -584,11 +584,11 @@ ] }, "locked": { - "lastModified": 1739913864, - "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=", + "lastModified": 1739992710, + "narHash": "sha256-9kEscmGnXHjSgcqyJR4TzzHhska4yz1inSQs6HuO9qU=", "owner": "nix-community", "repo": "home-manager", - "rev": "97ac0801d187b2911e8caa45316399de12f6f199", + "rev": "1c189f011447810af939a886ba7bee33532bb1f9", "type": "github" }, "original": { @@ -687,11 +687,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739944956, - "narHash": "sha256-qGOyv8cudQw1KIHNckU/eo09zjcc4NPis8J4v+XeXDE=", + "lastModified": 1740007509, + "narHash": "sha256-U8ln+d0ganReAnGlLIeztx0cMnlAPgzzZb/AzOMNAmw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8bfb763f07fd9106e032590d071c30450e3b80f6", + "rev": "99ce4a9c380052c384243b3d4e47a8aaf149cb3a", "type": "github" }, "original": { @@ -836,11 +836,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1739909000, - "narHash": "sha256-DsepQ7ApA4li8td4QFTmX2qs4gvCLfoN7Mlaifmji7Y=", + "lastModified": 1740019415, + "narHash": "sha256-/zTPI91ovj8GirYjfp+mipAxny64drl7Af6nnCN7K6g=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "5516035bb36dbb19f2bbe7b9cea6922db395e100", + "rev": "ca158e1d3824b4b4cbaaf258a6a9123a21d9049c", "type": "github" }, "original": { @@ -963,11 +963,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1739758141, - "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", + "lastModified": 1739923778, + "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c618e28f70257593de75a7044438efc1c1fc0791", + "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", "type": "github" }, "original": { @@ -1123,11 +1123,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1739937805, - "narHash": "sha256-jvf656iWhtPUb1rebWlhD8RttLjxH5KwCtqm3qONKh4=", + "lastModified": 1740024204, + "narHash": "sha256-viDhtYFp/Rg9OzpJoh+NWbhHvzSRpAQF1wmN9eh0RKs=", "owner": "rycee", "repo": "nur-expressions", - "rev": "438985bb1767cc1b5c21053b7338c7900225a611", + "rev": "b23719a0efe8ee5538fe379beaeedbada52d962b", "type": "gitlab" }, "original": { @@ -1681,8 +1681,8 @@ }, "original": { "owner": "jcollie", - "ref": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", "repo": "zig2nix", + "rev": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", "type": "github" } } From 7251fee0654a54f93c52ecade56b42e8fa7cc3ab Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 20 Feb 2025 15:36:30 +0800 Subject: [PATCH 3/6] update flake inputs --- flake.lock | 13 ++++++------- flake.nix | 2 +- nixos/modules/gui/kde.nix | 1 + 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index e0489f2..a44988a 100644 --- a/flake.lock +++ b/flake.lock @@ -160,11 +160,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1736899990, - "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=", + "lastModified": 1739223196, + "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d", + "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21", "type": "github" }, "original": { @@ -1294,17 +1294,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1739375014, - "narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=", + "lastModified": 1739909171, + "narHash": "sha256-GmuW8XkOF6lSEQBeXzUCyr6tetbbxX8wpNJlwFqT/9E=", "owner": "danth", "repo": "stylix", - "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777", + "rev": "aeb550add3bfa1ce3ce249c3b3dad71ebb018318", "type": "github" }, "original": { "owner": "danth", "repo": "stylix", - "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 12d7d72..52bf7b3 100644 --- a/flake.nix +++ b/flake.nix @@ -69,7 +69,7 @@ }; stylix = { - url = "github:danth/stylix?rev=e86de61bb8f5f2b6459d0be3e3291ad16db4b777"; + url = "github:danth/stylix"; }; disko = { diff --git a/nixos/modules/gui/kde.nix b/nixos/modules/gui/kde.nix index 9f5024a..bf3b78d 100644 --- a/nixos/modules/gui/kde.nix +++ b/nixos/modules/gui/kde.nix @@ -8,6 +8,7 @@ let in { config = lib.mkIf (cfg.enabled == "kde") { + stylix.targets.qt.platform = "kde"; services = { desktopManager.plasma6.enable = true; displayManager.sddm.enable = true; From 10947fb8fa8b24a5a4197cad1fd059745a6b5ba0 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Fri, 21 Feb 2025 20:41:55 +0800 Subject: [PATCH 4/6] update flake inputs --- flake.lock | 98 +++++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index a44988a..302bc75 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1740010165, - "narHash": "sha256-CO1ccysv3+hRC4N/F4yKfVDPKBuk6elXWzuVy3II+yY=", + "lastModified": 1740125374, + "narHash": "sha256-wv+eodEArJsVoVa3NohgNUsUMs31m1oMPqgWovUxuu4=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "b78cfcbf8ecb2b6f2b6500cfc54ff3150d95b259", + "rev": "310a64b1ce830bbbef6b5aaa6f6f031e4c6a6e2f", "type": "github" }, "original": { @@ -104,11 +104,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1739818508, - "narHash": "sha256-j1mObDf568t5Sof0sVmTntt4WTRJSM1s5pjSl9UinpI=", + "lastModified": 1740074809, + "narHash": "sha256-81CDZ0y1J1OgIblNl3HdLyuB8oxi3vN5AwP9a5t/ZGo=", "owner": "daeuniverse", "repo": "flake.nix", - "rev": "f155ec22984400cf90e150a0ad8ba4137a57c2fe", + "rev": "c186ea01695ba98dab1b397e7a02833b9f12789e", "type": "github" }, "original": { @@ -256,11 +256,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -563,11 +563,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1739984309, - "narHash": "sha256-NYD+O0kYuPfyVx46aVmMiLloYUrmO3iEue4iRJEaNUs=", + "lastModified": 1740074307, + "narHash": "sha256-1duOlzdBv61aLohv45urOtqqzwi3RPcG/JTtxx0V4K8=", "owner": "helix-editor", "repo": "helix", - "rev": "6304e7b2a76b7bd8dbefdb9e29384d3c99a22984", + "rev": "0deb8bbce6f33124f3434c94c22f5177cb8caa9f", "type": "github" }, "original": { @@ -584,11 +584,11 @@ ] }, "locked": { - "lastModified": 1739992710, - "narHash": "sha256-9kEscmGnXHjSgcqyJR4TzzHhska4yz1inSQs6HuO9qU=", + "lastModified": 1740060750, + "narHash": "sha256-FOC9OzJ5Ckh6VjzGSRh4F3UCUOdM8NrzQT19PQcQJ44=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c189f011447810af939a886ba7bee33532bb1f9", + "rev": "0c0b0ac8af6ca76b1fcb514483a9bd73c18f1e8c", "type": "github" }, "original": { @@ -687,11 +687,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1740007509, - "narHash": "sha256-U8ln+d0ganReAnGlLIeztx0cMnlAPgzzZb/AzOMNAmw=", + "lastModified": 1740124252, + "narHash": "sha256-s/wpy4RFcfsn5vPLC9LhMgoxdd7ReWRssWdxUgBym8s=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "99ce4a9c380052c384243b3d4e47a8aaf149cb3a", + "rev": "f989ca59d48550c3fd7021917647775969c26d54", "type": "github" }, "original": { @@ -720,11 +720,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1739940569, - "narHash": "sha256-r624MtdcINkMlyXvvizg8b6Ig1fv4lLvjdgKM2ejaS0=", + "lastModified": 1740117926, + "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", "owner": "YaLTeR", "repo": "niri", - "rev": "74787843430cff26c5308e95051b7e9f5dc4252c", + "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", "type": "github" }, "original": { @@ -836,11 +836,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1740019415, - "narHash": "sha256-/zTPI91ovj8GirYjfp+mipAxny64drl7Af6nnCN7K6g=", + "lastModified": 1740106782, + "narHash": "sha256-T0H/uMO2Q06lz1CpN2Czxppvq9SN4McT3s/aQzKLn/k=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "ca158e1d3824b4b4cbaaf258a6a9123a21d9049c", + "rev": "4be261f1b28465016f1476beabcd67fa000b04a5", "type": "github" }, "original": { @@ -851,11 +851,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1739798439, - "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", + "lastModified": 1740089251, + "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", + "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", "type": "github" }, "original": { @@ -867,11 +867,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -899,14 +899,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "lastModified": 1738452942, + "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" }, "original": { "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": { @@ -979,11 +979,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1739624908, - "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", + "lastModified": 1739923778, + "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a60651b217d2e529729cbc7d989c19f3941b9250", + "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", "type": "github" }, "original": { @@ -1075,11 +1075,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1739580444, - "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bb37161a0488b89830168b81c48aed11569cb93", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -1123,11 +1123,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1740024204, - "narHash": "sha256-viDhtYFp/Rg9OzpJoh+NWbhHvzSRpAQF1wmN9eh0RKs=", + "lastModified": 1740110615, + "narHash": "sha256-GJVXn9bgEF8zCPJvpYJvS39MUMyZkX4Ab4I6RoUKECw=", "owner": "rycee", "repo": "nur-expressions", - "rev": "b23719a0efe8ee5538fe379beaeedbada52d962b", + "rev": "ba3db5f76a6f352664d3398bdd11b09562831927", "type": "gitlab" }, "original": { @@ -1140,11 +1140,11 @@ "nur-xddxdd": { "flake": false, "locked": { - "lastModified": 1739441197, - "narHash": "sha256-gR7mSdxQ6NHEybZJRBR7+Dk2X/8StmMusyyV7cPtXVw=", + "lastModified": 1740133916, + "narHash": "sha256-1PIIuqd4Tfv9smr7AiMlMO+5VD3H9rwIiuzkNdXm2BE=", "owner": "xddxdd", "repo": "nur-packages", - "rev": "d688cba68f05d424121c33fd249850b28d43dff4", + "rev": "421f8479fe17d475000babd9691cf6a007b38bd9", "type": "github" }, "original": { @@ -1294,11 +1294,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1739909171, - "narHash": "sha256-GmuW8XkOF6lSEQBeXzUCyr6tetbbxX8wpNJlwFqT/9E=", + "lastModified": 1740055719, + "narHash": "sha256-6UaZqK8+7byU2ORz6YpGccjDDoEd95Btr6qE6qbg5YM=", "owner": "danth", "repo": "stylix", - "rev": "aeb550add3bfa1ce3ce249c3b3dad71ebb018318", + "rev": "c424b22396c5e40d2513ce03f94d0aa6d9cdd38f", "type": "github" }, "original": { From 2f2d110779d763fdc74c2382d2e98be3edb92398 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Fri, 21 Feb 2025 21:37:02 +0800 Subject: [PATCH 5/6] modify flake inputs --- flake.lock | 104 +++++++++-------------------------------------------- flake.nix | 78 +++++++++++++++++++++++++++++++--------- 2 files changed, 78 insertions(+), 104 deletions(-) diff --git a/flake.lock b/flake.lock index 302bc75..8c5a254 100644 --- a/flake.lock +++ b/flake.lock @@ -101,7 +101,9 @@ "dae": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1740074809, @@ -120,7 +122,9 @@ "deploy-rs": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "utils": "utils" }, "locked": { @@ -470,7 +474,9 @@ "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-unstable": [ + "nixpkgs" + ], "zig": "zig", "zig2nix": "zig2nix" }, @@ -681,7 +687,9 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-stable": "nixpkgs-stable_2", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -832,7 +840,7 @@ "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { @@ -994,22 +1002,6 @@ } }, "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": { "lastModified": 1731676054, "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", @@ -1041,70 +1033,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1702272962, - "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "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": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", - "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", - "type": "github" - } - }, "nur": { "locked": { "lastModified": 1731941414, @@ -1165,7 +1093,7 @@ "nixpkgs" ], "nixpkgs-darwin": "nixpkgs-darwin", - "nixpkgs-unstable": "nixpkgs-unstable_2", + "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "rust-overlay": "rust-overlay_2", "winapps": "winapps" @@ -1285,7 +1213,9 @@ "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_5", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_8", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", diff --git a/flake.nix b/flake.nix index 52bf7b3..e3dac12 100644 --- a/flake.nix +++ b/flake.nix @@ -11,79 +11,123 @@ }; helix = { - url = "github:helix-editor/helix/master"; + type = "github"; + owner = "helix-editor"; + repo = "helix"; + ref = "master"; inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { - url = "github:nix-community/home-manager"; + type = "github"; + owner = "nix-community"; + repo = "home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; oskars-dotfiles = { - url = "github:oskardotglobal/.dotfiles/nix"; + type = "github"; + owner = "oskardotglobal"; + repo = ".dotfiles"; + ref = "nix"; inputs.nixpkgs.follows = "nixpkgs"; }; niri-flake = { - url = "github:sodiboo/niri-flake"; + type = "github"; + owner = "sodiboo"; + repo = "niri-flake"; + inputs.nixpkgs.follows = "nixpkgs"; }; nixos-cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; + type = "github"; + owner = "lilyinstarlight"; + repo = "nixos-cosmic"; }; ghostty = { - url = "github:ghostty-org/ghostty"; + type = "github"; + owner = "ghostty-org"; + repo = "ghostty"; + inputs.nixpkgs-unstable.follows = "nixpkgs"; }; nixos-hardware = { - url = "github:NixOS/nixos-hardware/master"; + type = "github"; + owner = "NixOS"; + repo = "nixos-hardware"; + ref = "master"; }; dae = { - url = "github:daeuniverse/flake.nix"; + type = "github"; + owner = "daeuniverse"; + repo = "flake.nix"; + inputs.nixpkgs.follows = "nixpkgs"; }; flake-parts = { - url = "github:hercules-ci/flake-parts"; + type = "github"; + owner = "hercules-ci"; + repo = "flake-parts"; }; flake-utils = { - url = "github:numtide/flake-utils"; + type = "github"; + owner = "numtide"; + repo = "flake-utils"; }; nur-xddxdd = { - url = "github:xddxdd/nur-packages/master"; + type = "github"; + owner = "xddxdd"; + repo = "nur-packages"; + ref = "master"; flake = false; }; nur-rycee = { - url = "gitlab:rycee/nur-expressions/master"; + type = "gitlab"; + owner = "rycee"; + repo = "nur-expressions"; + ref = "master"; flake = false; }; sops-nix = { - url = "github:Mic92/sops-nix"; + type = "github"; + owner = "Mic92"; + repo = "sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - url = "github:danth/stylix"; + type = "github"; + owner = "danth"; + repo = "stylix"; + inputs.nixpkgs.follows = "nixpkgs"; }; disko = { - url = "github:nix-community/disko"; + type = "github"; + owner = "nix-community"; + repo = "disko"; inputs.nixpkgs.follows = "nixpkgs"; }; bt-tracker = { - url = "github:XIU2/TrackersListCollection"; + type = "github"; + owner = "XIU2"; + repo = "TrackersListCollection"; flake = false; }; deploy-rs = { - url = "github:serokell/deploy-rs"; + type = "github"; + owner = "serokell"; + repo = "deploy-rs"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; outputs = From f3c50fc4d131b668ef1dc460d0f37b73a414d0c3 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sat, 22 Feb 2025 16:57:06 +0800 Subject: [PATCH 6/6] update flake inputs --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 8c5a254..e8132e7 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1740125374, - "narHash": "sha256-wv+eodEArJsVoVa3NohgNUsUMs31m1oMPqgWovUxuu4=", + "lastModified": 1740211769, + "narHash": "sha256-peTxEgLIOExXQWhgY1fRDdmJ6MfjzdNX4eJEkM8xCto=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "310a64b1ce830bbbef6b5aaa6f6f031e4c6a6e2f", + "rev": "14c9361225fa4a91a0ffd2ac6c2fd9dc44c4b8be", "type": "github" }, "original": { @@ -481,11 +481,11 @@ "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1739918167, - "narHash": "sha256-6zdYjNKqMTKfHKlaz0kKqqSmoSCqEjv1vyIygqi3wCo=", + "lastModified": 1740181800, + "narHash": "sha256-ebe/mVYhwuZ3JOt7QvYQdeSs0uwkvKkiRWVLfShldEc=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "38908e01268298ced33b7b6835e49b8c6d437e12", + "rev": "870b74f4da75ef2baa1f430602c901cb1405802e", "type": "github" }, "original": { @@ -590,11 +590,11 @@ ] }, "locked": { - "lastModified": 1740060750, - "narHash": "sha256-FOC9OzJ5Ckh6VjzGSRh4F3UCUOdM8NrzQT19PQcQJ44=", + "lastModified": 1740208222, + "narHash": "sha256-FqgPcK5BK+Mc4cGBCGz555UsVd/TQK9FvmuamBWu+ZY=", "owner": "nix-community", "repo": "home-manager", - "rev": "0c0b0ac8af6ca76b1fcb514483a9bd73c18f1e8c", + "rev": "f4a07823a298deff0efb0db30f9318511de7c232", "type": "github" }, "original": { @@ -844,11 +844,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1740106782, - "narHash": "sha256-T0H/uMO2Q06lz1CpN2Czxppvq9SN4McT3s/aQzKLn/k=", + "lastModified": 1740192028, + "narHash": "sha256-aEaTAYI8TxLo8xXSJBUMMHwOEzsmyRspkoanZJbJTtQ=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "4be261f1b28465016f1476beabcd67fa000b04a5", + "rev": "f3accf6aa7235dc5b9530a8d6c2077603bb0c5de", "type": "github" }, "original": { @@ -1051,11 +1051,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1740110615, - "narHash": "sha256-GJVXn9bgEF8zCPJvpYJvS39MUMyZkX4Ab4I6RoUKECw=", + "lastModified": 1740212040, + "narHash": "sha256-Gpvn9Z+ZgKPyb6qaAbahLbo6ZVj7VuLzSCmHZRvsACA=", "owner": "rycee", "repo": "nur-expressions", - "rev": "ba3db5f76a6f352664d3398bdd11b09562831927", + "rev": "9a8a0914000e4453c99a4c12e9862a0a40075851", "type": "gitlab" }, "original": { @@ -1224,11 +1224,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1740055719, - "narHash": "sha256-6UaZqK8+7byU2ORz6YpGccjDDoEd95Btr6qE6qbg5YM=", + "lastModified": 1740167553, + "narHash": "sha256-/tbaAA3PUfPbmOqxztKQKITBnJmgtqh/mVG6ygwpTXU=", "owner": "danth", "repo": "stylix", - "rev": "c424b22396c5e40d2513ce03f94d0aa6d9cdd38f", + "rev": "917e07af1451d7765be57c8b31bb3372c7b821a7", "type": "github" }, "original": {