From 2e654bc7a0521b20c7cca40ec0c3708f72ef8263 Mon Sep 17 00:00:00 2001 From: oddlama Date: Mon, 29 Jul 2024 02:58:04 +0200 Subject: [PATCH] chore: update flake --- config/default.nix | 2 + flake.lock | 426 +++++++++++-------------- users/config/shell/starship-module.nix | 154 --------- users/config/shell/starship.nix | 37 +-- 4 files changed, 191 insertions(+), 428 deletions(-) delete mode 100644 users/config/shell/starship-module.nix diff --git a/config/default.nix b/config/default.nix index 911e682..31bf8a3 100644 --- a/config/default.nix +++ b/config/default.nix @@ -4,6 +4,8 @@ "services/networking/netbird.nix" ]; + hardware.nvidia.modesetting.enable = builtins.trace "remove once #330748 is merged" true; + imports = [ inputs.agenix-rekey.nixosModules.default inputs.agenix.nixosModules.default diff --git a/flake.lock b/flake.lock index 2b3576b..c27cb33 100644 --- a/flake.lock +++ b/flake.lock @@ -51,11 +51,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1721071152, - "narHash": "sha256-GoshD2O4dDNuGPPK4AiVCkM38j9/8OImYudY0zjFDcc=", + "lastModified": 1721402988, + "narHash": "sha256-O5j5y5gpssVF5FNsSF7joTyrlW//LpwyLk6yBWgQ0VE=", "owner": "oddlama", "repo": "agenix-rekey", - "rev": "d63898728266e3a30f5367a0efbbfaedf9cf8041", + "rev": "3f1c787e2092d9c13142ae7572cc1c52b68f1c4c", "type": "github" }, "original": { @@ -181,7 +181,7 @@ "crane": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "elewrap", "nixpkgs" @@ -286,17 +286,16 @@ }, "devshell_2": { "inputs": { - "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1717408969, - "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", "owner": "numtide", "repo": "devshell", - "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", "type": "github" }, "original": { @@ -308,28 +307,6 @@ "devshell_3": { "inputs": { "flake-utils": "flake-utils_5", - "nixpkgs": [ - "idmail", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717408969, - "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", - "owner": "numtide", - "repo": "devshell", - "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_4": { - "inputs": { - "flake-utils": "flake-utils_7", "nixpkgs": [ "nix-topology", "nixpkgs" @@ -349,13 +326,13 @@ "type": "github" } }, - "devshell_5": { + "devshell_4": { "inputs": { "nixpkgs": [ "nixos-extra-modules", "nixpkgs" ], - "systems": "systems_11" + "systems": "systems_9" }, "locked": { "lastModified": 1701787589, @@ -371,20 +348,19 @@ "type": "github" } }, - "devshell_6": { + "devshell_5": { "inputs": { - "flake-utils": "flake-utils_10", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1717408969, - "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", "owner": "numtide", "repo": "devshell", - "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", "type": "github" }, "original": { @@ -393,9 +369,9 @@ "type": "github" } }, - "devshell_7": { + "devshell_6": { "inputs": { - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_9", "nixpkgs": [ "whisper-overlay", "nixpkgs" @@ -422,11 +398,11 @@ ] }, "locked": { - "lastModified": 1721007199, - "narHash": "sha256-Gof4Lj1rgTrX59bNu5b/uS/3X/marUGM7LYw31NoXEA=", + "lastModified": 1722028105, + "narHash": "sha256-0ButnGQ1bCMIDblzC6NBSL71Wi6JmHGweI3scoV8CgM=", "owner": "nix-community", "repo": "disko", - "rev": "bad376945de7033c7adc424c02054ea3736cf7c4", + "rev": "5b01cea8b5753de9c2febd27203c530be14745ff", "type": "github" }, "original": { @@ -463,7 +439,7 @@ "inputs": { "advisory-db": "advisory-db", "crane": "crane", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], @@ -483,6 +459,28 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "microvm", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1720420198, + "narHash": "sha256-OIuDb6pHDyGpo7YMFyuRzMLcHm7mRvlYOz0Ht7ps2sU=", + "owner": "nix-community", + "repo": "fenix", + "rev": "abc0549e3560189462a7d394cc9d50af4608d103", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -721,11 +719,11 @@ "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "lastModified": 1719745305, + "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", "type": "github" }, "original": { @@ -752,82 +750,10 @@ "type": "github" } }, - "flake-utils_10": { - "inputs": { - "systems": "systems_13" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_11": { - "inputs": { - "systems": "systems_14" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_12": { - "inputs": { - "systems": "systems_15" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_2": { "inputs": { "systems": "systems_4" }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_5" - }, "locked": { "lastModified": 1685518550, "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", @@ -842,9 +768,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1687709756, @@ -860,6 +786,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_5": { "inputs": { "systems": "systems_7" @@ -883,11 +827,11 @@ "systems": "systems_8" }, "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": { @@ -898,7 +842,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1701680307, @@ -916,7 +860,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_10" + "systems": "systems_11" }, "locked": { "lastModified": 1710146030, @@ -983,11 +927,11 @@ ] }, "locked": { - "lastModified": 1720524665, - "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "type": "github" }, "original": { @@ -1195,11 +1139,11 @@ ] }, "locked": { - "lastModified": 1720734513, - "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", + "lastModified": 1722202622, + "narHash": "sha256-AOe1F9EbQpcluAP+mq+i8T3/OfMu7ALiQtSdF+oAJRE=", "owner": "nix-community", "repo": "home-manager", - "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", + "rev": "587fcca66e9d11c8e2357053c096a8a727c120ab", "type": "github" }, "original": { @@ -1216,11 +1160,11 @@ ] }, "locked": { - "lastModified": 1720734513, - "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", + "lastModified": 1722119539, + "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=", "owner": "nix-community", "repo": "home-manager", - "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", + "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922", "type": "github" }, "original": { @@ -1231,7 +1175,6 @@ }, "idmail": { "inputs": { - "devshell": "devshell_3", "flake-parts": "flake-parts_2", "nci": "nci", "nixpkgs": [ @@ -1240,11 +1183,11 @@ "pre-commit-hooks": "pre-commit-hooks_3" }, "locked": { - "lastModified": 1722122164, - "narHash": "sha256-oMpuAsd/XqDkFjlnawWokObslzeOjt0ivAumrUy5xnM=", + "lastModified": 1722176502, + "narHash": "sha256-RQcVfsu1rJhNCHqCoRo5TKXz4SioNAuRYfcPCi0TLeI=", "owner": "oddlama", "repo": "idmail", - "rev": "788f7dbae0f05810892968c74033b5d43c581cc2", + "rev": "eb829345b2180bbffcb598f51dcb57f805ca1c4a", "type": "github" }, "original": { @@ -1283,18 +1226,19 @@ }, "microvm": { "inputs": { - "flake-utils": "flake-utils_6", + "fenix": "fenix", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], "spectrum": "spectrum" }, "locked": { - "lastModified": 1720034501, - "narHash": "sha256-fzZpuVnhw5uOtA4OuXw3a+Otpy8C+QV0Uu5XfhGEPSg=", + "lastModified": 1721849618, + "narHash": "sha256-+cKh/zzyzOfOC7GryAVMESpvTckOVJ+cQC01JJi1z8k=", "owner": "astro", "repo": "microvm.nix", - "rev": "a808af7775f508a2afedd1e4940a382fe1194f21", + "rev": "2f56d58cae49d6b66adc42aa3c52051a83f6a176", "type": "github" }, "original": { @@ -1351,11 +1295,11 @@ ] }, "locked": { - "lastModified": 1720845312, - "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", + "lastModified": 1722082646, + "narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", + "rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6", "type": "github" }, "original": { @@ -1371,11 +1315,11 @@ ] }, "locked": { - "lastModified": 1720926593, - "narHash": "sha256-fW6e27L6qY6s+TxInwrS2EXZZfhMAlaNqT0sWS49qMA=", + "lastModified": 1722136042, + "narHash": "sha256-x3FmT4QSyK28itMiR5zfYhUrG5nY+2dv+AIcKfmSp5A=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5fe5b0cdf1268112dc96319388819b46dc051ef4", + "rev": "c0ca47e8523b578464014961059999d8eddd4aae", "type": "github" }, "original": { @@ -1386,19 +1330,19 @@ }, "nix-topology": { "inputs": { - "devshell": "devshell_4", - "flake-utils": "flake-utils_8", + "devshell": "devshell_3", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks_4" }, "locked": { - "lastModified": 1720814919, - "narHash": "sha256-g1HYi6C+URiou9MoFOPTZUYTPHISgF2g8KbhcqLiJyM=", + "lastModified": 1721160643, + "narHash": "sha256-ZkjJnwgDUkjzgySZv9GjKnDsDmNJVkU2u2pLD4a1QKA=", "owner": "oddlama", "repo": "nix-topology", - "rev": "e7c64ea75a7dbdf984c0ac25fb44af88244ff5a4", + "rev": "fe9ace7f40a63e3eb9b39a20a1032834e090d806", "type": "github" }, "original": { @@ -1409,11 +1353,11 @@ }, "nixlib": { "locked": { - "lastModified": 1719708727, - "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=", + "lastModified": 1721523216, + "narHash": "sha256-/NjnIKkBoqKdvOS8unooDg0HqMaRUwYLbyn0ntjEckQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6", + "rev": "31a99025ce3784c20dd11dafa5260e80e314f59e", "type": "github" }, "original": { @@ -1424,8 +1368,8 @@ }, "nixos-extra-modules": { "inputs": { - "devshell": "devshell_5", - "flake-utils": "flake-utils_9", + "devshell": "devshell_4", + "flake-utils": "flake-utils_7", "lib-net": "lib-net", "nixpkgs": [ "nixpkgs" @@ -1454,11 +1398,11 @@ ] }, "locked": { - "lastModified": 1720859326, - "narHash": "sha256-i8BiZj5faQS6gsupE0S9xtiyZmWinGpVLwxXWV342aQ=", + "lastModified": 1721869487, + "narHash": "sha256-zcusn81g+0gO+tSMhfs4W+wAP9As/MWNTBCbS+Ggp7A=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "076ea5b672bb1ea535ee84cfdabd0c2f0b7f20c7", + "rev": "c12f9a969c8cdf14618774515c7c6c96aef753c7", "type": "github" }, "original": { @@ -1469,11 +1413,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1720737798, - "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", + "lastModified": 1722114937, + "narHash": "sha256-MOZ9woPwdpFJcHx3wic2Mlw9aztdKjMnFT3FaeLzJkM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", + "rev": "e67b60fb1b2c3aad2202d95b91d4c218cf2a4fdd", "type": "github" }, "original": { @@ -1557,14 +1501,14 @@ }, "nixpkgs-lib_4": { "locked": { - "lastModified": 1714640452, - "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "lastModified": 1717284937, + "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, "nixpkgs-stable": { @@ -1681,11 +1625,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720957393, - "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "lastModified": 1722062969, + "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", "type": "github" }, "original": { @@ -1697,11 +1641,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1706487304, - "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", + "lastModified": 1718428119, + "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", + "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5", "type": "github" }, "original": { @@ -1713,7 +1657,7 @@ }, "nixvim": { "inputs": { - "devshell": "devshell_6", + "devshell": "devshell_5", "flake-compat": "flake-compat_7", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", @@ -1722,14 +1666,15 @@ "nixpkgs": [ "nixpkgs" ], + "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1721042250, - "narHash": "sha256-CEOGzI9WFGezwJ3lok0F//1UEq5crzE2kZDLQK2EtfE=", + "lastModified": 1722168943, + "narHash": "sha256-7hIR+TJZH2++h431ZUwbqn7bXZxouIsSg939CI5a/Lw=", "owner": "nix-community", "repo": "nixvim", - "rev": "b9ed90003273f0a75151b32948e16b44891f403c", + "rev": "a655679eccecddee70bf43fd4ca82f91f61a5045", "type": "github" }, "original": { @@ -1738,6 +1683,28 @@ "type": "github" } }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils_8", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722144272, + "narHash": "sha256-olZbfaEdd+zNPuuyYcYGaRzymA9rOmth8yXOlVm+LUs=", + "owner": "NuschtOS", + "repo": "search", + "rev": "16565307c267ec219c2b5d3494ba66df08e7d403", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "parts": { "inputs": { "nixpkgs-lib": [ @@ -2010,6 +1977,23 @@ "wired-notify": "wired-notify" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1720344064, + "narHash": "sha256-STmaV9Zu74QtkGGrbr9uMhskwagfCjJqOAYapXabiuk=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "a5b21ea0aa644dffd7cf958b43f11f221d53404e", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "flake-utils": [ @@ -2055,15 +2039,14 @@ }, "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_12", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1715393623, - "narHash": "sha256-nSUFcUqyTQQ/aYFIB05mpCzytcKvfKMy3ZQAe0fP26A=", + "lastModified": 1719714047, + "narHash": "sha256-MeNPopLLv63EZj5L43j4TZkmW4wj1ouoc/h/E20sl/U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8eb8671512cb0c72c748058506e50c54fb5d8e2b", + "rev": "cb216719ce89a43dfb3d1b86a9575e89f4b727a4", "type": "github" }, "original": { @@ -2099,11 +2082,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1708358594, - "narHash": "sha256-e71YOotu2FYA67HoC/voJDTFsiPpZNRwmiQb4f94OxQ=", + "lastModified": 1720264467, + "narHash": "sha256-xzM92n3Q9L90faJIJrkrTtTx+JqCGRHMkHWztkV4PuY=", "ref": "refs/heads/main", - "rev": "6d0e73864d28794cdbd26ab7b37259ab0e1e044c", - "revCount": 614, + "rev": "fb59d42542049f586c84b0f8bb86ff3be338e9d3", + "revCount": 674, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, @@ -2131,11 +2114,11 @@ ] }, "locked": { - "lastModified": 1720818679, - "narHash": "sha256-u9PqY7O6TN42SLeb0e6mnYAgQOoQmclaVSHfLKMpmu0=", + "lastModified": 1721989207, + "narHash": "sha256-APKQeMMdh1O1W3OnxEvNfHNBiE4eRvEN6rosFr2dLHE=", "owner": "danth", "repo": "stylix", - "rev": "29148118cc33f08b71058e1cda7ca017f5300b51", + "rev": "b9de20c76e8d5c13cf2304d23cf589803c311670", "type": "github" }, "original": { @@ -2204,51 +2187,6 @@ "type": "github" } }, - "systems_13": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_14": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_15": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -2399,11 +2337,11 @@ ] }, "locked": { - "lastModified": 1720818892, - "narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=", + "lastModified": 1721769617, + "narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f", + "rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009", "type": "github" }, "original": { @@ -2414,7 +2352,7 @@ }, "whisper-overlay": { "inputs": { - "devshell": "devshell_7", + "devshell": "devshell_6", "flake-parts": "flake-parts_4", "nixpkgs": [ "nixpkgs" @@ -2422,11 +2360,11 @@ "pre-commit-hooks": "pre-commit-hooks_7" }, "locked": { - "lastModified": 1719174892, - "narHash": "sha256-tXFNf8V2KyxzTXRwh6FKmeH4mfWkZZai15T2svMD6IE=", + "lastModified": 1721992624, + "narHash": "sha256-qwfGxSjdUODysf93GtAK6v5GS0JAYwZeWVr8lQEBkPw=", "owner": "oddlama", "repo": "whisper-overlay", - "rev": "0ef2db6de797537c9014de6ed29715359c5527a0", + "rev": "b851520617887f09be614a990b2d50caba093525", "type": "github" }, "original": { @@ -2444,11 +2382,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1718525212, - "narHash": "sha256-6IuZ2lf9KhvFUFBRKrpgzT9J70lqKZ8f5pdkITXzKZE=", + "lastModified": 1721535277, + "narHash": "sha256-A6qIy2n3aomj5XooUmqz0s3G/A44Y3+GoFrGxIOolIM=", "owner": "Toqozz", "repo": "wired-notify", - "rev": "9e4bbd5873b11de6547cf787618a708fad076557", + "rev": "d079126c43f22179650f3d4c59f580c5993b9217", "type": "github" }, "original": { diff --git a/users/config/shell/starship-module.nix b/users/config/shell/starship-module.nix deleted file mode 100644 index 48dc247..0000000 --- a/users/config/shell/starship-module.nix +++ /dev/null @@ -1,154 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.programs.starship; - - tomlFormat = pkgs.formats.toml {}; - - starshipCmd = "${config.home.profileDirectory}/bin/starship"; -in { - meta.maintainers = []; - - options.programs.starship = { - enable = mkEnableOption "starship"; - - package = mkOption { - type = types.package; - default = pkgs.starship; - defaultText = literalExpression "pkgs.starship"; - description = "The package to use for the starship binary."; - }; - - settings = mkOption { - type = with types; let - prim = either bool (either int str); - primOrPrimAttrs = either prim (attrsOf prim); - entry = either prim (listOf primOrPrimAttrs); - entryOrAttrsOf = t: either entry (attrsOf t); - entries = entryOrAttrsOf (entryOrAttrsOf (entryOrAttrsOf entry)); - in - attrsOf entries // {description = "Starship configuration";}; - default = {}; - example = literalExpression '' - { - add_newline = false; - format = lib.concatStrings [ - "$line_break" - "$package" - "$line_break" - "$character" - ]; - scan_timeout = 10; - character = { - success_symbol = "➜"; - error_symbol = "➜"; - }; - } - ''; - description = '' - Configuration written to - {file}`$XDG_CONFIG_HOME/starship.toml`. - - See for the full list - of options. - ''; - }; - - enableBashIntegration = - mkEnableOption "Bash integration" - // { - default = true; - }; - - enableZshIntegration = - mkEnableOption "Zsh integration" - // { - default = true; - }; - - enableFishIntegration = - mkEnableOption "Fish integration" - // { - default = true; - }; - - enableIonIntegration = - mkEnableOption "Ion integration" - // { - default = true; - }; - - enableNushellIntegration = - mkEnableOption "Nushell integration" - // { - default = true; - }; - - enableTransience = mkOption { - type = types.bool; - default = false; - description = '' - The TransientPrompt feature of Starship replaces previous prompts with a - custom string. This is only a valid option for the Fish shell. - - For documentation on how to change the default replacement string and - for more information visit - https://starship.rs/advanced-config/#transientprompt-and-transientrightprompt-in-cmd - ''; - }; - }; - - config = mkIf cfg.enable { - home.packages = [cfg.package]; - - xdg.configFile."starship.toml" = mkIf (cfg.settings != {}) { - source = tomlFormat.generate "starship-config" cfg.settings; - }; - - programs.bash.initExtra = mkIf cfg.enableBashIntegration '' - if [[ $TERM != "dumb" ]]; then - eval "$(${starshipCmd} init bash --print-full-init)" - fi - ''; - - programs.zsh.initExtra = mkIf cfg.enableZshIntegration '' - if [[ $TERM != "dumb" ]]; then - eval "$(${starshipCmd} init zsh)" - fi - ''; - - programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration '' - if test "$TERM" != "dumb" - eval (${starshipCmd} init fish) - ${lib.optionalString cfg.enableTransience "enable_transience"} - end - ''; - - programs.ion.initExtra = mkIf cfg.enableIonIntegration '' - if test $TERM != "dumb" - eval $(${starshipCmd} init ion) - end - ''; - - programs.nushell = mkIf cfg.enableNushellIntegration { - # Unfortunately nushell doesn't allow conditionally sourcing nor - # conditionally setting (global) environment variables, which is why the - # check for terminal compatibility (as seen above for the other shells) is - # not done here. - extraEnv = '' - let starship_cache = "${config.xdg.cacheHome}/starship" - if not ($starship_cache | path exists) { - mkdir $starship_cache - } - ${starshipCmd} init nu | save --force ${config.xdg.cacheHome}/starship/init.nu - ''; - extraConfig = '' - source ${config.xdg.cacheHome}/starship/init.nu - ''; - }; - }; -} diff --git a/users/config/shell/starship.nix b/users/config/shell/starship.nix index d0f0f7c..389ab30 100644 --- a/users/config/shell/starship.nix +++ b/users/config/shell/starship.nix @@ -1,28 +1,6 @@ -{ - lib, - pkgs, - ... -}: { - disabledModules = ["programs/starship.nix"]; - imports = [./starship-module.nix]; - +{lib, ...}: { programs.starship = { enable = true; - package = let - src = pkgs.fetchFromGitHub { - owner = "oddlama"; - repo = "starship"; - rev = "feat-more-dynamic-username-and-hostname"; - hash = "sha256-afZO5WSVy9hWRz8Mki3ayCwdvZDZt9L1yegrjRnqYko="; - }; - in - pkgs.starship.overrideAttrs (_finalAttrs: previousAttrs: { - inherit src; - cargoDeps = previousAttrs.cargoDeps.overrideAttrs (_: { - inherit src; - outputHash = "sha256-bmswPBJi2YpnhnS77S++/+SQnlerWWRqFZPCZkBUeFg="; - }); - }); settings = { add_newline = false; format = lib.concatStrings [ @@ -45,17 +23,16 @@ ]; command_timeout = 60; # 60ms must be enough. I like a responsive prompt more than additional git information. username = { - format = "[$user]($style) "; - show_if_root = false; - show_if_ssh = false; - style = "yellow"; + format = "[$user]($style)"; + style_root = "bold red"; + style_user = "bold purple"; + aliases.root = ""; }; hostname = { format = "[$hostname]($style)[$ssh_symbol](green)"; - ssh_only = false; + ssh_only = true; ssh_symbol = " 󰣀"; - style = "bold purple"; - user_overrides.root.style = "bold red"; + style = "bold red"; }; directory = { format = "[$path]($style)[$read_only]($read_only_style)";