From e330be9673854f531274f3bd8a795bcaff3814e6 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Tue, 26 Mar 2024 18:32:51 -0400 Subject: [PATCH] Remove unused software --- flake.lock | 702 ++++------------------------------------- flake.nix | 18 +- home/zellij.nix | 13 - nixos/cache-server.nix | 31 -- nixos/ema/emanote.nix | 20 -- nixos/nix.nix | 4 - packages/overlay.nix | 1 - 7 files changed, 71 insertions(+), 718 deletions(-) delete mode 100644 nixos/cache-server.nix delete mode 100644 nixos/ema/emanote.nix diff --git a/flake.lock b/flake.lock index 6f33302..cb125bc 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "actual": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1705648793, - "narHash": "sha256-7sjDc5vehykyCPQl/PzHV3WCSODZs3Nqamd/6XtS4As=", - "owner": "srid", - "repo": "actual", - "rev": "f2ac9043e0ac060dc7c15a10140051b6be3d0ed2", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "actual", - "type": "github" - } - }, "cargo-doc-live": { "locked": { "lastModified": 1692743000, @@ -51,21 +30,6 @@ "type": "github" } }, - "check-flake": { - "locked": { - "lastModified": 1662502605, - "narHash": "sha256-jAT55UhabAxLAVGanxjnNdzH2/oX2ZjLsL4i2jPIP+g=", - "owner": "srid", - "repo": "check-flake", - "rev": "48a17393ed4fcd523399d6602c283775b5127295", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "check-flake", - "type": "github" - } - }, "colmena-flake": { "locked": { "lastModified": 1711476729, @@ -104,7 +68,7 @@ }, "crane_2": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_3", "nixpkgs": [ "nixci", @@ -233,22 +197,6 @@ "type": "github" } }, - "ema": { - "flake": false, - "locked": { - "lastModified": 1671908068, - "narHash": "sha256-1U5uBaYsH+YT8IFLEzuAqo7H7ifsOQMp8b8FLG38YVs=", - "owner": "srid", - "repo": "ema", - "rev": "9fc92a132eaeedc4556eb9c17bd79ab7d96c2aaf", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "ema", - "type": "github" - } - }, "emacs-overlay": { "flake": false, "locked": { @@ -298,32 +246,6 @@ "type": "github" } }, - "emanote": { - "inputs": { - "check-flake": "check-flake", - "ema": "ema", - "flake-parts": "flake-parts_2", - "flake-root": "flake-root", - "haskell-flake": "haskell-flake", - "heist": "heist", - "heist-extra": "heist-extra", - "nixpkgs": "nixpkgs", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1671893597, - "narHash": "sha256-JJEKhxOuNy/J/svXLlW05WBNTfK6mLhmLy8l/VK6TKM=", - "owner": "srid", - "repo": "emanote", - "rev": "0cf5b5958eba440254d5ea3bbc2ff7652e4e255b", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "emanote", - "type": "github" - } - }, "evil-escape": { "flake": false, "locked": { @@ -437,22 +359,6 @@ } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -466,7 +372,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -486,42 +392,6 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, - "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1668450977, - "narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, "locked": { "lastModified": 1698579227, "narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=", @@ -536,9 +406,9 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_2": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_4" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1698882062, @@ -554,9 +424,9 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_3": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_5" + "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { "lastModified": 1688466019, @@ -572,43 +442,7 @@ "type": "github" } }, - "flake-parts_6": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_6" - }, - "locked": { - "lastModified": 1685662779, - "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_7": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_7" - }, - "locked": { - "lastModified": 1672877861, - "narHash": "sha256-ROnSmsk5grROL6gnHBnSdqlPPBrBJMApCeB7xzY567M=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "7930f5b1c356270cec420d4f4cb43f4907206640", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_8": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -629,21 +463,6 @@ "type": "github" } }, - "flake-root": { - "locked": { - "lastModified": 1671378805, - "narHash": "sha256-yqGxyzMN2GuppwG3dTWD1oiKxi+jGYP7D1qUSc5vKhI=", - "owner": "srid", - "repo": "flake-root", - "rev": "dc7ba6166e478804a9da6881aa48c45d300075cf", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -682,7 +501,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1692799911, @@ -700,7 +519,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1681202837, @@ -718,7 +537,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1681202837, @@ -736,7 +555,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1701680307, @@ -754,7 +573,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1701680307, @@ -770,21 +589,6 @@ "type": "github" } }, - "flake-utils_8": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "format-all": { "flake": false, "locked": { @@ -824,53 +628,6 @@ "type": "github" } }, - "haskell-flake": { - "locked": { - "lastModified": 1668167720, - "narHash": "sha256-5wDTR6xt9BB3BjgKR+YOjOkZgMyDXKaX79g42sStzDU=", - "owner": "srid", - "repo": "haskell-flake", - "rev": "4fc511d93a55fedf815c1647ad146c26d7a2054e", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "haskell-flake", - "type": "github" - } - }, - "heist": { - "flake": false, - "locked": { - "lastModified": 1668478922, - "narHash": "sha256-HVIRUx90r0pvJKfLU6fM51/SdzvNOzv0466xIOeSFlo=", - "owner": "snapframework", - "repo": "heist", - "rev": "a23f0b5d70556742644189d71d694f379738cdbc", - "type": "github" - }, - "original": { - "owner": "snapframework", - "repo": "heist", - "type": "github" - } - }, - "heist-extra": { - "flake": false, - "locked": { - "lastModified": 1668486579, - "narHash": "sha256-VmyGntVH/tVosftplC4O0JhYA34kXeq1Wu/RbJr132Y=", - "owner": "srid", - "repo": "heist-extra", - "rev": "da94abfa68f67933baef9b529fe8d2a4edc572d5", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "heist-extra", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -917,12 +674,12 @@ "cargo-doc-live": "cargo-doc-live", "crane": "crane", "dioxus-desktop-template": "dioxus-desktop-template", - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_2", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs", "process-compose-flake": "process-compose-flake", "rust-overlay": "rust-overlay", "systems": "systems_2", - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix" }, "locked": { "lastModified": 1707643180, @@ -996,7 +753,7 @@ "nix-straight": [ "nix-straight" ], - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nose": "nose", "ob-racket": "ob-racket", "org": "org", @@ -1043,28 +800,6 @@ "type": "github" } }, - "nix-serve-ng": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1702912615, - "narHash": "sha256-qseX+/8drgwxOb1I3LKqBYMkmyeI5d5gmHqbZccR660=", - "owner": "aristanetworks", - "repo": "nix-serve-ng", - "rev": "21e65cb4c62b5c9e3acc11c3c5e8197248fa46a4", - "type": "github" - }, - "original": { - "owner": "aristanetworks", - "repo": "nix-serve-ng", - "type": "github" - } - }, "nix-straight": { "flake": false, "locked": { @@ -1087,12 +822,12 @@ "cargo-doc-live": "cargo-doc-live_2", "crane": "crane_2", "devour-flake": "devour-flake", - "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_5", + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_4", "process-compose-flake": "process-compose-flake_2", "rust-overlay": "rust-overlay_3", - "systems": "systems_7", - "treefmt-nix": "treefmt-nix_3" + "systems": "systems_6", + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1711384311, @@ -1108,25 +843,6 @@ "type": "github" } }, - "nixd": { - "inputs": { - "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1687572024, - "narHash": "sha256-FLzcdNXEqwyAYhbr3lucklj+s5JUvjgZg1uJ7ZWVANw=", - "owner": "nix-community", - "repo": "nixd", - "rev": "3dbe1eb6bde1949b510e19a2d1863a2f4d2329a6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixd", - "type": "github" - } - }, "nixos-flake": { "locked": { "lastModified": 1708785992, @@ -1157,28 +873,10 @@ "type": "github" } }, - "nixos-shell": { - "inputs": { - "nixpkgs": "nixpkgs_9" - }, - "locked": { - "lastModified": 1646257415, - "narHash": "sha256-whHBBcthLhEIy2VTaioRZOSZoZR7pk4Qr4DVxwU0r9Y=", - "owner": "Mic92", - "repo": "nixos-shell", - "rev": "55de7d4d449ff30cdde8b8fe484a86eef477245e", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "nixos-shell", - "type": "github" - } - }, "nixos-vscode-server": { "inputs": { "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1684517665, @@ -1196,11 +894,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1668443372, - "narHash": "sha256-lXNlVyNWwO22/JUdBtUWz68jZB3DM+Jq/irlsbwncI0=", + "lastModified": 1701237617, + "narHash": "sha256-Ryd8xpNDY9MJnBFDYhB37XSFIxCPVVVXAbInNPa95vs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dad4de1694cd92d9a0e123bfdf134d0047b836a5", + "rev": "85306ef2470ba705c97ce72741d56e42d0264015", "type": "github" }, "original": { @@ -1211,42 +909,6 @@ } }, "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_2": { - "locked": { - "dir": "lib", - "lastModified": 1665349835, - "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_3": { "locked": { "dir": "lib", "lastModified": 1696019113, @@ -1264,7 +926,7 @@ "type": "github" } }, - "nixpkgs-lib_4": { + "nixpkgs-lib_2": { "locked": { "dir": "lib", "lastModified": 1698611440, @@ -1282,7 +944,7 @@ "type": "github" } }, - "nixpkgs-lib_5": { + "nixpkgs-lib_3": { "locked": { "dir": "lib", "lastModified": 1688049487, @@ -1300,153 +962,7 @@ "type": "github" } }, - "nixpkgs-lib_6": { - "locked": { - "dir": "lib", - "lastModified": 1685564631, - "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_7": { - "locked": { - "dir": "lib", - "lastModified": 1672350804, - "narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-match": { - "inputs": { - "flake-parts": "flake-parts_7", - "nixpkgs": "nixpkgs_12" - }, - "locked": { - "lastModified": 1672924430, - "narHash": "sha256-rzMnLkTGxKowPEaI0am4iNouLvYFjYf2rtjV1lou8tw=", - "owner": "srid", - "repo": "nixpkgs-match", - "rev": "8776f12051e0d9c6467df9f1a0728291d10ad441", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "nixpkgs-match", - "type": "github" - } - }, - "nixpkgs_10": { - "locked": { - "lastModified": 1682526928, - "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", - "path": "/nix/store/wsci3as2flp84w6w5gzbyphxzf6ilasd-source", - "rev": "d6b863fd9b7bb962e6f9fdf292419a775e772891", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { - "locked": { - "lastModified": 1672756850, - "narHash": "sha256-Smbq3+fitwA13qsTMeaaurv09/KVbZfW7m7lINwzDGA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "298add347c2bbce14020fcb54051f517c391196b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_13": { - "locked": { - "lastModified": 1679793451, - "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0cd51a933d91078775b300cf0f29aa3495231aa2", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_14": { - "locked": { - "lastModified": 1680945546, - "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1701237617, - "narHash": "sha256-Ryd8xpNDY9MJnBFDYhB37XSFIxCPVVVXAbInNPa95vs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "85306ef2470ba705c97ce72741d56e42d0264015", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1681358109, "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", @@ -1462,7 +978,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1695806987, "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=", @@ -1477,7 +993,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1688590700, "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=", @@ -1493,7 +1009,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1681358109, "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", @@ -1509,7 +1025,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1680945546, "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", @@ -1525,42 +1041,56 @@ "type": "github" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 1682526928, + "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", + "path": "/nix/store/wsci3as2flp84w6w5gzbyphxzf6ilasd-source", + "rev": "d6b863fd9b7bb962e6f9fdf292419a775e772891", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_8": { "locked": { - "lastModified": 1686398752, - "narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=", - "owner": "NixOS", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "a30520bf8eabf8a5c37889d661e67a2dbcaa59e6", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1628465643, - "narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=", - "owner": "NixOS", + "lastModified": 1680945546, + "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "6ef4f522d63f22b40004319778761040d3197390", + "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "nixos", "ref": "nixos-unstable", - "type": "indirect" + "repo": "nixpkgs", + "type": "github" } }, "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_8", + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_4", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin_2", "nixpkgs": [ @@ -1598,25 +1128,6 @@ "type": "github" } }, - "nuenv": { - "inputs": { - "nixpkgs": "nixpkgs_13", - "rust-overlay": "rust-overlay_4" - }, - "locked": { - "lastModified": 1680273459, - "narHash": "sha256-HqD+HJUKvofCAFrQWj1D8m4g8aAWT6m37BK2mhCLX94=", - "owner": "DeterminateSystems", - "repo": "nuenv", - "rev": "f9db325b35fef96784588cc267fcd921c94ea0e3", - "type": "github" - }, - "original": { - "owner": "DeterminateSystems", - "repo": "nuenv", - "type": "github" - } - }, "ob-racket": { "flake": false, "locked": { @@ -1699,7 +1210,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_7", "gitignore": "gitignore", "nixpkgs": [ @@ -1773,30 +1284,23 @@ }, "root": { "inputs": { - "actual": "actual", "colmena-flake": "colmena-flake", "disko": "disko", "emacs-overlay": "emacs-overlay", - "emanote": "emanote", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts", "home-manager": "home-manager", "nix-browser": "nix-browser", "nix-darwin": "nix-darwin", "nix-doom-emacs": "nix-doom-emacs", "nix-index-database": "nix-index-database", - "nix-serve-ng": "nix-serve-ng", "nix-straight": "nix-straight", "nixci": "nixci", - "nixd": "nixd", "nixos-flake": "nixos-flake", "nixos-hardware": "nixos-hardware", - "nixos-shell": "nixos-shell", "nixos-vscode-server": "nixos-vscode-server", - "nixpkgs": "nixpkgs_11", - "nixpkgs-match": "nixpkgs-match", + "nixpkgs": "nixpkgs_8", "nixvim": "nixvim", - "nuenv": "nuenv", - "treefmt-nix": "treefmt-nix_4" + "treefmt-nix": "treefmt-nix_3" } }, "rotate-text": { @@ -1818,7 +1322,7 @@ "rust-overlay": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1701310566, @@ -1864,7 +1368,7 @@ "rust-overlay_3": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1694052649, @@ -1880,28 +1384,6 @@ "type": "github" } }, - "rust-overlay_4": { - "inputs": { - "flake-utils": "flake-utils_8", - "nixpkgs": [ - "nuenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1679970108, - "narHash": "sha256-8OfySbY1hhBzj0Iz90k4se6oFCGS3+ke31vkd0d4k/o=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "26ef1a2029239e204e51ab3402f8aae5aa1187ed", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sln-mode": { "flake": false, "locked": { @@ -1933,21 +1415,6 @@ "type": "github" } }, - "systems_10": { - "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, @@ -2069,21 +1536,6 @@ } }, "treefmt-nix": { - "locked": { - "lastModified": 1672170030, - "narHash": "sha256-hvTMwlutePPQ4eNMVHiI0crixCyeSTKJIDhLD/66t2g=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "c97bb3db343ccd2f04dd4e5fa8750e821560e9ca", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nix-browser", @@ -2104,9 +1556,9 @@ "type": "github" } }, - "treefmt-nix_3": { + "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1688026376, @@ -2122,9 +1574,9 @@ "type": "github" } }, - "treefmt-nix_4": { + "treefmt-nix_3": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1689243103, @@ -2156,24 +1608,6 @@ "type": "github" } }, - "utils": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "ws-butler": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 1b7acbd..0036fa6 100644 --- a/flake.nix +++ b/flake.nix @@ -15,22 +15,11 @@ disko.inputs.nixpkgs.follows = "nixpkgs"; colmena-flake.url = "github:juspay/colmena-flake"; - # CI server - nix-serve-ng.url = "github:aristanetworks/nix-serve-ng"; - nix-serve-ng.inputs.nixpkgs.follows = "nixpkgs"; - # Software inputs - nixos-shell.url = "github:Mic92/nixos-shell"; nixos-vscode-server.flake = false; nixos-vscode-server.url = "github:nix-community/nixos-vscode-server"; - emanote.url = "github:srid/emanote"; - nixpkgs-match.url = "github:srid/nixpkgs-match"; - nuenv.url = "github:DeterminateSystems/nuenv"; - nixd.url = "github:nix-community/nixd"; nixci.url = "github:srid/nixci"; nix-browser.url = "github:juspay/nix-browser"; - actual.url = "github:srid/actual"; - actual.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; @@ -118,10 +107,9 @@ packages.default = self'.packages.activate; devShells.default = pkgs.mkShell { inputsFrom = [ config.treefmt.build.devShell ]; - packages = [ - pkgs.nixos-rebuild - pkgs.just - pkgs.colmena + packages = with pkgs; [ + just + colmena ]; }; }; diff --git a/home/zellij.nix b/home/zellij.nix index 2ad818f..ad069b7 100644 --- a/home/zellij.nix +++ b/home/zellij.nix @@ -21,17 +21,4 @@ }; }; }; - - home.packages = [ - # Open zellij by prompting for CWD - (pkgs.nuenv.mkScript { - name = "zux"; - script = '' - let PRJ = (zoxide query -i) - let NAME = ($PRJ | parse $"($env.HOME)/{relPath}" | get relPath | first | str replace -a / ／) - echo $"Launching zellij for ($PRJ)" - cd $PRJ ; exec zellij attach -c $NAME - ''; - }) - ]; } diff --git a/nixos/cache-server.nix b/nixos/cache-server.nix deleted file mode 100644 index 83f582b..0000000 --- a/nixos/cache-server.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ domain }: - -{ pkgs, lib, config, flake, ... }: -{ - imports = [ - flake.inputs.nix-serve-ng.nixosModules.default - ]; - - # Cache server - # sops.secrets."cache-server/private-key".owner = "root"; - services.nix-serve = { - enable = true; - secretKeyFile = config.sops.secrets."cache-server/private-key".path; - }; - nix.settings.allowed-users = [ "nix-serve" ]; - nix.settings.trusted-users = [ "nix-serve" ]; - - # Web server - services.nginx = { - virtualHosts.${domain} = { - forceSSL = true; - enableACME = true; - locations."/".extraConfig = '' - proxy_pass http://localhost:${toString config.services.nix-serve.port}; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - ''; - }; - }; -} diff --git a/nixos/ema/emanote.nix b/nixos/ema/emanote.nix deleted file mode 100644 index 71b6b6a..0000000 --- a/nixos/ema/emanote.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, flake, ... }: -let - emanote = flake.inputs.emanote.outputs.defaultPackage.${pkgs.system}; -in -{ - # Global service, rather than user service, as the latter doesn't work in NixOS-WSL - systemd.services.emanote = { - description = "Emanote ~/Documents/Notes"; - after = [ "network.target" ]; - wantedBy = [ "default.target" ]; - environment = { - PORT = "7000"; - }; - serviceConfig = { - User = flake.config.people.myself; - Restart = "always"; - ExecStart = "${emanote}/bin/emanote -L /home/${flake.config.people.myself}/Documents/Notes"; - }; - }; -} diff --git a/nixos/nix.nix b/nixos/nix.nix index beb8db1..27aaf46 100644 --- a/nixos/nix.nix +++ b/nixos/nix.nix @@ -8,9 +8,6 @@ allowUnfree = true; }; overlays = [ - flake.inputs.nuenv.overlays.nuenv - flake.inputs.nixd.overlays.default - flake.inputs.nuenv.overlays.default (import flake.inputs.emacs-overlay) (import ../packages/overlay.nix { inherit flake; inherit (pkgs) system; }) ]; @@ -31,4 +28,3 @@ }; }; } - diff --git a/packages/overlay.nix b/packages/overlay.nix index 77ed564..f845e68 100644 --- a/packages/overlay.nix +++ b/packages/overlay.nix @@ -6,5 +6,4 @@ self: super: { sshuttle-via = self.callPackage ./sshuttle-via.nix { }; nixci = flake.inputs.nixci.packages.${system}.default; nix-health = flake.inputs.nix-browser.packages.${system}.nix-health; - actual = flake.inputs.actual.packages.${system}.default; }