From b12816898b56d4e59791bec7d72556e1084a806d Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 13 Feb 2025 03:52:50 +0800 Subject: [PATCH 01/14] remove lldb and update flake inputs --- flake.lock | 202 +++++++++++++++++++++++++---------------- pkgs/helix/default.nix | 2 +- 2 files changed, 126 insertions(+), 78 deletions(-) diff --git a/flake.lock b/flake.lock index 92798a5..abe09b3 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1738800660, - "narHash": "sha256-nbuJpBisr9nVlqDcY8jsUeUm2mfWUXrboMwXcauc6R0=", + "lastModified": 1739376557, + "narHash": "sha256-QiYaWpMi+OOHyluS9Mv1BC0Mivv+FMl8m54kYjdI61A=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "d40f6409be2d8185231cf2a218b16f2a2447de5d", + "rev": "348ab1bbeeb760e738fad74489f61c7dfd3a302d", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1738765162, - "narHash": "sha256-3Z40qHaFScWUCVQrGc4Y+RdoPsh1R/wIh+AN4cTXP0I=", + "lastModified": 1739353546, + "narHash": "sha256-YTqXhBZvCdZLMBupWlCDvRFaTEhaHa2/Xc/p1sUdSZU=", "owner": "nix-community", "repo": "disko", - "rev": "ff3568858c54bd306e9e1f2886f0f781df307dff", + "rev": "26ade1005191e0602a78b0f141970648445bafd9", "type": "github" }, "original": { @@ -192,11 +192,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -346,11 +346,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -435,16 +435,18 @@ "ghostty": { "inputs": { "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", - "zig": "zig" + "zig": "zig", + "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1738781852, - "narHash": "sha256-fTr3m5Ktg1vWeAbscpYS7BTjOIACXMjkG1xazeRGvAc=", + "lastModified": 1739381378, + "narHash": "sha256-pRW0AkTFiO6WO+a3PkYQiQmNxDl1levhMTIK+nMk8ls=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "4eb588501735e2df2910b54ed0dc8ad934b5d42f", + "rev": "99cbc062927ca1f0022d278220394eb80004c3b9", "type": "github" }, "original": { @@ -528,11 +530,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1738723095, - "narHash": "sha256-5l7ghUJb++dh59VlaZlmAKDoaJgCtT7pCKP87bRNFZE=", + "lastModified": 1739375845, + "narHash": "sha256-vUCzhcrBl/Z8lmwZYE/WVEfSx2DNruj+mP+ETk1JPN8=", "owner": "helix-editor", "repo": "helix", - "rev": "b0e1eaf50d01257a743b8508f9eb29b78882c403", + "rev": "d8c4c7c26f866033fb7bc0930fa4311c595672e7", "type": "github" }, "original": { @@ -549,11 +551,11 @@ ] }, "locked": { - "lastModified": 1738789832, - "narHash": "sha256-HdlMPfObPu5y7oDfH/w3vvlU3UTQ/bQjSULChZARm5M=", + "lastModified": 1739381933, + "narHash": "sha256-4gvobxITgcrNGfwsVG5a46QzQCX89btIYw23p0ilbcc=", "owner": "nix-community", "repo": "home-manager", - "rev": "30ea6fed4e4b41693cebc2263373dd810de4de49", + "rev": "15b59d4191b993ebdfcb1f61b834fced217882ba", "type": "github" }, "original": { @@ -592,11 +594,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1737630279, + "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c", "type": "github" }, "original": { @@ -615,11 +617,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738770770, - "narHash": "sha256-nfapp7C4BbdvHTRA1HSRVYjD5Fk2FCKoyxQLzcL5X50=", + "lastModified": 1739339370, + "narHash": "sha256-kvuVhsaVa8j0P9Genf96CLX2cNjForojX5aB1BN+Bwk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "83abbde7c8164ee4b42a8647e4e61015c3f45816", + "rev": "498e8bbc149b38fd14d4ff7fbf31c49fdaa23282", "type": "github" }, "original": { @@ -648,11 +650,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738768006, - "narHash": "sha256-56jDYr/vqX4fobMJO2nWLjih03i6UV5bKtxI0nR4ZZA=", + "lastModified": 1739336386, + "narHash": "sha256-H9E3lfJibzWwqV9C1pI81uhav1RLWRA8JbH3ADv3X/4=", "owner": "YaLTeR", "repo": "niri", - "rev": "690d6355057ebeba03cbd8ce4905145b834c72f8", + "rev": "7e552333a993e83a2dba52392109617e486f5f60", "type": "github" }, "original": { @@ -764,11 +766,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1738805812, - "narHash": "sha256-3wupg+xSzRPUius7y29btqCR2l28GpCjwS9q83uK9uU=", + "lastModified": 1739324906, + "narHash": "sha256-c8YO5AznU1Ct1goKgMJCzFqajUpOru/U7knlgfOri/4=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "bbab2cc88af97520259c5575bf29c83bf391424c", + "rev": "98969e677cee822328f0000227aefb008bd3c5e0", "type": "github" }, "original": { @@ -779,11 +781,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738638143, - "narHash": "sha256-ZYMe4c4OCtIUBn5hx15PEGr0+B1cNEpl2dsaLxwY2W0=", + "lastModified": 1738816619, + "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9bdd53f5908453e4d03f395eb1615c3e9a351f70", + "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", "type": "github" }, "original": { @@ -875,11 +877,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1733423277, - "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", + "lastModified": 1738255539, + "narHash": "sha256-hP2eOqhIO/OILW+3moNWO4GtdJFYCqAe9yJZgvlCoDQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e36963a147267afc055f7cf65225958633e536bf", + "rev": "c3511a3b53b482aa7547c9d1626fd7310c1de1c5", "type": "github" }, "original": { @@ -891,11 +893,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1738702386, - "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=", + "lastModified": 1739206421, + "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", + "rev": "44534bc021b85c8d78e465021e21f33b856e2540", "type": "github" }, "original": { @@ -907,11 +909,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1738702386, - "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=", + "lastModified": 1739206421, + "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", + "rev": "44534bc021b85c8d78e465021e21f33b856e2540", "type": "github" }, "original": { @@ -923,11 +925,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733229606, - "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", + "lastModified": 1738136902, + "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", + "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c", "type": "github" }, "original": { @@ -987,11 +989,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { @@ -1003,11 +1005,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { @@ -1019,11 +1021,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { @@ -1067,11 +1069,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1738814634, - "narHash": "sha256-hSSqrG5yBQBYdIT9MKKs/A0GfO468VVU7t+2+H/uMxg=", + "lastModified": 1739333009, + "narHash": "sha256-+2tQnK0buXSEJIU79khebMpoPO7r07Xz3muUrId1Hos=", "owner": "rycee", "repo": "nur-expressions", - "rev": "fc5397f499e9a91e4368e027d1c63e30b15d5ea1", + "rev": "3fac54aeef46a6223d3236e47465e75fe1bfddee", "type": "gitlab" }, "original": { @@ -1084,11 +1086,11 @@ "nur-xddxdd": { "flake": false, "locked": { - "lastModified": 1738750159, - "narHash": "sha256-Y/yYT3qANqafc+6Uxk/rCbNuzdGlYoQn3VDM6MbKkT0=", + "lastModified": 1739354822, + "narHash": "sha256-itTsaSssvMqUtf004PEtHNx82EZuOuEEciKNIPL3rbA=", "owner": "xddxdd", "repo": "nur-packages", - "rev": "2b715df004ac0e90eaf5cc213082159f8bff97fe", + "rev": "3a2b2a1b760235b8dd85bb1f69b22b02bdfd7e98", "type": "github" }, "original": { @@ -1200,11 +1202,11 @@ ] }, "locked": { - "lastModified": 1738291974, - "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=", + "lastModified": 1739262228, + "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7", + "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", "type": "github" }, "original": { @@ -1229,15 +1231,16 @@ "systems": "systems_7", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1738611626, - "narHash": "sha256-IgjqlYPaS8Bg+jc6a691w27XDFhBeM7gkP4eDcR2EBs=", + "lastModified": 1739375014, + "narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=", "owner": "danth", "repo": "stylix", - "rev": "d513f59da5856978c363d2f82103f708f4a6024d", + "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777", "type": "github" }, "original": { @@ -1385,6 +1388,22 @@ "type": "github" } }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1737565458, + "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, "tinted-tmux": { "flake": false, "locked": { @@ -1526,11 +1545,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1737837494, - "narHash": "sha256-wIMowP8Juas4ZwMRcpc+58sZ0kKTDu8fm13THPmv/F8=", + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3944c9a0e40e5629f16ad023bbc90dac80d35a0f", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", "type": "github" }, "original": { @@ -1544,18 +1563,21 @@ "flake-compat": [ "ghostty" ], - "flake-utils": "flake-utils_2", + "flake-utils": [ + "ghostty", + "flake-utils" + ], "nixpkgs": [ "ghostty", "nixpkgs-stable" ] }, "locked": { - "lastModified": 1717848532, - "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", + "lastModified": 1738239110, + "narHash": "sha256-Y5i9mQ++dyIQr+zEPNy+KIbc5wjPmfllBrag3cHZgcE=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", + "rev": "1a8fb6f3a04724519436355564b95fce5e272504", "type": "github" }, "original": { @@ -1563,6 +1585,32 @@ "repo": "zig-overlay", "type": "github" } + }, + "zig2nix": { + "inputs": { + "flake-utils": [ + "ghostty", + "flake-utils" + ], + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1738263917, + "narHash": "sha256-j/3fwe2pEOquHabP/puljOKwAZFjIE9gXZqA91sC48M=", + "owner": "jcollie", + "repo": "zig2nix", + "rev": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", + "type": "github" + }, + "original": { + "owner": "jcollie", + "ref": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", + "repo": "zig2nix", + "type": "github" + } } }, "root": "root", diff --git a/pkgs/helix/default.nix b/pkgs/helix/default.nix index b01dcea..994707a 100644 --- a/pkgs/helix/default.nix +++ b/pkgs/helix/default.nix @@ -44,7 +44,7 @@ let golangci-lint-langserver tinymist delve - lldb + # lldb rust-analyzer nil haskell-language-server From 60713460ba1a20df77db1573f70480bf66866799 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 13 Feb 2025 03:53:29 +0800 Subject: [PATCH 02/14] use pname with version instead of name in symlinkJoin for nix bundle --- pkgs/helix/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/helix/default.nix b/pkgs/helix/default.nix index 994707a..a202d73 100644 --- a/pkgs/helix/default.nix +++ b/pkgs/helix/default.nix @@ -53,7 +53,8 @@ let ); in pkgs.symlinkJoin { - name = "helix-wrapped"; + pname = "helix-wrapped"; + version = helix-wrapped.version; paths = [ helix-wrapped ]; inherit (helix-wrapped) meta; buildInputs = [ From 7bda6a085c8126c2c2ea905a75e8c9cbe2789b56 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 13 Feb 2025 13:49:13 +0800 Subject: [PATCH 03/14] add transfer.sh module --- nixos/configurations/Cape/default.nix | 1 + nixos/modules/programs/default.nix | 1 + nixos/modules/programs/transfer-sh.nix | 33 ++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 nixos/modules/programs/transfer-sh.nix diff --git a/nixos/configurations/Cape/default.nix b/nixos/configurations/Cape/default.nix index 20a8c50..f91dba4 100644 --- a/nixos/configurations/Cape/default.nix +++ b/nixos/configurations/Cape/default.nix @@ -20,6 +20,7 @@ }; users.deploy.enable = true; programs = { + transfer-sh.enable = true; rustypaste = { enable = true; url = "https://paste.youthlic.fun"; diff --git a/nixos/modules/programs/default.nix b/nixos/modules/programs/default.nix index 0356117..98433b2 100644 --- a/nixos/modules/programs/default.nix +++ b/nixos/modules/programs/default.nix @@ -1,6 +1,7 @@ { config, lib, ... }: { imports = [ + ./transfer-sh.nix ./rustypaste ./mautrix-telegram.nix ./caddy.nix diff --git a/nixos/modules/programs/transfer-sh.nix b/nixos/modules/programs/transfer-sh.nix new file mode 100644 index 0000000..a861fe3 --- /dev/null +++ b/nixos/modules/programs/transfer-sh.nix @@ -0,0 +1,33 @@ +{ lib, config, ... }: +let + cfg = config.youthlic.programs.transfer-sh; +in +{ + options = { + youthlic.programs.transfer-sh = { + enable = lib.mkEnableOption "transfer.sh"; + }; + }; + config = lib.mkMerge [ + (lib.mkIf cfg.enable { + services.transfer-sh = { + enable = true; + provider = "local"; + settings = { + BASEDIR = "/var/lib/transfer.sh"; + LISTENER = ":8484"; + TLS_LISTENER_ONLY = false; + }; + }; + }) + (lib.mkIf (cfg.enable && config.youthlic.programs.caddy.enable) { + services.caddy.virtualHosts = { + "transfer.${config.youthlic.programs.caddy.baseDomain}" = { + extraConfig = '' + reverse_proxy 127.0.0.1:8484 + ''; + }; + }; + }) + ]; +} From 5c8248ef3d1f7a04a6ccc3fe622190796595e4f3 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Fri, 14 Feb 2025 15:04:49 +0800 Subject: [PATCH 04/14] update flake inputs --- flake.lock | 84 +++++++++++++++++++++--------------------- pkgs/helix/default.nix | 2 +- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index abe09b3..f79ad85 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1739376557, - "narHash": "sha256-QiYaWpMi+OOHyluS9Mv1BC0Mivv+FMl8m54kYjdI61A=", + "lastModified": 1739491843, + "narHash": "sha256-zzz6ErBJJZC8ypdwjAnxATCYrTOXjTSIGc7RZSWN5PY=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "348ab1bbeeb760e738fad74489f61c7dfd3a302d", + "rev": "a042c4a38a54262f470199ad7d92afdebd9ec206", "type": "github" }, "original": { @@ -442,11 +442,11 @@ "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1739381378, - "narHash": "sha256-pRW0AkTFiO6WO+a3PkYQiQmNxDl1levhMTIK+nMk8ls=", + "lastModified": 1739509769, + "narHash": "sha256-QAKZC2n4s76aHr/3FSub3L1JzQJGCeEz6WiP0ly6Eq0=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "99cbc062927ca1f0022d278220394eb80004c3b9", + "rev": "315df0ab3f3c3264353d958866797ccd829e98b4", "type": "github" }, "original": { @@ -530,11 +530,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1739375845, - "narHash": "sha256-vUCzhcrBl/Z8lmwZYE/WVEfSx2DNruj+mP+ETk1JPN8=", + "lastModified": 1739457098, + "narHash": "sha256-a4zUQTpHagz1Kb3kLxcflsiF05FsHlrzXEuCjbzjAOM=", "owner": "helix-editor", "repo": "helix", - "rev": "d8c4c7c26f866033fb7bc0930fa4311c595672e7", + "rev": "7275b7f85014aad7e15d4987ec4f2249572eecfb", "type": "github" }, "original": { @@ -551,11 +551,11 @@ ] }, "locked": { - "lastModified": 1739381933, - "narHash": "sha256-4gvobxITgcrNGfwsVG5a46QzQCX89btIYw23p0ilbcc=", + "lastModified": 1739470101, + "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=", "owner": "nix-community", "repo": "home-manager", - "rev": "15b59d4191b993ebdfcb1f61b834fced217882ba", + "rev": "5031c6d2978109336637977c165f82aa49fa16a7", "type": "github" }, "original": { @@ -617,11 +617,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739339370, - "narHash": "sha256-kvuVhsaVa8j0P9Genf96CLX2cNjForojX5aB1BN+Bwk=", + "lastModified": 1739496005, + "narHash": "sha256-qr7v18JupLdyjUhC3zczdYzUEC4zzsxGjxsVGgYzwYg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "498e8bbc149b38fd14d4ff7fbf31c49fdaa23282", + "rev": "e072f4a57cad4fb92e656fd69a340c8d372cacac", "type": "github" }, "original": { @@ -650,11 +650,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1739336386, - "narHash": "sha256-H9E3lfJibzWwqV9C1pI81uhav1RLWRA8JbH3ADv3X/4=", + "lastModified": 1739432365, + "narHash": "sha256-uQm3OhhgUQHA5eV+0v/qAFmFHly8yHg2P+BVVy/3DcY=", "owner": "YaLTeR", "repo": "niri", - "rev": "7e552333a993e83a2dba52392109617e486f5f60", + "rev": "4c98b874862c2e6df7f71bdf36df0ba527690fbb", "type": "github" }, "original": { @@ -766,11 +766,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1739324906, - "narHash": "sha256-c8YO5AznU1Ct1goKgMJCzFqajUpOru/U7knlgfOri/4=", + "lastModified": 1739497001, + "narHash": "sha256-c3PAlD0GW6DXvYH4WXehICDHpg4N1b2sJHHFSISUXS8=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "98969e677cee822328f0000227aefb008bd3c5e0", + "rev": "6afdbb543d03f15243317c69733aa4271073827c", "type": "github" }, "original": { @@ -893,11 +893,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1739206421, - "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", + "lastModified": 1739357830, + "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44534bc021b85c8d78e465021e21f33b856e2540", + "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", "type": "github" }, "original": { @@ -909,11 +909,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1739206421, - "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", + "lastModified": 1739357830, + "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44534bc021b85c8d78e465021e21f33b856e2540", + "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", "type": "github" }, "original": { @@ -989,11 +989,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -1005,11 +1005,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -1021,11 +1021,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -1069,11 +1069,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1739333009, - "narHash": "sha256-+2tQnK0buXSEJIU79khebMpoPO7r07Xz3muUrId1Hos=", + "lastModified": 1739505810, + "narHash": "sha256-KYAgDKO5wjs3JZEJS44MJyDPmIwuBMNqQtWWhe4CJHA=", "owner": "rycee", "repo": "nur-expressions", - "rev": "3fac54aeef46a6223d3236e47465e75fe1bfddee", + "rev": "871cfa4510f81b925f16d83477dcccb1ea866bb7", "type": "gitlab" }, "original": { @@ -1086,11 +1086,11 @@ "nur-xddxdd": { "flake": false, "locked": { - "lastModified": 1739354822, - "narHash": "sha256-itTsaSssvMqUtf004PEtHNx82EZuOuEEciKNIPL3rbA=", + "lastModified": 1739441197, + "narHash": "sha256-gR7mSdxQ6NHEybZJRBR7+Dk2X/8StmMusyyV7cPtXVw=", "owner": "xddxdd", "repo": "nur-packages", - "rev": "3a2b2a1b760235b8dd85bb1f69b22b02bdfd7e98", + "rev": "d688cba68f05d424121c33fd249850b28d43dff4", "type": "github" }, "original": { diff --git a/pkgs/helix/default.nix b/pkgs/helix/default.nix index a202d73..2ce91b0 100644 --- a/pkgs/helix/default.nix +++ b/pkgs/helix/default.nix @@ -44,7 +44,7 @@ let golangci-lint-langserver tinymist delve - # lldb + lldb rust-analyzer nil haskell-language-server From db301d74c63cd4c71060933f4c7fe4d92f598fec Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Fri, 14 Feb 2025 22:57:48 +0800 Subject: [PATCH 05/14] add zed-editor module --- .../configurations/Tytonidae/default.nix | 1 + home/modules/programs/default.nix | 1 + home/modules/programs/zed.nix | 31 +++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 home/modules/programs/zed.nix diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix index 9ed9af6..5f85b46 100644 --- a/home/david/configurations/Tytonidae/default.nix +++ b/home/david/configurations/Tytonidae/default.nix @@ -15,6 +15,7 @@ youthlic = { xdg-dirs.enable = true; programs = { + zed-editor.enable = true; rustypaste-cli.enable = true; firefox.enable = true; fuzzel.enable = true; diff --git a/home/modules/programs/default.nix b/home/modules/programs/default.nix index 35c726a..3b19bf9 100644 --- a/home/modules/programs/default.nix +++ b/home/modules/programs/default.nix @@ -1,6 +1,7 @@ { ... }: { imports = [ + ./zed.nix ./rustypaste-cli.nix ./atuin.nix ./firefox.nix diff --git a/home/modules/programs/zed.nix b/home/modules/programs/zed.nix new file mode 100644 index 0000000..a23785a --- /dev/null +++ b/home/modules/programs/zed.nix @@ -0,0 +1,31 @@ +{ + pkgs, + config, + lib, + ... +}: +let + cfg = config.youthlic.programs.zed-editor; +in +{ + options = { + youthlic.programs.zed-editor = { + enable = lib.mkEnableOption "zed-editor"; + }; + }; + config = lib.mkIf cfg.enable { + programs.zed-editor = { + enable = true; + extensions = [ + "nix" + ]; + extraPackages = with pkgs; [ + nixd + nil + ]; + userSettings = { + vim_mode = true; + }; + }; + }; +} From f907b89ad7b75ab0d9ddcba9c568da8fb84afbc4 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sat, 15 Feb 2025 17:37:01 +0800 Subject: [PATCH 06/14] update flake inputs --- flake.lock | 48 +++++++++++++++++------------------ home/modules/programs/git.nix | 1 + 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index f79ad85..8aeeacd 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1739491843, - "narHash": "sha256-zzz6ErBJJZC8ypdwjAnxATCYrTOXjTSIGc7RZSWN5PY=", + "lastModified": 1739607041, + "narHash": "sha256-xrwYzII4BbvErhBNmKzE11P09yRre6LRTWVP6Kt5awk=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "a042c4a38a54262f470199ad7d92afdebd9ec206", + "rev": "898aed0492abb20186be77e02dd05c5d8959f0f4", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1739353546, - "narHash": "sha256-YTqXhBZvCdZLMBupWlCDvRFaTEhaHa2/Xc/p1sUdSZU=", + "lastModified": 1739598710, + "narHash": "sha256-x5sK19938Qsi1eWRjQrH/oSN3wT0jSVE2ZJRwDTyojs=", "owner": "nix-community", "repo": "disko", - "rev": "26ade1005191e0602a78b0f141970648445bafd9", + "rev": "5d6c85c1d0bd634d46a9604e93bce935a06e033b", "type": "github" }, "original": { @@ -442,11 +442,11 @@ "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1739509769, - "narHash": "sha256-QAKZC2n4s76aHr/3FSub3L1JzQJGCeEz6WiP0ly6Eq0=", + "lastModified": 1739595470, + "narHash": "sha256-+t87M/reiRbE+E1CM6hswNbq3aDTZKfJVQz3L8JLl/s=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "315df0ab3f3c3264353d958866797ccd829e98b4", + "rev": "f1f1120749b7494c89689d993d5a893c27c236a5", "type": "github" }, "original": { @@ -551,11 +551,11 @@ ] }, "locked": { - "lastModified": 1739470101, - "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=", + "lastModified": 1739571712, + "narHash": "sha256-0UdSDV/TBY+GuxXLbrLq3l2Fq02ciyKCIMy4qmnfJXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "5031c6d2978109336637977c165f82aa49fa16a7", + "rev": "6d3163aea47fdb1fe19744e91306a2ea4f602292", "type": "github" }, "original": { @@ -617,11 +617,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739496005, - "narHash": "sha256-qr7v18JupLdyjUhC3zczdYzUEC4zzsxGjxsVGgYzwYg=", + "lastModified": 1739516087, + "narHash": "sha256-X3WTcaL/9O3C03TZ+8PmXcn3sqCgig1RIYY/J27ZsLQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e072f4a57cad4fb92e656fd69a340c8d372cacac", + "rev": "9669e839805737ce7c66c9c05a3f97017f84cf24", "type": "github" }, "original": { @@ -650,11 +650,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1739432365, - "narHash": "sha256-uQm3OhhgUQHA5eV+0v/qAFmFHly8yHg2P+BVVy/3DcY=", + "lastModified": 1739513000, + "narHash": "sha256-LDSApEzhz3I9441ocnkkEVJu18OnGSj4a4MaxvuJYMk=", "owner": "YaLTeR", "repo": "niri", - "rev": "4c98b874862c2e6df7f71bdf36df0ba527690fbb", + "rev": "7816f20e6a3ddc4057aa1ab35742dc7f67453bc2", "type": "github" }, "original": { @@ -766,11 +766,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1739497001, - "narHash": "sha256-c3PAlD0GW6DXvYH4WXehICDHpg4N1b2sJHHFSISUXS8=", + "lastModified": 1739587053, + "narHash": "sha256-5t51C/uCWxFCrLH9SqrTtt8dkrrHzC39RoFbYqkSGjQ=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "6afdbb543d03f15243317c69733aa4271073827c", + "rev": "c5393c24280ca200ba6f4388c44253b33a7e8974", "type": "github" }, "original": { @@ -1069,11 +1069,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1739505810, - "narHash": "sha256-KYAgDKO5wjs3JZEJS44MJyDPmIwuBMNqQtWWhe4CJHA=", + "lastModified": 1739592202, + "narHash": "sha256-ghQ9Z+PONjMTv4TK0+WyMM9Ih5osZL21UdgLbbJnSek=", "owner": "rycee", "repo": "nur-expressions", - "rev": "871cfa4510f81b925f16d83477dcccb1ea866bb7", + "rev": "4e266f1da531f169f1ff3d62942cf9cd901ee579", "type": "gitlab" }, "original": { diff --git a/home/modules/programs/git.nix b/home/modules/programs/git.nix index 85769f1..42e0cea 100644 --- a/home/modules/programs/git.nix +++ b/home/modules/programs/git.nix @@ -66,6 +66,7 @@ programs.git.signing = { signByDefault = true; key = cfg.signKey; + format = "openpgp"; }; }) (lib.mkIf cfg.encrypt-credential { From 3b7980a8ff756ef42e8c1a9ab1815814f80b44af Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Mon, 17 Feb 2025 00:05:14 +0800 Subject: [PATCH 07/14] remove ssh opt in deplay node --- flake.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/flake.nix b/flake.nix index d4fbbb4..7e305eb 100644 --- a/flake.nix +++ b/flake.nix @@ -251,10 +251,6 @@ hostname = "${sshName}"; sshUser = "${unixName}"; interactiveSudo = true; - sshOpts = [ - "-i" - "/home/david/.ssh/id_ed25519_deploy" - ]; profiles = { system = { user = "${unixName}"; From 95670ad153b274dbd723ac29d20e301266300049 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Mon, 17 Feb 2025 01:33:30 +0800 Subject: [PATCH 08/14] fix homeConfiguration errors and add recipe for home-manager --- Justfile | 19 +++++++++++++-- flake.nix | 22 +++++++++++------ home/extra/default.nix | 11 +++++++++ home/extra/nix.nix | 46 ++++++++++++++++++++++++++++++++++++ home/modules/default.nix | 12 ---------- home/modules/nix.nix | 51 ---------------------------------------- nixos/modules/home.nix | 4 ---- 7 files changed, 89 insertions(+), 76 deletions(-) create mode 100644 home/extra/default.nix create mode 100644 home/extra/nix.nix delete mode 100644 home/modules/nix.nix diff --git a/Justfile b/Justfile index 769b712..4f5a40c 100755 --- a/Justfile +++ b/Justfile @@ -2,6 +2,9 @@ FLAKE_HOME := justfile_directory() DEFAULT_SPECIALISATION := "default" +DEFAULT_KEEP_SINCE := "1w" +DEFAULT_USER := env('USER') +DEFAULT_HOST := shell('hostname') default: @just --list @@ -18,15 +21,27 @@ build specialisation=DEFAULT_SPECIALISATION: deploy host: deploy {{ FLAKE_HOME }}#{{ host }} -clean keep_since="1w": - nh clean all --verbose -K {{ keep_since }} -k 5 +clean keepSince=DEFAULT_KEEP_SINCE: + nh clean all --verbose -K {{ keepSince }} -k 5 health: nix --accept-flake-config run github:juspay/nix-health +switchHome host=DEFAULT_HOST $USER=DEFAULT_USER: + @echo USER: $USER + @echo HOST: {{ host }} + nh home switch -b backup {{ if host != DEFAULT_HOST { "-c \"" + USER + "@" + host + "\"" } else { "" } }} {{ FLAKE_HOME }} + +buildHome host=DEFAULT_HOST $USER=DEFAULT_USER: + @echo USER: $USER + @echo HOST: {{ host }} + nh home build -b backup {{ if host != DEFAULT_HOST { "-c \"" + USER + "@" + host + "\"" } else { "" } }} {{ FLAKE_HOME }} + alias s := switch alias u := update alias d := deploy alias c := clean alias h := health alias b := build +alias H := switchHome +alias B := buildHome diff --git a/flake.nix b/flake.nix index 7e305eb..25a8388 100644 --- a/flake.nix +++ b/flake.nix @@ -183,15 +183,15 @@ pkgs = nixpkgs.legacyPackages."${system}"; modules = [ - (./home + "/${unixName}/configurations/${hostName}") + "${toString ./home}/${unixName}/configurations/${hostName}" ] ++ (with outputs.homeManagerModules; [ default - "${unixName}" + extra ]) - ++ (with inputs; [ - stylix.homeManagerModules.stylix - ]); + ++ [ + outputs.homeManagerModules."${unixName}" + ]; extraSpecialArgs = { inherit inputs @@ -220,18 +220,26 @@ homeManagerModules = { default = import ./home/modules; + extra = import ./home/extra; } // ( let allEntries = builtins.readDir ./home; allUsers = nixpkgs.lib.filterAttrs ( - key: value: value == "directory" && key != "modules" + key: value: + value == "directory" + && ( + !builtins.elem key [ + "modules" + "extra" + ] + ) ) allEntries; in builtins.listToAttrs ( map (name: { name = name; - value = import (./home + "/${name}/modules"); + value = import "${toString ./home}/${name}/modules"; }) (builtins.attrNames allUsers) ) ); diff --git a/home/extra/default.nix b/home/extra/default.nix new file mode 100644 index 0000000..fb437ca --- /dev/null +++ b/home/extra/default.nix @@ -0,0 +1,11 @@ +{ inputs, ... }: +{ + imports = + (with inputs; [ + niri-flake.homeModules.niri + stylix.homeManagerModules.stylix + ]) + ++ [ + ./nix.nix + ]; +} diff --git a/home/extra/nix.nix b/home/extra/nix.nix new file mode 100644 index 0000000..16fea1c --- /dev/null +++ b/home/extra/nix.nix @@ -0,0 +1,46 @@ +{ + outputs, + lib, + pkgs, + inputs, + ... +}: +{ + config = { + nixpkgs = { + config = { + allowUnfree = true; + allowUnfreePredicate = (_: true); + }; + overlays = [ + outputs.overlays.modifications + outputs.overlays.additions + ]; + }; + nix = { + package = pkgs.nix; + settings = { + inherit (outputs.nix.settings) substituters; + trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" + ]; + auto-optimise-store = lib.mkDefault true; + experimental-features = [ + "nix-command" + "flakes" + ]; + warn-dirty = false; + use-xdg-base-directories = true; + }; + registry.home = lib.mkDefault { + from = { + type = "indirect"; + id = "home"; + }; + flake = inputs.nixpkgs; + }; + }; + }; +} diff --git a/home/modules/default.nix b/home/modules/default.nix index a2aa712..d4fca85 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -1,6 +1,5 @@ { inputs, - lib, ... }: { @@ -9,21 +8,10 @@ sops-nix.homeManagerModules.sops ]) ++ [ - ./nix.nix ./programs ./xdg-dirs.nix ]; - options = { - youthlic.nixos.enable = lib.mkOption { - type = lib.types.bool; - default = false; - example = true; - description = '' - whether the os is nixos - ''; - }; - }; config = { programs.direnv = { enable = true; diff --git a/home/modules/nix.nix b/home/modules/nix.nix deleted file mode 100644 index 86a2de8..0000000 --- a/home/modules/nix.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - inputs, - lib, - config, - pkgs, - outputs, - ... -}: -{ - config = - let - cfg = config.youthlic.nixos; - in - (lib.mkIf (!cfg.enable) { - nixpkgs = { - config = { - allowUnfree = true; - allowUnfreePredicate = (_: true); - }; - overlays = [ - outputs.overlays.modifications - outputs.overlays.additions - ]; - }; - nix = { - package = pkgs.nix; - settings = { - inherit (outputs.nix.settings) substituters; - trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" - ]; - auto-optimise-store = lib.mkDefault true; - experimental-features = [ - "nix-command" - "flakes" - ]; - warn-dirty = false; - use-xdg-base-directories = true; - }; - registry.home = lib.mkDefault { - from = { - type = "indirect"; - id = "home"; - }; - flake = inputs.nixpkgs; - }; - }; - }); -} diff --git a/nixos/modules/home.nix b/nixos/modules/home.nix index 644ee18..638c072 100644 --- a/nixos/modules/home.nix +++ b/nixos/modules/home.nix @@ -50,10 +50,6 @@ outputs.homeManagerModules."${unixName}" (rootPath + "/home/${unixName}/configurations/${hostName}") ]; - - config = { - youthlic.nixos.enable = true; - }; } ); extraSpecialArgs = { From cc63f4302d8791047a7c1e00386d07b268bb5e80 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Mon, 17 Feb 2025 16:09:47 +0800 Subject: [PATCH 09/14] update flake inputs --- flake.lock | 84 +++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index 8aeeacd..0403cab 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1739607041, - "narHash": "sha256-xrwYzII4BbvErhBNmKzE11P09yRre6LRTWVP6Kt5awk=", + "lastModified": 1739750937, + "narHash": "sha256-gq/JloKsQOmmnIFYWHk1uFvtDYzVMg8OLQ7vb0aP/AA=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "898aed0492abb20186be77e02dd05c5d8959f0f4", + "rev": "938493692643c9d83781c6606055b7cb4ca2d1f0", "type": "github" }, "original": { @@ -104,11 +104,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1736423292, - "narHash": "sha256-b4Dsf7/2A+CpfpKYEwcj5Xs9ftJpoLT80onYb0WTedw=", + "lastModified": 1739675081, + "narHash": "sha256-jIid1TQIoj8aShnavvWZv6sv22wbFRd69H5KIsy44eM=", "owner": "daeuniverse", "repo": "flake.nix", - "rev": "5022a7b3895d8cfa12cbb2c0db09ed4ecf0a02b8", + "rev": "765fda6f01719fac4600c0be0b40fc81ff954c65", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1739598710, - "narHash": "sha256-x5sK19938Qsi1eWRjQrH/oSN3wT0jSVE2ZJRwDTyojs=", + "lastModified": 1739760714, + "narHash": "sha256-SaGuzIQUTC2UPwX0aTm9W4aSEUcq3h6yZbi30piej2U=", "owner": "nix-community", "repo": "disko", - "rev": "5d6c85c1d0bd634d46a9604e93bce935a06e033b", + "rev": "be1e4321c9fb3a4bc2c061dafcdb424937a74dad", "type": "github" }, "original": { @@ -442,11 +442,11 @@ "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1739595470, - "narHash": "sha256-+t87M/reiRbE+E1CM6hswNbq3aDTZKfJVQz3L8JLl/s=", + "lastModified": 1739767522, + "narHash": "sha256-VuHnvVVLFDZe9GAPH67clJNhp+H3WoRB5JfQpUbwsbk=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "f1f1120749b7494c89689d993d5a893c27c236a5", + "rev": "429c8ab277f75b581959ac5515b0c32636839168", "type": "github" }, "original": { @@ -551,11 +551,11 @@ ] }, "locked": { - "lastModified": 1739571712, - "narHash": "sha256-0UdSDV/TBY+GuxXLbrLq3l2Fq02ciyKCIMy4qmnfJXQ=", + "lastModified": 1739756364, + "narHash": "sha256-r8RxE0W3uhJ6unzbIddWTAzrpP9tMnmbj0F+DF+CTSM=", "owner": "nix-community", "repo": "home-manager", - "rev": "6d3163aea47fdb1fe19744e91306a2ea4f602292", + "rev": "662fa98bf488daa82ce8dc2bc443872952065ab9", "type": "github" }, "original": { @@ -617,11 +617,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739516087, - "narHash": "sha256-X3WTcaL/9O3C03TZ+8PmXcn3sqCgig1RIYY/J27ZsLQ=", + "lastModified": 1739775429, + "narHash": "sha256-S5Zg4TNQHgmPED2zDbNr1iLNngnRA/BD8+kpveTcm2Y=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9669e839805737ce7c66c9c05a3f97017f84cf24", + "rev": "eb71d0995d39491bb0e82911aa527cedd3c8e9c5", "type": "github" }, "original": { @@ -650,11 +650,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1739513000, - "narHash": "sha256-LDSApEzhz3I9441ocnkkEVJu18OnGSj4a4MaxvuJYMk=", + "lastModified": 1739772599, + "narHash": "sha256-ucu2a4ZJ+bn63VNBkvzIc5y/+FqKFEyQsW4YwiOMQD0=", "owner": "YaLTeR", "repo": "niri", - "rev": "7816f20e6a3ddc4057aa1ab35742dc7f67453bc2", + "rev": "d27d6a504d9d59ffcf01ea9a1ee0668f1c6d3eef", "type": "github" }, "original": { @@ -766,11 +766,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1739587053, - "narHash": "sha256-5t51C/uCWxFCrLH9SqrTtt8dkrrHzC39RoFbYqkSGjQ=", + "lastModified": 1739756353, + "narHash": "sha256-UMRlUlCXyIG9jVgDQtKCyDpgjTIHkadVo0DIOayDH6U=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "c5393c24280ca200ba6f4388c44253b33a7e8974", + "rev": "0d64f87dff6778231ae0288cca71e78e2ab30752", "type": "github" }, "original": { @@ -893,11 +893,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1739624908, + "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "a60651b217d2e529729cbc7d989c19f3941b9250", "type": "github" }, "original": { @@ -909,11 +909,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1739624908, + "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "a60651b217d2e529729cbc7d989c19f3941b9250", "type": "github" }, "original": { @@ -989,11 +989,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1739580444, + "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "8bb37161a0488b89830168b81c48aed11569cb93", "type": "github" }, "original": { @@ -1005,11 +1005,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1739580444, + "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "8bb37161a0488b89830168b81c48aed11569cb93", "type": "github" }, "original": { @@ -1021,11 +1021,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1739580444, + "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "8bb37161a0488b89830168b81c48aed11569cb93", "type": "github" }, "original": { @@ -1069,11 +1069,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1739592202, - "narHash": "sha256-ghQ9Z+PONjMTv4TK0+WyMM9Ih5osZL21UdgLbbJnSek=", + "lastModified": 1739764997, + "narHash": "sha256-DmH4o7ZkP9ZPdzKf+ZukZrPl8fmENtk/1/vQ0E0Popk=", "owner": "rycee", "repo": "nur-expressions", - "rev": "4e266f1da531f169f1ff3d62942cf9cd901ee579", + "rev": "8c7b2cbbbf02fd4ee878d3681d6d5019e0489446", "type": "gitlab" }, "original": { From d345637718d5c1afa099a0920213e35732d976c9 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Wed, 19 Feb 2025 23:59:39 +0800 Subject: [PATCH 10/14] update flake inputs --- flake.lock | 102 +++++++++++++----------------- flake.nix | 5 +- home/modules/programs/firefox.nix | 2 +- 3 files changed, 49 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index 0403cab..926b30e 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1739750937, - "narHash": "sha256-gq/JloKsQOmmnIFYWHk1uFvtDYzVMg8OLQ7vb0aP/AA=", + "lastModified": 1739952560, + "narHash": "sha256-q8XiwAvzI4TQiEfGek2fv44w3Sbhp+n5+LCDoDiQoas=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "938493692643c9d83781c6606055b7cb4ca2d1f0", + "rev": "c85ae1eb9ef2227c03697d832f3dfa478f4488d2", "type": "github" }, "original": { @@ -104,11 +104,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1739675081, - "narHash": "sha256-jIid1TQIoj8aShnavvWZv6sv22wbFRd69H5KIsy44eM=", + "lastModified": 1739818508, + "narHash": "sha256-j1mObDf568t5Sof0sVmTntt4WTRJSM1s5pjSl9UinpI=", "owner": "daeuniverse", "repo": "flake.nix", - "rev": "765fda6f01719fac4600c0be0b40fc81ff954c65", + "rev": "f155ec22984400cf90e150a0ad8ba4137a57c2fe", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1739760714, - "narHash": "sha256-SaGuzIQUTC2UPwX0aTm9W4aSEUcq3h6yZbi30piej2U=", + "lastModified": 1739841949, + "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", "owner": "nix-community", "repo": "disko", - "rev": "be1e4321c9fb3a4bc2c061dafcdb424937a74dad", + "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", "type": "github" }, "original": { @@ -442,11 +442,11 @@ "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1739767522, - "narHash": "sha256-VuHnvVVLFDZe9GAPH67clJNhp+H3WoRB5JfQpUbwsbk=", + "lastModified": 1739918167, + "narHash": "sha256-6zdYjNKqMTKfHKlaz0kKqqSmoSCqEjv1vyIygqi3wCo=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "429c8ab277f75b581959ac5515b0c32636839168", + "rev": "38908e01268298ced33b7b6835e49b8c6d437e12", "type": "github" }, "original": { @@ -530,11 +530,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1739457098, - "narHash": "sha256-a4zUQTpHagz1Kb3kLxcflsiF05FsHlrzXEuCjbzjAOM=", + "lastModified": 1739979006, + "narHash": "sha256-B/GPEfoUdX33U4F65pKPRm8AwElQP5hYply+HC9YMDo=", "owner": "helix-editor", "repo": "helix", - "rev": "7275b7f85014aad7e15d4987ec4f2249572eecfb", + "rev": "d031260180cf87dd713438f6bb1a6e7879dbb613", "type": "github" }, "original": { @@ -551,11 +551,11 @@ ] }, "locked": { - "lastModified": 1739756364, - "narHash": "sha256-r8RxE0W3uhJ6unzbIddWTAzrpP9tMnmbj0F+DF+CTSM=", + "lastModified": 1739913864, + "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=", "owner": "nix-community", "repo": "home-manager", - "rev": "662fa98bf488daa82ce8dc2bc443872952065ab9", + "rev": "97ac0801d187b2911e8caa45316399de12f6f199", "type": "github" }, "original": { @@ -617,11 +617,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739775429, - "narHash": "sha256-S5Zg4TNQHgmPED2zDbNr1iLNngnRA/BD8+kpveTcm2Y=", + "lastModified": 1739944956, + "narHash": "sha256-qGOyv8cudQw1KIHNckU/eo09zjcc4NPis8J4v+XeXDE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "eb71d0995d39491bb0e82911aa527cedd3c8e9c5", + "rev": "8bfb763f07fd9106e032590d071c30450e3b80f6", "type": "github" }, "original": { @@ -650,11 +650,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1739772599, - "narHash": "sha256-ucu2a4ZJ+bn63VNBkvzIc5y/+FqKFEyQsW4YwiOMQD0=", + "lastModified": 1739940569, + "narHash": "sha256-r624MtdcINkMlyXvvizg8b6Ig1fv4lLvjdgKM2ejaS0=", "owner": "YaLTeR", "repo": "niri", - "rev": "d27d6a504d9d59ffcf01ea9a1ee0668f1c6d3eef", + "rev": "74787843430cff26c5308e95051b7e9f5dc4252c", "type": "github" }, "original": { @@ -766,11 +766,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1739756353, - "narHash": "sha256-UMRlUlCXyIG9jVgDQtKCyDpgjTIHkadVo0DIOayDH6U=", + "lastModified": 1739909000, + "narHash": "sha256-DsepQ7ApA4li8td4QFTmX2qs4gvCLfoN7Mlaifmji7Y=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "0d64f87dff6778231ae0288cca71e78e2ab30752", + "rev": "5516035bb36dbb19f2bbe7b9cea6922db395e100", "type": "github" }, "original": { @@ -781,11 +781,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738816619, - "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "lastModified": 1739798439, + "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", "type": "github" }, "original": { @@ -893,11 +893,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1739624908, - "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", + "lastModified": 1739758141, + "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a60651b217d2e529729cbc7d989c19f3941b9250", + "rev": "c618e28f70257593de75a7044438efc1c1fc0791", "type": "github" }, "original": { @@ -989,11 +989,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1739580444, - "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bb37161a0488b89830168b81c48aed11569cb93", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -1020,22 +1020,6 @@ } }, "nixpkgs_5": { - "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_6": { "locked": { "lastModified": 1736798957, "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", @@ -1069,11 +1053,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1739764997, - "narHash": "sha256-DmH4o7ZkP9ZPdzKf+ZukZrPl8fmENtk/1/vQ0E0Popk=", + "lastModified": 1739937805, + "narHash": "sha256-jvf656iWhtPUb1rebWlhD8RttLjxH5KwCtqm3qONKh4=", "owner": "rycee", "repo": "nur-expressions", - "rev": "8c7b2cbbbf02fd4ee878d3681d6d5019e0489446", + "rev": "438985bb1767cc1b5c21053b7338c7900225a611", "type": "gitlab" }, "original": { @@ -1145,7 +1129,10 @@ "niri-flake": "niri-flake", "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ], "nur-rycee": "nur-rycee", "nur-xddxdd": "nur-xddxdd", "oskars-dotfiles": "oskars-dotfiles", @@ -1227,7 +1214,7 @@ "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "systems": "systems_7", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", @@ -1246,6 +1233,7 @@ "original": { "owner": "danth", "repo": "stylix", + "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 25a8388..8d1f268 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,8 @@ description = "A simple NixOS flakes"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.follows = "nixos-cosmic/nixpkgs"; helix = { url = "github:helix-editor/helix/master"; @@ -63,7 +64,7 @@ }; stylix = { - url = "github:danth/stylix"; + url = "github:danth/stylix?rev=e86de61bb8f5f2b6459d0be3e3291ad16db4b777"; }; disko = { diff --git a/home/modules/programs/firefox.nix b/home/modules/programs/firefox.nix index 746c0d3..c847557 100644 --- a/home/modules/programs/firefox.nix +++ b/home/modules/programs/firefox.nix @@ -25,7 +25,7 @@ in profiles.default = { name = "default"; isDefault = true; - extensions = with outputs.packages."${system}"; [ + extensions.packages = with outputs.packages."${system}"; [ immersive-translate tridactyl ]; From cb7c985616fda84e78c2e51e22ca1be1ccd3f24e Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 20 Feb 2025 14:11:24 +0800 Subject: [PATCH 11/14] 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 12/14] 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 13/14] 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 14/14] 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": {