diff --git a/flake.lock b/flake.lock index 85d72ad..de565bb 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1777049909, - "narHash": "sha256-t06XtDZpzxLxsq7nVxeMqppllJd4E0RMykDK+k1+CMM=", + "lastModified": 1777475243, + "narHash": "sha256-EiCeDGJewyWq2Mtdt5m8qyo/W5PXVUCacLuZJ/diBQ8=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "7fa6541ef5e4d5c95d526a0c0dfb872648f85ab5", + "rev": "12e7b06163456e4c3685ee83b8fdc277fe03bdc8", "type": "github" }, "original": { @@ -20,48 +20,16 @@ "type": "github" } }, - "cachyos-kernel": { - "flake": false, - "locked": { - "lastModified": 1776881435, - "narHash": "sha256-j8AobLjMzeKJugseObrVC4O5k7/aZCWoft2sCS3jWYs=", - "owner": "CachyOS", - "repo": "linux-cachyos", - "rev": "1c61dfd1c3ad7762faa0db8b06c6af6c59cc4340", - "type": "github" - }, - "original": { - "owner": "CachyOS", - "repo": "linux-cachyos", - "type": "github" - } - }, - "cachyos-kernel-patches": { - "flake": false, - "locked": { - "lastModified": 1777002108, - "narHash": "sha256-PIZCIf6xUTOUqLFbEGH0mSwu2O/YfeAmYlgdAbP4dhs=", - "owner": "CachyOS", - "repo": "kernel-patches", - "rev": "46476ae2538db486462aef8a9de37d19030cdaf2", - "type": "github" - }, - "original": { - "owner": "CachyOS", - "repo": "kernel-patches", - "type": "github" - } - }, "disko": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1776613567, - "narHash": "sha256-gC9Cp5ibBmGD5awCA9z7xy6MW6iJufhazTYJOiGlCUI=", + "lastModified": 1777713215, + "narHash": "sha256-8GzXDOXckDWwST8TY5DbwYFjdvQLlP7K9CLSVx6iTTo=", "owner": "nix-community", "repo": "disko", - "rev": "32f4236bfc141ae930b5ba2fb604f561fed5219d", + "rev": "63b4e7e6cf75307c1d26ac3762b886b5b0247267", "type": "github" }, "original": { @@ -73,15 +41,15 @@ "dms": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "quickshell": "quickshell" }, "locked": { - "lastModified": 1777161418, - "narHash": "sha256-+H6YJckJZD+JaUWCUOTaVmx7S3JChrf0UzsrtQQ1Vcg=", + "lastModified": 1777817071, + "narHash": "sha256-/W6ia59izAqnuel6ro7K96DPYxN98cvYhz7o9FcNSgI=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "28f68ac702960b5179808db1a0870b16c5d5c3b3", + "rev": "434490e100cd25b717e26dbd05d488b2e6ddab01", "type": "github" }, "original": { @@ -97,11 +65,11 @@ ] }, "locked": { - "lastModified": 1777168306, - "narHash": "sha256-ADeKQ14Nw5UO18tP5y07WxN7o9SfhcJ4/jq3jvZryyI=", + "lastModified": 1777773446, + "narHash": "sha256-UgLLbyRdv7gDqGvZeNYpvTOj9qOnUG0s8MCbMVnhjfU=", "owner": "AvengeMedia", "repo": "dms-plugin-registry", - "rev": "c7acc54f58f3c81a5e19f5f9ceb3958702a3f597", + "rev": "0ba261d1e2acc88454c849e4f042add1bc92d235", "type": "github" }, "original": { @@ -142,38 +110,18 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, + "flake-schemas": { "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" + "lastModified": 1721999734, + "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", + "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", + "revCount": 75, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" }, "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" } }, "flake-utils": { @@ -201,11 +149,11 @@ ] }, "locked": { - "lastModified": 1777236726, - "narHash": "sha256-ZTYDofOM3/PJhRF1EuBh6uibm+DmkhU7Wor6mMN7YTc=", + "lastModified": 1777815398, + "narHash": "sha256-MrIhEoqXc4YsHEUfH4rDU/K09XnWcKntNhCjs7n7zi8=", "owner": "nix-community", "repo": "home-manager", - "rev": "e82d4a4ecd18363aa2054cbaa3e32e4134c3dbf4", + "rev": "b5e86c1b19f178a8ee10f7cb747325e02e3d3991", "type": "github" }, "original": { @@ -215,6 +163,27 @@ } }, "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nyx-loner", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1777733408, + "narHash": "sha256-lyKV2GtkMPS1Mp8bKJ8sBr7LPCzL4GnVnQQYa4e7UsQ=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "9ce9f7f128c5834bb71a4f5c62232187371379b6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { "inputs": { "nixpkgs": [ "zen-browser", @@ -235,21 +204,43 @@ "type": "github" } }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "nyx-loner", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1777614199, + "narHash": "sha256-k8fgidVoDNQTZWGLdhe6kLgpsLcydhPzal5YKVwxD2U=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "79f3e3cc5c643138b7b3405c42681451be85d838", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, "niri": { "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1777240421, - "narHash": "sha256-ooPmu+8tqOGh4kozPW4rJC7Y7WM/FHtEY3OK1PoNW7g=", + "lastModified": 1777815637, + "narHash": "sha256-jQnoHmnFgUWYDNosplgd5eFnUTT0MtEj2w9HCA4g1C0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "2bb22af2985e5f3cfd051b3d977ebfbf81126280", + "rev": "945748d71d3422d4f1dada2cd10222e34ed9d767", "type": "github" }, "original": { @@ -278,11 +269,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1777237919, - "narHash": "sha256-bZHBzo4EuW/xLzXnnMKsIMdZYqgY2O0mIMdplwDHB8Y=", + "lastModified": 1777733745, + "narHash": "sha256-1TlpdT0WYyBGtUS3PH4oXHUmdno2EUh2TfHadK2BmJo=", "owner": "YaLTeR", "repo": "niri", - "rev": "a85b922919815c32a3ae34e0838830fe522d6a1c", + "rev": "1f07cffa9f355298a31d7efe1b400ede93a97728", "type": "github" }, "original": { @@ -291,25 +282,26 @@ "type": "github" } }, - "nix-cachyos-kernel": { + "nix-github-actions": { "inputs": { - "cachyos-kernel": "cachyos-kernel", - "cachyos-kernel-patches": "cachyos-kernel-patches", - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_6" + "nixpkgs": [ + "nyx-loner", + "jovian", + "nixpkgs" + ] }, "locked": { - "lastModified": 1777227006, - "narHash": "sha256-A7GcOXjfo2xmZ3ERgN0j6GcqaVzqIf5zpYQcdfDaMr0=", - "owner": "xddxdd", - "repo": "nix-cachyos-kernel", - "rev": "0f7e2bea4088227a80502557f6c0e3b74949d6b5", + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", "type": "github" }, "original": { - "owner": "xddxdd", - "repo": "nix-cachyos-kernel", + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", "type": "github" } }, @@ -329,28 +321,13 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-master": { "locked": { - "lastModified": 1777246344, - "narHash": "sha256-W3stiV/1owRrs4FqONa8DWbjbDplql7+rJdsRwYa/vo=", + "lastModified": 1777821564, + "narHash": "sha256-3YL9ibR4WMhzj8OdffFMCm35vjJL6JERJSiPwZmJb8s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f5ed8a78b090e6e4f16b3a740ea678c030c74d65", + "rev": "d474d1d274976539f1a01b00afdffd3055e03045", "type": "github" }, "original": { @@ -361,11 +338,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1777077449, - "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=", + "lastModified": 1777673416, + "narHash": "sha256-5c2POKPOjU40Kh0MirOdScBLG0bu9TAuPYAtPRNZMBs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160", + "rev": "26ef669cffa904b6f6832ab57b77892a37c1a671", "type": "github" }, "original": { @@ -377,11 +354,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1777077449, - "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=", + "lastModified": 1777673416, + "narHash": "sha256-5c2POKPOjU40Kh0MirOdScBLG0bu9TAuPYAtPRNZMBs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160", + "rev": "26ef669cffa904b6f6832ab57b77892a37c1a671", "type": "github" }, "original": { @@ -392,22 +369,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1773628058, "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=", @@ -423,7 +384,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1776169885, "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", @@ -439,13 +400,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1776877367, - "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", + "lastModified": 1777578337, + "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", + "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", "type": "github" }, "original": { @@ -455,29 +416,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { - "lastModified": 1777187199, - "narHash": "sha256-RJlLGrl+xHndIVK1NbPkIsItePNB3X4PIe8UTk3AHnw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "facea5e538604efa4893c08770fe9fca5bf62c2f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1776949667, - "narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=", + "lastModified": 1777641297, + "narHash": "sha256-WNGcmeOZ8Tr9dq6ztCspYbzWFswr2mPebM9LpsfGxPk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30", + "rev": "c6d65881c5624c9cae5ea6cedef24699b0c0a4c0", "type": "github" }, "original": { @@ -487,13 +432,29 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { - "lastModified": 1776877367, - "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", + "lastModified": 1777641297, + "narHash": "sha256-WNGcmeOZ8Tr9dq6ztCspYbzWFswr2mPebM9LpsfGxPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", + "rev": "c6d65881c5624c9cae5ea6cedef24699b0c0a4c0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1777578337, + "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", "type": "github" }, "original": { @@ -511,11 +472,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1777079905, - "narHash": "sha256-TvYEXwkZnRFQRuFyyqTNSfPnU2tMdhtiBOXSk2AWLJA=", + "lastModified": 1777772763, + "narHash": "sha256-MIFrNTX+x42UdOiL9lWmwyyymh80/pxtU4afvEizZDk=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "a50c92167c8d438000270f7eca36f6eea74f388e", + "rev": "f0469d2d6f9b1ca873932dcef6583f9d6a2eee28", "type": "github" }, "original": { @@ -534,11 +495,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1776585574, - "narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=", + "lastModified": 1777380063, + "narHash": "sha256-q5mWOEICcZzr+KnjIwDHV9EXiBxOC9cnBpxZbDAViU8=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add", + "rev": "8742a7a748c43bf44eb6862a8ebd3591ed71502d", "type": "github" }, "original": { @@ -547,10 +508,32 @@ "type": "github" } }, + "nyx-loner": { + "inputs": { + "flake-schemas": "flake-schemas", + "home-manager": "home-manager_2", + "jovian": "jovian", + "nixpkgs": "nixpkgs_6", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1777746234, + "narHash": "sha256-7sFNtEl36c8vo50CGn1dH4ewBT9kmRIgTYYT4JLuf6o=", + "owner": "lonerOrz", + "repo": "nyx-loner", + "rev": "a81252dffc4c04ac7e8aa93595e0256dca40af00", + "type": "github" + }, + "original": { + "owner": "lonerOrz", + "repo": "nyx-loner", + "type": "github" + } + }, "preload-ng": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1768356181, @@ -595,11 +578,11 @@ ] }, "locked": { - "lastModified": 1777089709, - "narHash": "sha256-bZoy6qxL6Dbptt6PABvuhGKbyjuoyI7SQ1tzxM9g/QM=", + "lastModified": 1777706159, + "narHash": "sha256-TuD8hw9lkRCEb+6v93iB7HDvcmvH8R0qyD6wBmPGfv8=", "ref": "refs/heads/master", - "rev": "11a71d233a566caba4ddffdca2e41d1fa79e45b1", - "revCount": 808, + "rev": "8db8ca1fecfcce8def1f9265fa1742baa0e0c271", + "revCount": 813, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -616,11 +599,11 @@ "dms-plugin-registry": "dms-plugin-registry", "home-manager": "home-manager", "niri": "niri", - "nix-cachyos-kernel": "nix-cachyos-kernel", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_5", "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable_2", "noctalia": "noctalia", + "nyx-loner": "nyx-loner", "preload-ng": "preload-ng", "quickshell": "quickshell_2", "shiru": "shiru", @@ -629,7 +612,10 @@ }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "aagl", + "nixpkgs" + ] }, "locked": { "lastModified": 1770952264, @@ -645,6 +631,27 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "nyx-loner", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1777691680, + "narHash": "sha256-sdCAzrPAaKu+yo7L2pWddy5PN6U9bO++WEWc1zcr7aQ=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "4757db4358c77c1cbe878fa5990e6ea88d82f6b5", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "shiru": { "inputs": { "nixpkgs": [ @@ -752,17 +759,17 @@ }, "zen-browser": { "inputs": { - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1777218171, - "narHash": "sha256-+JGU5Cw6Zm3XVl3xBCkbY7/lTxfLQpjuuhF0IB4dJ8k=", + "lastModified": 1777564084, + "narHash": "sha256-O9VRkxg+2j+sh+c73wi4VeIBECoqW2PlnCR9Qe1nQKA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8a8e30610393c7f1a766a119dea37bf82d0ebcf6", + "rev": "d93443c0f6fdb3b179bed68856f322dba4842612", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7145852..b78e9b2 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,8 @@ preload-ng.url = "github:miguel-b-p/preload-ng"; aagl.url = "github:ezKEa/aagl-gtk-on-nix"; disko.url = "github:nix-community/disko"; - nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel"; + #nix-cachyos.url = "github:xddxdd/nix-cachyos-kernel"; + nyx-loner.url = "github:lonerOrz/nyx-loner"; home-manager = { url = "github:nix-community/home-manager/"; inputs.nixpkgs.follows = "nixpkgs"; @@ -50,7 +51,7 @@ noctalia, niri, disko, - nix-cachyos-kernel, + nyx-loner, ... }@inputs: { @@ -63,10 +64,8 @@ ./hosts/Alfa/configuration.nix ./mods/nixos/nixos.nix preload-ng.nixosModules.default - #niri.nixosModules.niri - #sops-nix.nixosModules.sops { services.preload-ng.enable = true; } - #chaotic.nixosModules.default + nyx-loner.nixosModules.default { imports = [ aagl.nixosModules.default ]; nix.settings = aagl.nixConfig; @@ -84,6 +83,7 @@ specialArgs = { inherit inputs; }; modules = [ ./hosts/darkgui-vps/configuration.nix + nyx-loner.nixosModules.default ]; }; }; diff --git a/hosts/Alfa/conf/GM/DE/niri/niri.nix b/hosts/Alfa/conf/GM/DE/niri/niri.nix index 6592262..82b6654 100644 --- a/hosts/Alfa/conf/GM/DE/niri/niri.nix +++ b/hosts/Alfa/conf/GM/DE/niri/niri.nix @@ -15,8 +15,8 @@ imports = [ ./thunar.nix - ./dms.nix - #./noctalia.nix + #./dms.nix + ./noctalia.nix ]; services.dbus.enable = true; diff --git a/hosts/Alfa/conf/GM/configs/nixhelper.nix b/hosts/Alfa/conf/GM/configs/nixhelper.nix index 30e4999..feda378 100644 --- a/hosts/Alfa/conf/GM/configs/nixhelper.nix +++ b/hosts/Alfa/conf/GM/configs/nixhelper.nix @@ -53,11 +53,16 @@ ); settings.flake-registry = ""; - settings.substituters = [ "https://attic.xuyh0120.win/lantian" ]; - settings.trusted-public-keys = [ "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ]; + settings.substituters = [ "https://cache.garnix.io" ]; + settings.trusted-public-keys = [ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; + }; + + # chaotic + chaotic.nyx = { + cache.enable = true; + overlay.enable = true; }; - nixpkgs.overlays = [ inputs.nix-cachyos-kernel.overlays.pinned ]; services = { flatpak = { enable = true; diff --git a/hosts/Alfa/conf/GM/configs/patchs.nix b/hosts/Alfa/conf/GM/configs/patchs.nix index 253f5f4..7bf7515 100644 --- a/hosts/Alfa/conf/GM/configs/patchs.nix +++ b/hosts/Alfa/conf/GM/configs/patchs.nix @@ -57,8 +57,9 @@ ATTR{vendor}=="0x10de", ATTR{class}=="0x03[0-9]*", \ TEST=="power/control", ATTR{power/control}="on" - # enable udev xiaomi - SUBSYSTEM=="usb", ATTR{idVendor}=="2717", MODE="0666", GROUP="plugdev" + # atack shark + KERNEL=="hidraw*", ATTRS{idVendor}=="1d57", ATTRS{idProduct}=="fa60", MODE="0666", SYMLINK+="xenta-mouse-hidraw", TAG+="uaccess" + KERNEL=="hidraw*", ATTRS{idVendor}=="1d57", ATTRS{idProduct}=="fa55", MODE="0666", SYMLINK+="xenta-mouse-hidraw", TAG+="uaccess" ''; }; diff --git a/hosts/Alfa/configuration.nix b/hosts/Alfa/configuration.nix index 92146de..c6c2b39 100644 --- a/hosts/Alfa/configuration.nix +++ b/hosts/Alfa/configuration.nix @@ -14,8 +14,9 @@ ## Configuraçãao do bootloader boot = { - kernelPackages = pkgs.linuxPackages_latest; - #kernelPackages = pkgs.linux-cachyos-latest-lto-x86_64-v3; + #kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_cachyos-lto; + #kernelPackages = inputs.nix-cachyos.legacyPackages.x86_64-linux.linuxPackages-cachyos-latest-lto-x86_64-v3; loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; loader.systemd-boot.configurationLimit = 10; diff --git a/hosts/darkgui-vps/config/nix-helper.nix b/hosts/darkgui-vps/config/nix-helper.nix index 32135cf..8ee8054 100644 --- a/hosts/darkgui-vps/config/nix-helper.nix +++ b/hosts/darkgui-vps/config/nix-helper.nix @@ -21,6 +21,11 @@ }; }; + chaotic.nyx = { + cache.enable = true; + overlay.enable = true; + }; + nix.package = pkgs.lixPackageSets.stable.lix; } diff --git a/hosts/darkgui-vps/configuration.nix b/hosts/darkgui-vps/configuration.nix index e5b6b92..b31ca79 100644 --- a/hosts/darkgui-vps/configuration.nix +++ b/hosts/darkgui-vps/configuration.nix @@ -17,6 +17,7 @@ in ]; boot = { + kernelPackages = pkgs.linuxPackages_cachyos-server; loader = { systemd-boot.enable = true; efi = {