From badcab8b04ae84383ab1ac638cc50916dc7322ec Mon Sep 17 00:00:00 2001 From: EinEtwas Date: Wed, 23 Oct 2024 23:08:42 +0200 Subject: [PATCH 1/3] feat: switch from nix to (lesbian)nix ((lix)) --- flake.lock | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++---- flake.nix | 9 ++++- 2 files changed, 98 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 22fae22..3c6457e 100644 --- a/flake.lock +++ b/flake.lock @@ -74,6 +74,39 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flakey-profile": { + "locked": { + "lastModified": 1712898590, + "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -115,6 +148,41 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1729298361, + "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=", + "rev": "ad9d06f7838a25beec425ff406fe68721fef73be", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils", + "flakey-profile": "flakey-profile", + "lix": "lix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729360442, + "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=", + "rev": "9098ac95768f7006d7e070b88bae76939f6034e6", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -137,11 +205,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729509737, - "narHash": "sha256-8OHgqz+tFo21h3hg4/GHizFPws+MMzpEru/+62Z0E8c=", + "lastModified": 1729690929, + "narHash": "sha256-cTSekmupaDfrhlpLhBUBrU9mUzBaD6mYsMveTX0bKDg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cc2d3c0e060f981905d52337340ee6ec8b8eb037", + "rev": "64d900abe40057393148bc0283d35c2254dd4f57", "type": "github" }, "original": { @@ -188,6 +256,7 @@ "agenix": "agenix", "catppuccin": "catppuccin", "home-manager": "home-manager_2", + "lix-module": "lix-module", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", @@ -202,11 +271,11 @@ ] }, "locked": { - "lastModified": 1729570661, - "narHash": "sha256-gZj1hMVvZjE4inSUElqQuA9iiUioB/zIqgl0i3XcliU=", + "lastModified": 1729657027, + "narHash": "sha256-olxRDZg+/cQZQPW9pEcKfyubHEzqvQsGRrQBw9kTBGg=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "96cf0aad6fe67a31567a51e54dc6b9fcbe90626a", + "rev": "b9d886969141231ca687a915a2c33b3e85c3085c", "type": "github" }, "original": { @@ -229,6 +298,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 34a333e..9f215f8 100644 --- a/flake.nix +++ b/flake.nix @@ -24,9 +24,15 @@ url = "github:nix-community/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; + + # lesbian the nix + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, nixos-hardware, agenix, spicetify-nix, nix-index-database, ... } @ inputs: { + outputs = { self, nixpkgs, nixos-hardware, agenix, spicetify-nix, nix-index-database, lix-module, ... } @ inputs: { nixosConfigurations.rhea-laptop = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; @@ -39,6 +45,7 @@ # List all Modules to load modules = [ nixos-hardware.nixosModules.framework-13-7040-amd + lix-module.nixosModules.default nix-index-database.nixosModules.nix-index agenix.nixosModules.default ./modules From 78f401306143092c0f43aea7763c67907ae72ff6 Mon Sep 17 00:00:00 2001 From: EinEtwas Date: Wed, 23 Oct 2024 23:12:41 +0200 Subject: [PATCH 2/3] feat: configure my own git host :3 --- home/default.nix | 6 ++++++ home/ssh.nix | 7 +++++++ secrets/gcd_etwas.age | Bin 0 -> 623 bytes secrets/secrets.nix | 1 + 4 files changed, 14 insertions(+) create mode 100644 secrets/gcd_etwas.age diff --git a/home/default.nix b/home/default.nix index f46fc54..aa598ca 100644 --- a/home/default.nix +++ b/home/default.nix @@ -16,6 +16,12 @@ owner = "rhea"; symlink = false; }; + age.secrets.gcd_etwas = { + file = ../secrets/1bvps.age; + path = "/home/rhea/.ssh/id_gcd_etwas"; + owner = "rhea"; + symlink = false; + }; nix.extraOptions = '' !include ${config.age.secrets.access-tokens-github.path} diff --git a/home/ssh.nix b/home/ssh.nix index ae6029e..db439dd 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -9,6 +9,13 @@ hostname = "178.254.43.196"; identityFile = [ "/home/rhea/.ssh/id_1bvps" ]; }; + "gcd-etwas" = { + host = "gcd-etwas"; + hostname = "git.catgirl.dog"; + identityFile = [ "/home/rhea/.ssh/id_gcd_etwas" ]; + user = "git"; + port = 222; + }; }; }; } \ No newline at end of file diff --git a/secrets/gcd_etwas.age b/secrets/gcd_etwas.age new file mode 100644 index 0000000000000000000000000000000000000000..862078d58aaa1ed094b9c44dda22b96ffdc629dd GIT binary patch literal 623 zcmV-#0+9V-XJsvAZewzJaCB*JZZ2oeE%Y0lNin2h(g@N8^fEsE^BLzQ1ecO2}oti24WLSrEQ2O32)S?z?qeKOpJ<`2%e`u2$nXW}~`ozzl zb2@7798|m+q6h`_XaN2P!E{EKE;HRRZ3}Pn01`@p7CS;oMv^iK?P2h*F0Fpu5cN_6#Ji zGao5bkcBR=LMsP?a6RAxy9&c^xrDIced4RU$wD@5{)?C9PR;qtKLO(J4Lp@%5;$K? zGdk3B3*T+wE)kiHkXLP!zad!rAGw9M@m&t-MGUq`kmQ#2UFa1>Y#TI)I)-h>sS@Q# JVnUUyt_X%F56=Jq literal 0 HcmV?d00001 diff --git a/secrets/secrets.nix b/secrets/secrets.nix index c71314c..c3418ba 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -5,4 +5,5 @@ in { "gh.age".publicKeys = [ rhea-laptop ]; "1bvps.age".publicKeys = [ rhea-laptop ]; + "gcd_etwas.age".publicKeys = [ rhea-laptop ]; } \ No newline at end of file From 7987f4cb1af756bbfaf94f8d9cc5d6c4f3c57d19 Mon Sep 17 00:00:00 2001 From: EinEtwas Date: Wed, 23 Oct 2024 23:13:02 +0200 Subject: [PATCH 3/3] feat: add rust rover --- home/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/packages.nix b/home/packages.nix index 4358483..a5ee011 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -34,6 +34,7 @@ jetbrains.idea-ultimate jetbrains.pycharm-professional jetbrains.jdk + jetbrains.rust-rover ]; nixpkgs.config.vesktop.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland"; }