From 9b41e3166ff1b3ecc67bfad0b67ddb2532c099cd Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Mon, 11 Mar 2024 03:46:50 +0100 Subject: [PATCH 01/13] Add ntpd-rs --- os-mods/common/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/os-mods/common/default.nix b/os-mods/common/default.nix index 1c6ae3c..71c052f 100644 --- a/os-mods/common/default.nix +++ b/os-mods/common/default.nix @@ -144,6 +144,7 @@ fwupd.enable = true; envfs.enable = true; + ntpd-rs.enable = true; openssh = { enable = true; -- 2.45.3 From 7a94be5a157f27c25d5faafc215776e9580e3274 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Mon, 11 Mar 2024 03:47:05 +0100 Subject: [PATCH 02/13] Update flakes --- flake.lock | 88 +++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index 87aad30..0a2b294 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1709671057, - "narHash": "sha256-XeLk+BiqAZRsII3MSDdAIIVKIr5vK5bRMAsAvBGKnO4=", + "lastModified": 1709828095, + "narHash": "sha256-subJqhj34TJ00C0qbGPUkozt4nMNi5DZltw/i4xmgVE=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "70b0b2722d25eed713c66fb1b533777d4f10ae9a", + "rev": "9b54befbe7993ed2abe91f4d76e259b3e8f9d922", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1709682352, - "narHash": "sha256-71S/64RbyADT6FUVJq4WLiNbmcxFvgMsSihf/C2Hgno=", + "lastModified": 1709967935, + "narHash": "sha256-ZLLdGWs9njivxZsfSzfQN05g6WIyIe24bPb61y7FVqo=", "owner": "nix-community", "repo": "disko", - "rev": "ad5e8bd14df2e6bdb836582577dc163318617738", + "rev": "72818e54ec29427f8d9f9cfa6fc859d01ca6dc66", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1709715989, - "narHash": "sha256-x8nsKGkLCq+i1pHj+Jr29GpPkYQrVQjrvJ7Kb3ogY30=", + "lastModified": 1710034490, + "narHash": "sha256-n3pEX8Ji498tu2ht86mL1aaK6mWQSS6hwk7M2SoXh6Y=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "984860d0f4f5c3a6d1d92d0ac3cd1c081408e138", + "rev": "f7c18159c781e56a74d3352ef2865929fc122c61", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1709726282, - "narHash": "sha256-4S5EFTLeI90XzOT4MdEC+3emCdR8B7/OPSiwC6/3cKg=", + "lastModified": 1709988192, + "narHash": "sha256-qxwIkl85P0I1/EyTT+NJwzbXdOv86vgZxcv4UKicjK8=", "owner": "nix-community", "repo": "home-manager", - "rev": "613384a51119ea34af58eb5e611e7f31dd3970d6", + "rev": "b0b0c3d94345050a7f86d1ebc6c56eea4389d030", "type": "github" }, "original": { @@ -551,11 +551,11 @@ ] }, "locked": { - "lastModified": 1709295149, - "narHash": "sha256-+blV8vKyvh3gYnUFYTOu2yuWxEEBqwS7hfLm6qdpoe4=", + "lastModified": 1709744297, + "narHash": "sha256-Q2LOs08hmFlzJdJMN4yNrWvZTegfpHEajLin0vcw7t0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0ef51034dcc8b65b8be72eedd0d5db7d426ea054", + "rev": "f8e3302ee1e0ccaabc443f45dc415e117b54926f", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1709486703, - "narHash": "sha256-AIDAnQja0/2YsZb6Rxa//gH9uV0QmVs/vsVXj2DAd7s=", + "lastModified": 1709786138, + "narHash": "sha256-yppQIffjpyQ2nqhiZbV2pSMQJx8srmHjAk+UClCQfRw=", "owner": "martinvonz", "repo": "jj", - "rev": "415ae5c0f9ed4d45df564a4aca6d327485a445bf", + "rev": "bf76080f42f77cad934d9a5202c7b7d29ab2c890", "type": "github" }, "original": { @@ -614,11 +614,11 @@ ] }, "locked": { - "lastModified": 1709481412, - "narHash": "sha256-QDRnTQQ9+4LIm+yhG7vFVs/NH3511nYLUW6PQXSamAw=", + "lastModified": 1709751999, + "narHash": "sha256-9I0bn0iSdYXHIPhU1Ne8Ooxfnut/qMtNDutBii9NxQE=", "owner": "YaLTeR", "repo": "niri", - "rev": "2750b2038bed5495bcdfeacc7be25267d15ceab1", + "rev": "1a784e6e66785f360da6df59ae2fb4b98370ca3c", "type": "github" }, "original": { @@ -731,11 +731,11 @@ ] }, "locked": { - "lastModified": 1709708644, - "narHash": "sha256-XAFOkZ6yexsqeJrCXWoHxopq0i+7ZqbwATXomMnGmr4=", + "lastModified": 1710040110, + "narHash": "sha256-PNAV8VdZkNoSGQHGQWDefNarl0BtKjVMCCzu16+vsr4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "94a1e46434736a40f976a454f8bd3ea2144f349b", + "rev": "851fcfd130597c5c91071d46275111522d4fd595", "type": "github" }, "original": { @@ -806,12 +806,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", - "revCount": 591063, + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "revCount": 592007, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.591063%2Brev-b8697e57f10292a6165a20f03d2f42920dfaf973/018e0b39-3c52-71b1-81e1-d90220875f22/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.592007%2Brev-9df3e30ce24fd28c7b3e2de0d986769db5d6225d/018e1732-2a3c-7a76-9ec9-7272cb294c13/source.tar.gz" }, "original": { "type": "tarball", @@ -870,11 +870,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1709675310, - "narHash": "sha256-w61tqFEmuJ+/1rAwU7nkYZ+dN6sLwyobfLwX2Yn42FE=", + "lastModified": 1709968316, + "narHash": "sha256-4rZEtEDT6jcgRaqxsatBeds7x1PoEiEjb6QNGb4mNrk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "43d259f8d726113fac056e8bb17d5ac2dea3e0a8", + "rev": "0e7f98a5f30166cbed344569426850b21e4091d4", "type": "github" }, "original": { @@ -934,11 +934,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -988,11 +988,11 @@ "osx-kvm": "osx-kvm" }, "locked": { - "lastModified": 1708043432, - "narHash": "sha256-rrK4B2NpZTdV9DLneAskpvfp8G0lhDaq5NI3wVgcsF8=", + "lastModified": 1709757255, + "narHash": "sha256-UGUwYIvV+vchrJQcByQPpvkev5c/uKvseDB1DhMqm0M=", "owner": "matthewcroughan", "repo": "nixtheplanet", - "rev": "62ba30ef20dd4abbfb248eb53e1f7c973ca6f076", + "rev": "b384ebc166c896427cc9099f6afede61941b2458", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ }, "nur": { "locked": { - "lastModified": 1709727394, - "narHash": "sha256-xnHwuS0wHaYm2DAfzj5njkibsQdAY5LoUqSUqol/RuM=", + "lastModified": 1710037658, + "narHash": "sha256-6i7th4IX+2E1KX7FEJ4XgYtvQAooLa6YRsUIVRDu0PU=", "owner": "nix-community", "repo": "NUR", - "rev": "e75e8885efb15f254aebf64ec33e338ffe551ee0", + "rev": "ff870a7e359c3f34fc1144c6c35f76003d6c17e7", "type": "github" }, "original": { @@ -1042,11 +1042,11 @@ ] }, "locked": { - "lastModified": 1709634318, - "narHash": "sha256-4jZRGyPYShyLocUnE0kqDoitqxqBCkuJ6w6/QX4bjYk=", + "lastModified": 1709982472, + "narHash": "sha256-cMPHIV7yWbve+nwiQDhVt7BBkxrGTLzSTAslv7u6HZo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "9bac5925cf7716979535eed9c88e307fa9744169", + "rev": "26acf8f5880ae7d6e5de4ca953c8ad161b7903eb", "type": "github" }, "original": { -- 2.45.3 From 6b1e8d7cd3471ef7a91b87e5a5e33cd1069c9dde Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Mon, 11 Mar 2024 03:48:33 +0100 Subject: [PATCH 03/13] Update flakes --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 0a2b294..77452ae 100644 --- a/flake.lock +++ b/flake.lock @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1709967935, - "narHash": "sha256-ZLLdGWs9njivxZsfSzfQN05g6WIyIe24bPb61y7FVqo=", + "lastModified": 1710119954, + "narHash": "sha256-e7AMYtBQgRzeRtn//k1dXu22xeiav+G0cQjm3gEky7o=", "owner": "nix-community", "repo": "disko", - "rev": "72818e54ec29427f8d9f9cfa6fc859d01ca6dc66", + "rev": "d389901567d9ceda5a1a833fbf8e8e254e18eb0a", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1710034490, - "narHash": "sha256-n3pEX8Ji498tu2ht86mL1aaK6mWQSS6hwk7M2SoXh6Y=", + "lastModified": 1710121508, + "narHash": "sha256-lOfYN1BMBNarx3Nvcro6EEXq+ZSUHyhc2WJJdWACwoA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f7c18159c781e56a74d3352ef2865929fc122c61", + "rev": "65f195e937a170adac199b12eab303b8488bf38b", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1709988192, - "narHash": "sha256-qxwIkl85P0I1/EyTT+NJwzbXdOv86vgZxcv4UKicjK8=", + "lastModified": 1710062421, + "narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "b0b0c3d94345050a7f86d1ebc6c56eea4389d030", + "rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a", "type": "github" }, "original": { @@ -731,11 +731,11 @@ ] }, "locked": { - "lastModified": 1710040110, - "narHash": "sha256-PNAV8VdZkNoSGQHGQWDefNarl0BtKjVMCCzu16+vsr4=", + "lastModified": 1710120787, + "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "851fcfd130597c5c91071d46275111522d4fd595", + "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07", "type": "github" }, "original": { @@ -870,11 +870,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1709968316, - "narHash": "sha256-4rZEtEDT6jcgRaqxsatBeds7x1PoEiEjb6QNGb4mNrk=", + "lastModified": 1710097495, + "narHash": "sha256-B7Ea7q7hU7SE8wOPJ9oXEBjvB89yl2csaLjf5v/7jr8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e7f98a5f30166cbed344569426850b21e4091d4", + "rev": "d40e866b1f98698d454dad8f592fe7616ff705a4", "type": "github" }, "original": { @@ -934,11 +934,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ }, "nur": { "locked": { - "lastModified": 1710037658, - "narHash": "sha256-6i7th4IX+2E1KX7FEJ4XgYtvQAooLa6YRsUIVRDu0PU=", + "lastModified": 1710124831, + "narHash": "sha256-p9OsrS92igy60PDBntriG7tVhjj8kPlNR2ticzdJwr8=", "owner": "nix-community", "repo": "NUR", - "rev": "ff870a7e359c3f34fc1144c6c35f76003d6c17e7", + "rev": "908aa1f5555e8e0f13dc7281b6a1a845ea54acc1", "type": "github" }, "original": { -- 2.45.3 From b4934a693cd624fdfb1b0f97399f4f0d80233f33 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Fri, 15 Mar 2024 10:03:13 +0100 Subject: [PATCH 04/13] Update flakes --- flake.lock | 102 ++++++++++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index 77452ae..9a654b0 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1709828095, - "narHash": "sha256-subJqhj34TJ00C0qbGPUkozt4nMNi5DZltw/i4xmgVE=", + "lastModified": 1710324550, + "narHash": "sha256-cyaWu4/QdXMbToN8AmempMHfoqQ9fogQwGfDO8GnCyM=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "9b54befbe7993ed2abe91f4d76e259b3e8f9d922", + "rev": "246041a6549f103088086dfe61a0b04083a8eaaf", "type": "github" }, "original": { @@ -113,17 +113,17 @@ ] }, "locked": { - "lastModified": 1709522437, - "narHash": "sha256-mS0tYjN3B2cLfF+p8m/0YAMNOEQSx/HJT6BOy/XcOLw=", + "lastModified": 1710090208, + "narHash": "sha256-1W7yDW+kqCr/9SygZwygBayE8HwLnzJq48fMAOZQLAY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "b527ec46661a9a5efe22aa83eeb9fbbe37c41850", - "type": "gitlab" + "rev": "e888a0a745ac979abe6a687ff24b8c5e7b7b79ed", + "type": "github" }, "original": { "owner": "girlbossceo", "repo": "conduwuit", - "type": "gitlab" + "type": "github" } }, "crane": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1710119954, - "narHash": "sha256-e7AMYtBQgRzeRtn//k1dXu22xeiav+G0cQjm3gEky7o=", + "lastModified": 1710169806, + "narHash": "sha256-HeWFrRuHpnAiPmIr26OKl2g142HuGerwoO/XtW53pcI=", "owner": "nix-community", "repo": "disko", - "rev": "d389901567d9ceda5a1a833fbf8e8e254e18eb0a", + "rev": "fe064a639319ed61cdf12b8f6eded9523abcc498", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1710121508, - "narHash": "sha256-lOfYN1BMBNarx3Nvcro6EEXq+ZSUHyhc2WJJdWACwoA=", + "lastModified": 1710320774, + "narHash": "sha256-TrLaYznIzUGy4vIRw4hDDlOKuF/vDD1J49cLtkxvgAI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "65f195e937a170adac199b12eab303b8488bf38b", + "rev": "c68aeff603f1b5c4cc7a57b876cf5e7101f2f21c", "type": "github" }, "original": { @@ -377,12 +377,12 @@ ] }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "revCount": 91, + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "revCount": 92, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/numtide/flake-utils/0.1.91%2Brev-d465f4819400de7c8d874d50b982301f28a84605/018defde-b702-7c49-9ad0-aa7e8781287b/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/numtide/flake-utils/0.1.92%2Brev-b1d9ab70662946ef0850d488da1c9019f3a9752a/018e2ca5-e5a2-7f80-9261-445a8cecd4d7/source.tar.gz" }, "original": { "type": "tarball", @@ -394,11 +394,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1710062421, - "narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=", + "lastModified": 1710281778, + "narHash": "sha256-bvWr9vvBrAxb44kHM3H3cY/uQg+4pYP1BM/Nu3e/7V8=", "owner": "nix-community", "repo": "home-manager", - "rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a", + "rev": "49a266d2ca59df8a03249550e73a54626181b65d", "type": "github" }, "original": { @@ -551,11 +551,11 @@ ] }, "locked": { - "lastModified": 1709744297, - "narHash": "sha256-Q2LOs08hmFlzJdJMN4yNrWvZTegfpHEajLin0vcw7t0=", + "lastModified": 1710025765, + "narHash": "sha256-CnNH3E1xB/xfif+KotTfvSGLLqOZ0OvUcUrDsFMwN6Q=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f8e3302ee1e0ccaabc443f45dc415e117b54926f", + "rev": "2e8c168044e86ee1344c18bde5caeffe205292f2", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1709786138, - "narHash": "sha256-yppQIffjpyQ2nqhiZbV2pSMQJx8srmHjAk+UClCQfRw=", + "lastModified": 1710213958, + "narHash": "sha256-4U5pWM9uyybC4RG3OXlFkngYJm6hr9CK3YJPTHYrtHw=", "owner": "martinvonz", "repo": "jj", - "rev": "bf76080f42f77cad934d9a5202c7b7d29ab2c890", + "rev": "6fd15dc7e52bd0479812cde66a4908c69ae1ff8d", "type": "github" }, "original": { @@ -614,11 +614,11 @@ ] }, "locked": { - "lastModified": 1709751999, - "narHash": "sha256-9I0bn0iSdYXHIPhU1Ne8Ooxfnut/qMtNDutBii9NxQE=", + "lastModified": 1710225729, + "narHash": "sha256-0BHO5UC0RiLRqxWyb4S7JQRPioHIdP/oY9QYgJvP7mk=", "owner": "YaLTeR", "repo": "niri", - "rev": "1a784e6e66785f360da6df59ae2fb4b98370ca3c", + "rev": "ed8a6afe806fbc3438b1fd467a71919900d04852", "type": "github" }, "original": { @@ -655,11 +655,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", "owner": "numtide", "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", "type": "github" }, "original": { @@ -806,12 +806,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", - "revCount": 592007, + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "revCount": 594677, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.592007%2Brev-9df3e30ce24fd28c7b3e2de0d986769db5d6225d/018e1732-2a3c-7a76-9ec9-7272cb294c13/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.594677%2Brev-3030f185ba6a4bf4f18b87f345f104e6a6961f34/018e2779-c26f-77c4-a354-58b83df42819/source.tar.gz" }, "original": { "type": "tarball", @@ -870,11 +870,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1710097495, - "narHash": "sha256-B7Ea7q7hU7SE8wOPJ9oXEBjvB89yl2csaLjf5v/7jr8=", + "lastModified": 1710283812, + "narHash": "sha256-F+s4//HwNEXtgxZ6PLoe5khDTmUukPYbjCvx7us2vww=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d40e866b1f98698d454dad8f592fe7616ff705a4", + "rev": "73bf415737ceb66a6298f806f600cfe4dccd0a41", "type": "github" }, "original": { @@ -934,11 +934,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ }, "nur": { "locked": { - "lastModified": 1710124831, - "narHash": "sha256-p9OsrS92igy60PDBntriG7tVhjj8kPlNR2ticzdJwr8=", + "lastModified": 1710326699, + "narHash": "sha256-YPQSBzfHqXpSbgtyJ3z/7vegpYyxW9wvGy/WvRQy1t4=", "owner": "nix-community", "repo": "NUR", - "rev": "908aa1f5555e8e0f13dc7281b6a1a845ea54acc1", + "rev": "442dba488e7def464331fb16a3d06a1a6b50f31b", "type": "github" }, "original": { -- 2.45.3 From 38114f6f0883a981f4a03623eed19137bad586bc Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Fri, 15 Mar 2024 14:06:28 +0100 Subject: [PATCH 05/13] Update flakes --- flake.lock | 64 +++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 9a654b0..c087c3f 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1710324550, - "narHash": "sha256-cyaWu4/QdXMbToN8AmempMHfoqQ9fogQwGfDO8GnCyM=", + "lastModified": 1710433570, + "narHash": "sha256-39Kzdv8rPhKses/VwBTCfTtNOGLQr/8xnRUGk2LhTRw=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "246041a6549f103088086dfe61a0b04083a8eaaf", + "rev": "58ce1f8057475ebf3cbcc327af33eb9af5646c98", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1710169806, - "narHash": "sha256-HeWFrRuHpnAiPmIr26OKl2g142HuGerwoO/XtW53pcI=", + "lastModified": 1710427903, + "narHash": "sha256-sV0Q5ndvfjK9JfCg/QM/HX/fcittohvtq8dD62isxdM=", "owner": "nix-community", "repo": "disko", - "rev": "fe064a639319ed61cdf12b8f6eded9523abcc498", + "rev": "21d89b333ca300bef82c928c856d48b94a9f997c", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1710320774, - "narHash": "sha256-TrLaYznIzUGy4vIRw4hDDlOKuF/vDD1J49cLtkxvgAI=", + "lastModified": 1710492640, + "narHash": "sha256-GnH54yxazJjHbxpAX8s6KyMe2NRo8Yx5QEOue+iHrBU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c68aeff603f1b5c4cc7a57b876cf5e7101f2f21c", + "rev": "96bcdc62af503632cfbf0fcd58fa1ae244947223", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1710281778, - "narHash": "sha256-bvWr9vvBrAxb44kHM3H3cY/uQg+4pYP1BM/Nu3e/7V8=", + "lastModified": 1710452332, + "narHash": "sha256-+lKOoQ89fD6iz6Ro7Adml4Sx6SqQcTWII4t1rvVtdjs=", "owner": "nix-community", "repo": "home-manager", - "rev": "49a266d2ca59df8a03249550e73a54626181b65d", + "rev": "096d9c04b3e9438855aa65e24129b97a998bd3d9", "type": "github" }, "original": { @@ -551,11 +551,11 @@ ] }, "locked": { - "lastModified": 1710025765, - "narHash": "sha256-CnNH3E1xB/xfif+KotTfvSGLLqOZ0OvUcUrDsFMwN6Q=", + "lastModified": 1710404304, + "narHash": "sha256-tYsUAsZgt9TT7d+r1KRYHWyBRWedJ39SXNBVSCQVsGQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2e8c168044e86ee1344c18bde5caeffe205292f2", + "rev": "ffa51458aec4d53aac85b6dee1ee2ec29f4e953f", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1710213958, - "narHash": "sha256-4U5pWM9uyybC4RG3OXlFkngYJm6hr9CK3YJPTHYrtHw=", + "lastModified": 1710390908, + "narHash": "sha256-v050f/BDWKbSDNW1tR3Y22aPRwccXoqnHTBqGB2Mk3c=", "owner": "martinvonz", "repo": "jj", - "rev": "6fd15dc7e52bd0479812cde66a4908c69ae1ff8d", + "rev": "33911712a20170ef09b122800e7cfc8d61d095e2", "type": "github" }, "original": { @@ -614,11 +614,11 @@ ] }, "locked": { - "lastModified": 1710225729, - "narHash": "sha256-0BHO5UC0RiLRqxWyb4S7JQRPioHIdP/oY9QYgJvP7mk=", + "lastModified": 1710390363, + "narHash": "sha256-ooechLU/68O8sIBqtRsBWY2Vtbn4kPxnP+5pWQ30IEg=", "owner": "YaLTeR", "repo": "niri", - "rev": "ed8a6afe806fbc3438b1fd467a71919900d04852", + "rev": "cc83ff008d7500f38bce4e75c2dbcdfc1621cac4", "type": "github" }, "original": { @@ -806,12 +806,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", - "revCount": 594677, + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "revCount": 596105, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.594677%2Brev-3030f185ba6a4bf4f18b87f345f104e6a6961f34/018e2779-c26f-77c4-a354-58b83df42819/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.596105%2Brev-0ad13a6833440b8e238947e47bea7f11071dc2b2/018e36a8-f6ad-749d-b12f-45cea2d52979/source.tar.gz" }, "original": { "type": "tarball", @@ -870,11 +870,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1710283812, - "narHash": "sha256-F+s4//HwNEXtgxZ6PLoe5khDTmUukPYbjCvx7us2vww=", + "lastModified": 1710470187, + "narHash": "sha256-l2R47RqhdEUYrMrQjdFKhxtqprkJjIE89qJx3iEVv+U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73bf415737ceb66a6298f806f600cfe4dccd0a41", + "rev": "f242fc768bdfcf91d9094a8a8f66551324bf1a47", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ }, "nur": { "locked": { - "lastModified": 1710326699, - "narHash": "sha256-YPQSBzfHqXpSbgtyJ3z/7vegpYyxW9wvGy/WvRQy1t4=", + "lastModified": 1710491619, + "narHash": "sha256-vtMw8iV3jl1LPVFmmZ7AZE8ifqqSTMPG1+FbL32dcEM=", "owner": "nix-community", "repo": "NUR", - "rev": "442dba488e7def464331fb16a3d06a1a6b50f31b", + "rev": "6f10c0c70d20b3d3e2824fcfa581a705f0c81d8a", "type": "github" }, "original": { -- 2.45.3 From 95b2351af1fd918d6831d78d4413afd896e84662 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Mon, 18 Mar 2024 10:03:27 +0100 Subject: [PATCH 06/13] Update flakes --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index c087c3f..bf34a23 100644 --- a/flake.lock +++ b/flake.lock @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1710492640, - "narHash": "sha256-GnH54yxazJjHbxpAX8s6KyMe2NRo8Yx5QEOue+iHrBU=", + "lastModified": 1710493512, + "narHash": "sha256-mqWEpPqxeHYslfmevxx/KwuoZ9uIWjiD+CsdQFW7xsM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "96bcdc62af503632cfbf0fcd58fa1ae244947223", + "rev": "ee3a92b17a377d2ac2bb8293638f7e87f74953ee", "type": "github" }, "original": { @@ -412,11 +412,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1710452332, - "narHash": "sha256-+lKOoQ89fD6iz6Ro7Adml4Sx6SqQcTWII4t1rvVtdjs=", + "lastModified": 1710506163, + "narHash": "sha256-Xpl2LzbAIUHcTkAZ08UZM0USxVaQn194I8ma9c8wnAA=", "owner": "nix-community", "repo": "home-manager", - "rev": "096d9c04b3e9438855aa65e24129b97a998bd3d9", + "rev": "dc2f3812b41f825ed466c24c4211160d75cb890c", "type": "github" }, "original": { @@ -640,11 +640,11 @@ ] }, "locked": { - "lastModified": 1707986999, - "narHash": "sha256-uPCdmwnf2vcfKMxHvD8Hhs1o2yqfnK8Xz6oM7Urvspk=", + "lastModified": 1710495228, + "narHash": "sha256-w0XM85Zo4mNqRLZDZMWUw0wv7LRoODKohCWIaVNnE94=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "d6f007b3cab6cd16e50a0041c542a18793357737", + "rev": "75c0c2d5eb1fdd2c5187c49888cab40b060605fa", "type": "github" }, "original": { @@ -670,11 +670,11 @@ }, "nix-filter_2": { "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", "owner": "numtide", "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", "type": "github" }, "original": { @@ -711,11 +711,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1707620986, - "narHash": "sha256-XE0tCSkSVBeJDWhjFwusNInwAhrnp+TloUNUpvnTiLw=", + "lastModified": 1710120787, + "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "0cb4345704123492e6d1f1068629069413c80de0", + "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07", "type": "github" }, "original": { @@ -886,11 +886,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -934,11 +934,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1710451336, + "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "d691274a972b3165335d261cc4671335f5c67de9", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ }, "nur": { "locked": { - "lastModified": 1710491619, - "narHash": "sha256-vtMw8iV3jl1LPVFmmZ7AZE8ifqqSTMPG1+FbL32dcEM=", + "lastModified": 1710506669, + "narHash": "sha256-9m+oWHbBZi3c7YyiMs5hiOIqCG+WgP1sMA+s60AtWOU=", "owner": "nix-community", "repo": "NUR", - "rev": "6f10c0c70d20b3d3e2824fcfa581a705f0c81d8a", + "rev": "90155b2212a941712b74575db564c6afd24492b5", "type": "github" }, "original": { -- 2.45.3 From cd5dbc3697a4dc4758a9ba2ae7f6987c767aae8c Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Tue, 19 Mar 2024 16:36:33 +0100 Subject: [PATCH 07/13] Add keybind for gptel & fix ruby lsp --- ext/doom/config.el | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/ext/doom/config.el b/ext/doom/config.el index c16e139..d81707e 100644 --- a/ext/doom/config.el +++ b/ext/doom/config.el @@ -288,6 +288,10 @@ (centaur-tabs-local-mode)))) ) +;; ruby + +(setq! lsp-ruby-lsp-use-bundler t) + ;; Copilot ;; accept completion from copilot and fallback to company @@ -309,15 +313,20 @@ (use-package! gptel :init :config - (setq-default gptel-backend (gptel-make-openai "llama-cpp" ;Any name - :stream t - :protocol "http" - :host "100.64.0.3:8080" - :models '("test") - ) - gptel-model "test") + (setq! gptel-backend (gptel-make-openai "llama-cpp" + :stream t + :protocol "http" + :host "100.64.0.3:8080" + :models '("test")) + gptel-model "test") + (add-hook 'gptel-post-response-functions 'gptel-end-of-response) - (add-hook 'gptel-post-stream-hook 'gptel-auto-scroll)) + (add-hook 'gptel-post-stream-hook 'gptel-auto-scroll) + + (map! :leader + "" 'gptel-complete + "TAB" 'gptel-complete) + ) -- 2.45.3 From 5773334e948ef49dd955b1f3b3ee19f8b68d4b03 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Tue, 19 Mar 2024 16:36:54 +0100 Subject: [PATCH 08/13] Update flake deps --- flake.lock | 76 +++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index bf34a23..578c23d 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1710433570, - "narHash": "sha256-39Kzdv8rPhKses/VwBTCfTtNOGLQr/8xnRUGk2LhTRw=", + "lastModified": 1710717798, + "narHash": "sha256-KrZbpo83wnKbUXy0hnmENJTNy/mOCF3Un+nml67e+dU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "58ce1f8057475ebf3cbcc327af33eb9af5646c98", + "rev": "cd5052eba475afc01072ebc239896a68edc17f95", "type": "github" }, "original": { @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1710090208, - "narHash": "sha256-1W7yDW+kqCr/9SygZwygBayE8HwLnzJq48fMAOZQLAY=", + "lastModified": 1710562188, + "narHash": "sha256-KHlb4sK9fvp+9DoYWHLyaegoeLV7w8s7CsNMmNlKu1U=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "e888a0a745ac979abe6a687ff24b8c5e7b7b79ed", + "rev": "8d8467a4eafd264adb9c710e0638c08ae547dec4", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1710427903, - "narHash": "sha256-sV0Q5ndvfjK9JfCg/QM/HX/fcittohvtq8dD62isxdM=", + "lastModified": 1710724748, + "narHash": "sha256-aXlifKr6Brg0SBUBgRNEBaZf3JLUeGhM9BX2gam+vvo=", "owner": "nix-community", "repo": "disko", - "rev": "21d89b333ca300bef82c928c856d48b94a9f997c", + "rev": "c09c3a9639690f94ddff44c3dd25c85602e5aeb2", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1710493512, - "narHash": "sha256-mqWEpPqxeHYslfmevxx/KwuoZ9uIWjiD+CsdQFW7xsM=", + "lastModified": 1710751845, + "narHash": "sha256-ZQTjdec8ucZEBrVcNe39ViHZ2A9LxhJHlOwvNMZ4//0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ee3a92b17a377d2ac2bb8293638f7e87f74953ee", + "rev": "8505f2676daa4c5387df15472bf1baaf72af12f5", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1710506163, - "narHash": "sha256-Xpl2LzbAIUHcTkAZ08UZM0USxVaQn194I8ma9c8wnAA=", + "lastModified": 1710714957, + "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", "owner": "nix-community", "repo": "home-manager", - "rev": "dc2f3812b41f825ed466c24c4211160d75cb890c", + "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1710390908, - "narHash": "sha256-v050f/BDWKbSDNW1tR3Y22aPRwccXoqnHTBqGB2Mk3c=", + "lastModified": 1710563757, + "narHash": "sha256-H5SZIo7O4zg/NqSdM71V2gYH4ex5WbBf6s9ue5s4nL4=", "owner": "martinvonz", "repo": "jj", - "rev": "33911712a20170ef09b122800e7cfc8d61d095e2", + "rev": "8600750fceafbf489d42a99b36b1f48bbc1e416b", "type": "github" }, "original": { @@ -614,11 +614,11 @@ ] }, "locked": { - "lastModified": 1710390363, - "narHash": "sha256-ooechLU/68O8sIBqtRsBWY2Vtbn4kPxnP+5pWQ30IEg=", + "lastModified": 1710525749, + "narHash": "sha256-LpV/mJLeShTPecVQZnIAb9PTCGziuMuGOJQUeAb2u/w=", "owner": "YaLTeR", "repo": "niri", - "rev": "cc83ff008d7500f38bce4e75c2dbcdfc1621cac4", + "rev": "0c57815fbf47c69af9ed11fa8ebc1b52158a3ba2", "type": "github" }, "original": { @@ -731,11 +731,11 @@ ] }, "locked": { - "lastModified": 1710120787, - "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=", + "lastModified": 1710644923, + "narHash": "sha256-0fjbN5GYYDKPyPay0l8gYoH+tFfNqPPwP5sxxBreeA4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07", + "rev": "e25efda85e39fcdc845e371971ac4384989c4295", "type": "github" }, "original": { @@ -806,12 +806,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", - "revCount": 596105, + "lastModified": 1710631334, + "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "revCount": 598085, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.596105%2Brev-0ad13a6833440b8e238947e47bea7f11071dc2b2/018e36a8-f6ad-749d-b12f-45cea2d52979/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.598085%2Brev-c75037bbf9093a2acb617804ee46320d6d1fea5a/018e4cfd-3f0a-7531-8a72-60a3a8a3d087/source.tar.gz" }, "original": { "type": "tarball", @@ -870,11 +870,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1710470187, - "narHash": "sha256-l2R47RqhdEUYrMrQjdFKhxtqprkJjIE89qJx3iEVv+U=", + "lastModified": 1710701596, + "narHash": "sha256-v4lsAi3vE/sEWg0G8AydMjs3NTHlsNw8K01xw06cKLg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f242fc768bdfcf91d9094a8a8f66551324bf1a47", + "rev": "34ad8c9f29a18b4dd97a9ad40ceb16954f24afe7", "type": "github" }, "original": { @@ -934,11 +934,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1710451336, - "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", + "lastModified": 1710631334, + "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d691274a972b3165335d261cc4671335f5c67de9", + "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ }, "nur": { "locked": { - "lastModified": 1710506669, - "narHash": "sha256-9m+oWHbBZi3c7YyiMs5hiOIqCG+WgP1sMA+s60AtWOU=", + "lastModified": 1710750753, + "narHash": "sha256-MQ5haKyTNKAFTw3oDaShLHiECiD5DVV4HfmzN3l77Yk=", "owner": "nix-community", "repo": "NUR", - "rev": "90155b2212a941712b74575db564c6afd24492b5", + "rev": "05351320d5ece2eb43cbd991edd4d1f56f5ca17f", "type": "github" }, "original": { -- 2.45.3 From 76a81cdfed5ddb347fb59edb7febf7a6d778cf51 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Tue, 19 Mar 2024 16:36:59 +0100 Subject: [PATCH 09/13] Fix plasma6 config --- os-mods/desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/os-mods/desktop/default.nix b/os-mods/desktop/default.nix index bc93ae4..7f36d2a 100644 --- a/os-mods/desktop/default.nix +++ b/os-mods/desktop/default.nix @@ -69,6 +69,8 @@ }; services = { + desktopManager.plasma6.enable = true; + desktopManager.plasma6.enableQt5Integration = true; xserver = { enable = true; xkb = { @@ -78,8 +80,6 @@ # desktopManager.plasma5.enable = true; # desktopManager.plasma5.useQtScaling = true; - desktopManager.plasma6.enable = true; - desktopManager.plasma6.enableQt5Integration = true; displayManager = { # defaultSession = "plasmawayland"; -- 2.45.3 From b1b079da0f50a1cf257c1a2286931fb1c7f43fa9 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Thu, 21 Mar 2024 17:12:22 +0100 Subject: [PATCH 10/13] Add foss games & fix pinentry --- flake.lock | 82 +++++++++++++++++------------------ home-mods/desktop/default.nix | 3 ++ home-mods/shell/default.nix | 1 + os-mods/common/default.nix | 1 + 4 files changed, 46 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index 578c23d..273334c 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1710717798, - "narHash": "sha256-KrZbpo83wnKbUXy0hnmENJTNy/mOCF3Un+nml67e+dU=", + "lastModified": 1710897688, + "narHash": "sha256-gEVR6wNoXYyeqLGsIP1J4ip3AUWee08Wr+bW46Dtz5k=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "cd5052eba475afc01072ebc239896a68edc17f95", + "rev": "10ab84ad5dee3669f6152d92713e4d9ce8689241", "type": "github" }, "original": { @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1710562188, - "narHash": "sha256-KHlb4sK9fvp+9DoYWHLyaegoeLV7w8s7CsNMmNlKu1U=", + "lastModified": 1710602287, + "narHash": "sha256-6hjHSfH3jfTDxD6hELL7RGoqv2pnyVAtS81H5Le6qkk=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "8d8467a4eafd264adb9c710e0638c08ae547dec4", + "rev": "930bf3891c5a1279b23e16f3f10ce02c47b9b4cb", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1710724748, - "narHash": "sha256-aXlifKr6Brg0SBUBgRNEBaZf3JLUeGhM9BX2gam+vvo=", + "lastModified": 1710906792, + "narHash": "sha256-kFzpfZcInLhBFWHy452NlvFuzNr0BDEkz3w9Sgg2ypo=", "owner": "nix-community", "repo": "disko", - "rev": "c09c3a9639690f94ddff44c3dd25c85602e5aeb2", + "rev": "e9875b969086a53dff5ec4677575ad3156fc875d", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1710751845, - "narHash": "sha256-ZQTjdec8ucZEBrVcNe39ViHZ2A9LxhJHlOwvNMZ4//0=", + "lastModified": 1710922545, + "narHash": "sha256-5ZxDaXR0/wTfY3AEvD2+nXIhhzQfty6PtJosH/75iBQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8505f2676daa4c5387df15472bf1baaf72af12f5", + "rev": "44817d1f0a8150bafa1b5516d7896234ea867236", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1709593798, - "narHash": "sha256-vuYPYV5A98ge3iw/bCEN1s5rOTE96O4ult9Noydjv9k=", + "lastModified": 1710843407, + "narHash": "sha256-PUCgqRuQ1tSM5eZIDZS+DnxuYpwdL+8xxSuFFvSocQI=", "owner": "Mic92", "repo": "envfs", - "rev": "141f1146a826094568069e9b9027c7738b6babfe", + "rev": "746b633ff25ff7302ace47a0d4bfd1e935f4d5f7", "type": "github" }, "original": { @@ -303,11 +303,11 @@ ] }, "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1710714957, - "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", + "lastModified": 1710820906, + "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", + "rev": "022464438a85450abb23d93b91aa82e0addd71fb", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1710563757, - "narHash": "sha256-H5SZIo7O4zg/NqSdM71V2gYH4ex5WbBf6s9ue5s4nL4=", + "lastModified": 1710753783, + "narHash": "sha256-Av5QpYJvJYNefRCKhsOfSzTBaqQ2o+rj60/NVzGytOQ=", "owner": "martinvonz", "repo": "jj", - "rev": "8600750fceafbf489d42a99b36b1f48bbc1e416b", + "rev": "54bb3b4114b1ee7fcd01e47553803f157c3635f5", "type": "github" }, "original": { @@ -806,12 +806,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", - "revCount": 598085, + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "revCount": 598982, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.598085%2Brev-c75037bbf9093a2acb617804ee46320d6d1fea5a/018e4cfd-3f0a-7531-8a72-60a3a8a3d087/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.598982%2Brev-b06025f1533a1e07b6db3e75151caa155d1c7eb3/018e577a-86bd-7b2f-b434-442e9ada5378/source.tar.gz" }, "original": { "type": "tarball", @@ -870,11 +870,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1710701596, - "narHash": "sha256-v4lsAi3vE/sEWg0G8AydMjs3NTHlsNw8K01xw06cKLg=", + "lastModified": 1710827359, + "narHash": "sha256-/KY8hffTh9SN/tTcDn/FrEiYwTXnU8NKnr4D7/stmmA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "34ad8c9f29a18b4dd97a9ad40ceb16954f24afe7", + "rev": "5710127d9693421e78cca4f74fac2db6d67162b1", "type": "github" }, "original": { @@ -934,11 +934,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ }, "nur": { "locked": { - "lastModified": 1710750753, - "narHash": "sha256-MQ5haKyTNKAFTw3oDaShLHiECiD5DVV4HfmzN3l77Yk=", + "lastModified": 1710923589, + "narHash": "sha256-lKYSsx0BQbcXVZf14vpf2yD7r7pakHQ7173pxXmgvk4=", "owner": "nix-community", "repo": "NUR", - "rev": "05351320d5ece2eb43cbd991edd4d1f56f5ca17f", + "rev": "6b42f9fe3099d436ada62d4e41a36673caa10bbf", "type": "github" }, "original": { @@ -1229,11 +1229,11 @@ ] }, "locked": { - "lastModified": 1699786194, - "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", + "lastModified": 1710781103, + "narHash": "sha256-nehQK/XTFxfa6rYKtbi8M1w+IU1v5twYhiyA4dg1vpg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", + "rev": "7ee5aaac63c30d3c97a8c56efe89f3b2aa9ae564", "type": "github" }, "original": { diff --git a/home-mods/desktop/default.nix b/home-mods/desktop/default.nix index 23f987b..d590090 100644 --- a/home-mods/desktop/default.nix +++ b/home-mods/desktop/default.nix @@ -39,6 +39,7 @@ in element-desktop inkscape jellyfin-mpv-shim + libsForQt5.kasts # miraclecast kate kdenlive @@ -53,6 +54,8 @@ in signal-desktop tutanota-desktop webcord-vencord + tome4 + shattered-pixel-dungeon ]; }; } diff --git a/home-mods/shell/default.nix b/home-mods/shell/default.nix index ecc4259..b59dc76 100644 --- a/home-mods/shell/default.nix +++ b/home-mods/shell/default.nix @@ -154,6 +154,7 @@ in enableExtraSocket = true; enableSshSupport = true; + pinentryPackage = lib.mkForce pkgs.pinentry-qt; }; lorri.enable = true; diff --git a/os-mods/common/default.nix b/os-mods/common/default.nix index 71c052f..b240ced 100644 --- a/os-mods/common/default.nix +++ b/os-mods/common/default.nix @@ -137,6 +137,7 @@ gnupg.agent = { enable = true; enableSSHSupport = true; + pinentryPackage = lib.mkForce pkgs.pinentry-qt; }; }; -- 2.45.3 From 788a3a0421f06e09405e2193827a49fcda3f0d12 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Fri, 22 Mar 2024 16:15:44 +0100 Subject: [PATCH 11/13] Update flakes --- flake.lock | 66 +++++++++++++++++++------------------- os-mods/common/default.nix | 2 +- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 273334c..a177a53 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1710897688, - "narHash": "sha256-gEVR6wNoXYyeqLGsIP1J4ip3AUWee08Wr+bW46Dtz5k=", + "lastModified": 1710954445, + "narHash": "sha256-vU2OGteZS6dMKZcu+btwsNN4HxIwhEb8dzP+h5NgKps=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "10ab84ad5dee3669f6152d92713e4d9ce8689241", + "rev": "2952a351037582a8aeb11be9cf57901d872bcf30", "type": "github" }, "original": { @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1710602287, - "narHash": "sha256-6hjHSfH3jfTDxD6hELL7RGoqv2pnyVAtS81H5Le6qkk=", + "lastModified": 1710821861, + "narHash": "sha256-Y+x3q7VkPpRok7Om2bwB2v1JDK/OCZmiFaBrIOJRojY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "930bf3891c5a1279b23e16f3f10ce02c47b9b4cb", + "rev": "7809f0a6aee6900de59b720bf966d4a0315276bc", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1710906792, - "narHash": "sha256-kFzpfZcInLhBFWHy452NlvFuzNr0BDEkz3w9Sgg2ypo=", + "lastModified": 1711006105, + "narHash": "sha256-pvjqjx4L2Hx/NP3RWcwLjk+ABtMODAJ9+rgreU6fP6I=", "owner": "nix-community", "repo": "disko", - "rev": "e9875b969086a53dff5ec4677575ad3156fc875d", + "rev": "a8c966ee117c278a5aabc6f00b00ef62eb7e28f6", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1710922545, - "narHash": "sha256-5ZxDaXR0/wTfY3AEvD2+nXIhhzQfty6PtJosH/75iBQ=", + "lastModified": 1711097455, + "narHash": "sha256-XrDR0IosuBua7GN7VrCHvebLKmwMUhfcJYsj/mGfCcU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "44817d1f0a8150bafa1b5516d7896234ea867236", + "rev": "b211a25ffa4f6938243612b63c0d59e3d2ca0259", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1710843407, - "narHash": "sha256-PUCgqRuQ1tSM5eZIDZS+DnxuYpwdL+8xxSuFFvSocQI=", + "lastModified": 1710936387, + "narHash": "sha256-4cRJtlp5nz2BmwBR8zxxYfMG6K5z0yIoqgVD00j9GC0=", "owner": "Mic92", "repo": "envfs", - "rev": "746b633ff25ff7302ace47a0d4bfd1e935f4d5f7", + "rev": "b4651b6e49da75534d8a33893ac13bbb1b3445da", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1710820906, - "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=", + "lastModified": 1710974515, + "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=", "owner": "nix-community", "repo": "home-manager", - "rev": "022464438a85450abb23d93b91aa82e0addd71fb", + "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4", "type": "github" }, "original": { @@ -551,11 +551,11 @@ ] }, "locked": { - "lastModified": 1710404304, - "narHash": "sha256-tYsUAsZgt9TT7d+r1KRYHWyBRWedJ39SXNBVSCQVsGQ=", + "lastModified": 1710915975, + "narHash": "sha256-yOc0AD6ba7mbialNciZGzuSQLMo4CopoZGEfcUugA4I=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "ffa51458aec4d53aac85b6dee1ee2ec29f4e953f", + "rev": "179d73fbe14c5bdb835d10bcc1c783466112bfa6", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1710753783, - "narHash": "sha256-Av5QpYJvJYNefRCKhsOfSzTBaqQ2o+rj60/NVzGytOQ=", + "lastModified": 1710898409, + "narHash": "sha256-vk+NUeKBb8pyTkZvHVq7+or25fpnSeaaSBGHSGKXL44=", "owner": "martinvonz", "repo": "jj", - "rev": "54bb3b4114b1ee7fcd01e47553803f157c3635f5", + "rev": "4fbe6aecc95152eda44cb4b185ab369e23e1393f", "type": "github" }, "original": { @@ -614,11 +614,11 @@ ] }, "locked": { - "lastModified": 1710525749, - "narHash": "sha256-LpV/mJLeShTPecVQZnIAb9PTCGziuMuGOJQUeAb2u/w=", + "lastModified": 1710858553, + "narHash": "sha256-CHSkAhNaWIMXlJX7skC2t5wr/qaNlMgWQsezNqr15mw=", "owner": "YaLTeR", "repo": "niri", - "rev": "0c57815fbf47c69af9ed11fa8ebc1b52158a3ba2", + "rev": "db49deb7fd2fbe805ceec060aa4dec65009ad7a7", "type": "github" }, "original": { @@ -870,11 +870,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1710827359, - "narHash": "sha256-/KY8hffTh9SN/tTcDn/FrEiYwTXnU8NKnr4D7/stmmA=", + "lastModified": 1710889954, + "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710127d9693421e78cca4f74fac2db6d67162b1", + "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ }, "nur": { "locked": { - "lastModified": 1710923589, - "narHash": "sha256-lKYSsx0BQbcXVZf14vpf2yD7r7pakHQ7173pxXmgvk4=", + "lastModified": 1711095683, + "narHash": "sha256-mLxazCxRu18EUFAAgQroruM83rdPH1mQvIaCAUtv/DQ=", "owner": "nix-community", "repo": "NUR", - "rev": "6b42f9fe3099d436ada62d4e41a36673caa10bbf", + "rev": "c03e4bfa0dbd731210226d2b406c6b512107ed9e", "type": "github" }, "original": { diff --git a/os-mods/common/default.nix b/os-mods/common/default.nix index b240ced..1144b74 100644 --- a/os-mods/common/default.nix +++ b/os-mods/common/default.nix @@ -144,7 +144,7 @@ services = { fwupd.enable = true; - envfs.enable = true; + # envfs.enable = true; # not needed due to flake ntpd-rs.enable = true; openssh = { -- 2.45.3 From 8baf0959b06297242de31186452fcffd3bd02493 Mon Sep 17 00:00:00 2001 From: stefan Date: Sat, 23 Mar 2024 19:57:03 +0100 Subject: [PATCH 12/13] Update systems/nixos-he4/default.nix Add taq user --- systems/nixos-he4/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/systems/nixos-he4/default.nix b/systems/nixos-he4/default.nix index d704fda..830c653 100644 --- a/systems/nixos-he4/default.nix +++ b/systems/nixos-he4/default.nix @@ -30,6 +30,7 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDP8ztBIgQsYh7LefSKtuDRYDWNheZWbmIr51T/Np/jc tristand@nixos-pulse" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ/tkVxnPZB+C6sK9A12pUsB38OhXieMNaij6pC3foSH admin@vault81.de" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMuH8L7mQDg86uJME6jndOu4niwLMASuJKpdbJU8Hfet tristan+desktop@vault81.de" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKokTPK/Gm30kqFAd+u5AT0BL7bG/eNt6pmGf40U8j03 arch-h1" ]; tristand = { @@ -45,6 +46,16 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMuH8L7mQDg86uJME6jndOu4niwLMASuJKpdbJU8Hfet tristan+desktop@vault81.de" ]; }; + + taq = { + isNormalUser = true; + description = "taq"; + extraGroups = [ "docker" "networkmanager" "wheel" ]; + hashedPassword = "$6$rkCVbHd2sV36Y38p$e5WTTK58ha7RDDYnfjxAdbzYyNJ2miMD2tkE9.8BHCGyb5vjPNYslClrzYIhxOmujEOllmREXcIgGiUpiMv8Y."; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKokTPK/Gm30kqFAd+u5AT0BL7bG/eNt6pmGf40U8j03 arch-h1" + ]; + }; }; home-manager = { -- 2.45.3 From 6820211fb577daee400164f0ab895162f1bd15c3 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Sat, 23 Mar 2024 20:38:53 +0100 Subject: [PATCH 13/13] Change shell to fish --- systems/nixos-he4/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systems/nixos-he4/default.nix b/systems/nixos-he4/default.nix index 830c653..7985e19 100644 --- a/systems/nixos-he4/default.nix +++ b/systems/nixos-he4/default.nix @@ -38,6 +38,7 @@ description = "tristand"; extraGroups = [ "docker" "networkmanager" "wheel" ]; hashedPassword = "$6$Wj.XY8JgH5EWuog4$HnbtPJXDEqKXFrzkPVEjih3PytcpBCrkfL7TAwkXd0IFced7kGMlZNliNsAqQ3XqfyUzAYiiKTIqoPVJEk.s.."; + shell = pkgs.fish; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHowJtKj3ohrYjyeWwQ8Lj6UMSPI390SwLRuVIlojcGM tristand@nixos-desk" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4fBDj1/He/uimO97RgjGWZLAimTrLmIlYS2ekD73GC tristan@arch-pulse" @@ -52,6 +53,7 @@ description = "taq"; extraGroups = [ "docker" "networkmanager" "wheel" ]; hashedPassword = "$6$rkCVbHd2sV36Y38p$e5WTTK58ha7RDDYnfjxAdbzYyNJ2miMD2tkE9.8BHCGyb5vjPNYslClrzYIhxOmujEOllmREXcIgGiUpiMv8Y."; + shell = pkgs.fish; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKokTPK/Gm30kqFAd+u5AT0BL7bG/eNt6pmGf40U8j03 arch-h1" ]; -- 2.45.3