nix: flake update
Anirudh Oppiliappan x@icyphox.sh
Wed, 01 Nov 2023 14:55:50 +0200
6 files changed,
60 insertions(+),
184 deletions(-)
M
nix/darwin/com.googlecode.iterm2.plist
→
nix/darwin/com.googlecode.iterm2.plist
@@ -655,6 +655,10 @@ <key>HideScrollbar</key>
<true/> <key>HotkeyMigratedFromSingleToMulti</key> <true/> + <key>NeverWarnAboutShortLivedSessions_1FA48ED0-C56C-4189-9FCE-54B76BFD9373</key> + <true/> + <key>NeverWarnAboutShortLivedSessions_1FA48ED0-C56C-4189-9FCE-54B76BFD9373_selection</key> + <integer>0</integer> <key>New Bookmarks</key> <array> <dict>
M
nix/darwin/home.nix
→
nix/darwin/home.nix
@@ -7,8 +7,9 @@ , ...
}: { - home.stateVersion = "23.11"; + home.stateVersion = "23.05"; home.username = "icy"; + manual.manpages.enable = false; imports = [@@ -29,8 +30,12 @@ ripgrep
pass fd gnupg - docker + colima pinentry_mac kubectl + + go + gopls + gotools ] ++ (import ../bin { inherit pkgs host; }); }
M
nix/flake.lock
→
nix/flake.lock
@@ -7,11 +7,11 @@ "nixpkgs"
] }, "locked": { - "lastModified": 1687290953, - "narHash": "sha256-PF0VGsuLxozDPLEGajGnb5usoO1v7YzzqOcG6k4ndQ4=", + "lastModified": 1698429334, + "narHash": "sha256-Gq3+QabboczSu7RMpcy79RSLMSqnySO3wsnHQk4DfbE=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ed275afbbaad9b0670e2aeac3ae542595255d604", + "rev": "afe83cbc2e673b1f08d32dd0f70df599678ff1e7", "type": "github" }, "original": {@@ -21,36 +21,14 @@ "repo": "nix-darwin",
"type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "prompt", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1642141613, - "narHash": "sha256-WFS7T5oOLD8anu/77iz7EPz7zQsJZtP5qVa5485k3dI=", - "owner": "nix-community", - "repo": "fenix", - "rev": "d75ffc9f1d3b60bb597e48ae01f486a6de27d30e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": {@@ -67,11 +45,11 @@ "nixpkgs"
] }, "locked": { - "lastModified": 1685662779, - "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", + "lastModified": 1698579227, + "narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", + "rev": "f76e870d64779109e41370848074ac4eaa1606ec", "type": "github" }, "original": {@@ -82,42 +60,23 @@ }
}, "flake-parts_2": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1685662779, - "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, - "flake-parts_3": { - "inputs": { "nixpkgs-lib": [ "neovim", "hercules-ci-effects", - "hercules-ci-agent", "nixpkgs" ] }, "locked": { - "lastModified": 1685662779, - "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "type": "github" }, "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" + "id": "flake-parts", + "type": "indirect" } }, "flake-utils": {@@ -138,56 +97,20 @@ "repo": "flake-utils",
"type": "github" } }, - "haskell-flake": { - "locked": { - "lastModified": 1684780604, - "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=", - "owner": "srid", - "repo": "haskell-flake", - "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2", - "type": "github" - }, - "original": { - "owner": "srid", - "ref": "0.3.0", - "repo": "haskell-flake", - "type": "github" - } - }, - "hercules-ci-agent": { - "inputs": { - "flake-parts": "flake-parts_3", - "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1686721748, - "narHash": "sha256-ilD6ANYID+b0/+GTFbuZXfmu92bqVqY5ITKXSxqIp5A=", - "owner": "hercules-ci", - "repo": "hercules-ci-agent", - "rev": "7192b83935ab292a8e894db590dfd44f976e183b", - "type": "github" - }, - "original": { - "id": "hercules-ci-agent", - "type": "indirect" - } - }, "hercules-ci-effects": { "inputs": { "flake-parts": "flake-parts_2", - "hercules-ci-agent": "hercules-ci-agent", "nixpkgs": [ "neovim", "nixpkgs" ] }, "locked": { - "lastModified": 1686830987, - "narHash": "sha256-1XLTM0lFr3NV+0rd55SQW/8oQ3ACnqlYcda3FelIwHU=", + "lastModified": 1698165573, + "narHash": "sha256-cnMTgCDnZiQKsf+wVzigpexskqRCFTKgS58Wx2rNU1c=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "04e4ab63b9eed2452edee1bb698827e1cb8265c6", + "rev": "300e0af24a1bbe32d115beb182efb01785582c45", "type": "github" }, "original": {@@ -203,11 +126,11 @@ "nixpkgs"
] }, "locked": { - "lastModified": 1687301540, - "narHash": "sha256-vFbCrE9WlOSVpyAT5VNR3bqMB7W7sDzMNDcO6JqtmBw=", + "lastModified": 1698479159, + "narHash": "sha256-rJHBDwW4LbADEfhkgGHjKGfL2dF44NrlyXdXeZrQahs=", "owner": "nix-community", "repo": "home-manager", - "rev": "9a76fb9a852fdf9edd3b0aabc119efa1d618f969", + "rev": "f92a54fef4eacdbe86b0a2054054dd58b0e2a2a4", "type": "github" }, "original": {@@ -222,14 +145,14 @@ "flake-compat": "flake-compat",
"flake-parts": "flake-parts", "hercules-ci-effects": "hercules-ci-effects", "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1687305901, - "narHash": "sha256-dOxIJUGafmsBgvQp9wrX7AkH9Dgc55bFUtARBSsvvg8=", + "lastModified": 1698624085, + "narHash": "sha256-n3Qy+j0Y3Tiw/JtxnDdWLiReTodikcxzvAr2CgvqMwM=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "3293647eeb76c09d03f6d12ee38472a87f303836", + "rev": "06a5aedc5a6da00f5340deff07a41dd9b4b6e31b", "type": "github" }, "original": {@@ -248,11 +171,11 @@ ]
}, "locked": { "dir": "contrib", - "lastModified": 1687288633, - "narHash": "sha256-ruvOPW2915R3Jbb/PCKUCwojA9koBK+D+NFu1ZWpZHA=", + "lastModified": 1698578059, + "narHash": "sha256-ag1gtyLgdz42ytzv3X+6T8ir1Ul1fiPTg5NCf8RWs/s=", "owner": "neovim", "repo": "neovim", - "rev": "3bf887f6e08fa272679187340ca483809275b20a", + "rev": "8405649f92a8a8eb254944eca15e8b0169cbb6fb", "type": "github" }, "original": {@@ -264,11 +187,11 @@ }
}, "nixos-hardware": { "locked": { - "lastModified": 1686838567, - "narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=", + "lastModified": 1698053470, + "narHash": "sha256-sP8D/41UiwC2qn0X40oi+DfuVzNHMROqIWdSdCI/AYA=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89", + "rev": "80d98a7d55c6e27954a166cb583a41325e9512d7", "type": "github" }, "original": {@@ -279,83 +202,48 @@ }
}, "nixpkgs": { "locked": { - "lastModified": 1686501370, - "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", + "lastModified": 1698553279, + "narHash": "sha256-T/9P8yBSLcqo/v+FTOBK+0rjzjPMctVymZydbvR/Fak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", + "rev": "90e85bc7c1a6fc0760a94ace129d3a1c61c3d035", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib": { - "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", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1687274257, - "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", + "lastModified": 1698434055, + "narHash": "sha256-Phxi5mUKSoL7A0IYUiYtkI9e8NcGaaV5PJEaJApU1Ko=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", + "rev": "1a3c95e3b23b3cdb26750621c08cc2f1560cb883", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1686960236, - "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } }, "prompt": { "inputs": { - "fenix": "fenix", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1662898783, - "narHash": "sha256-wh/sty5Gs7vwDcuNpxekI/7lzg7LEyQIQVAX0dMJTE8=", + "lastModified": 1694244899, + "narHash": "sha256-+Nv7HVG/s2Jers3+XiBqYzg+X+MpDY+j5Rucyfgoib0=", "ref": "refs/heads/master", - "rev": "306640f502ef24e31590eef910b78ccd85ce8f6e", - "revCount": 5, + "rev": "39c3e7baf034bdbecc29f5f441d8dde634833b52", + "revCount": 6, "type": "git", "url": "https://git.peppe.rs/cli/prompt" },@@ -370,25 +258,8 @@ "darwin": "darwin",
"home-manager": "home-manager", "neovim": "neovim", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "prompt": "prompt" - } - }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1642101527, - "narHash": "sha256-C4zcaWULWlrirpEt/pA85CCMBt+7SWZweMaMJ7EvrXw=", - "owner": "rust-analyzer", - "repo": "rust-analyzer", - "rev": "b4c31481a554d0132003228ba319bd9476fe85ae", - "type": "github" - }, - "original": { - "owner": "rust-analyzer", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" } }, "systems": {
M
nix/flake.nix
→
nix/flake.nix
@@ -2,7 +2,7 @@ {
description = "icy's nixos config"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixos-hardware.url = "github:nixos/nixos-hardware";@@ -38,13 +38,6 @@
overlays = { nvim-nightly = neovim.overlay; prompt = prompt.overlay; - plan9patched = (self: super: { - plan9patched = super.plan9port.overrideAttrs (old: { - patches = (old.patches or [ ]) ++ [ - ./patches/acme.patch - ]; - }); - }); }; darwinConfigurations = {
M
nix/home.nix
→
nix/home.nix
@@ -14,7 +14,7 @@ ];
fonts.fontconfig.enable = true; - home.stateVersion = "22.11"; + home.stateVersion = "23.05"; home.username = "icy"; home.homeDirectory = "/home/icy"; home.extraOutputsToInstall = [ "man" ];
M
nix/hosts/kvothe/configuration.nix
→
nix/hosts/kvothe/configuration.nix
@@ -2,7 +2,10 @@ { self, config, pkgs, lib, ... }:
{ programs.bash.enable = true; - environment.shells = [ pkgs.bash ]; + environment = { + shells = [ pkgs.bash ]; + }; + users.users.icy = { name = "icy";