attempt to fix home-manager standalone (not working)

2025-08-23 21:54:41 +00:00 · 2025-01-20 15:35:21 -05:00
4 changed files with 68 additions and 68 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -19,11 +19,11 @@
    "base16-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1739162639,
-        "narHash": "sha256-Hs272gEgYj29XJ4FnMRXExtnbYqRGXIGaRZXo9I2P58=",
+        "lastModified": 1716483968,
+        "narHash": "sha256-GRF/6AobXHamw8TZ3FjL7SI6ulcpwpcohsIuZeCSh2A=",
        "owner": "RRethy",
        "repo": "base16-nvim",
-        "rev": "2fdd4e53286dbb8978699b5e1cd09835362a70f3",
+        "rev": "6ac181b5733518040a33017dde654059cd771b7c",
        "type": "github"
      },
      "original": {
@@ -87,11 +87,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739548217,
-        "narHash": "sha256-rlv64erpr36xdmMDPgf9rhRXBYZ0BZb5nrw2ZPSk1sQ=",
+        "lastModified": 1737162735,
+        "narHash": "sha256-5T+HkouTMGaRm0rh3kgD4Z1O7ONKfgjyoPQH5rSyreU=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "678b22642abde2ee77ae2218ab41d802f010e5b0",
+        "rev": "87131f51f8256952d1a306b5521cedc2dc61aa08",
        "type": "github"
      },
      "original": {
@@ -108,11 +108,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739582867,
-        "narHash": "sha256-rO528HmsiPi3RO9kZdYt0NnzN3pxpXz33m6H/sIFgzI=",
+        "lastModified": 1737038063,
+        "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "4edb87a2ac9010da6fea50fc56d67e123fca85f4",
+        "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2",
        "type": "github"
      },
      "original": {
@@ -145,11 +145,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739580952,
-        "narHash": "sha256-nw4dHhyxbKZVPKiBho4StznHNxlFKnY/lIJbRssXPPQ=",
+        "lastModified": 1737161595,
+        "narHash": "sha256-Txp3uh0KdB3+Pe6xihU0JWWe0LK8iXTUnZ8bOcKu3w0=",
        "owner": "bandithedoge",
        "repo": "nixpkgs-firefox-darwin",
-        "rev": "99a56b8763d3f5485c89e1e05ea8133f75821fbd",
+        "rev": "3224752c71a5245e90cfae360e0dc5de98e2b53c",
        "type": "github"
      },
      "original": {
@@ -307,11 +307,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739571712,
-        "narHash": "sha256-0UdSDV/TBY+GuxXLbrLq3l2Fq02ciyKCIMy4qmnfJXQ=",
+        "lastModified": 1737120639,
+        "narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "6d3163aea47fdb1fe19744e91306a2ea4f602292",
+        "rev": "a0046af169ce7b1da503974e1b22c48ef4d71887",
        "type": "github"
      },
      "original": {
@@ -330,11 +330,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1739586878,
-        "narHash": "sha256-WgBHMXYhWIpRhhIESolbmd1fnsjyMTOadSAB7xe+WS0=",
+        "lastModified": 1737163288,
+        "narHash": "sha256-PROBXqOUzgqIG66S74P1nyg7MbNoQ01k3oF0IM7qpHY=",
        "owner": "martinvonz",
        "repo": "jj",
-        "rev": "3bc111e60efdea774b6d979c0809256218b2549b",
+        "rev": "83d40d2c425fa2e050bdac8837b19e5beb3bef25",
        "type": "github"
      },
      "original": {
@@ -409,7 +409,7 @@
    "nextcloud-snappymail": {
      "flake": false,
      "locked": {
-        "lastModified": 1739590975,
+        "lastModified": 1737171597,
        "narHash": "sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E=",
        "type": "tarball",
        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz"
@@ -478,11 +478,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1739446958,
-        "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
+        "lastModified": 1737062831,
+        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
+        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
        "type": "github"
      },
      "original": {
@@ -526,11 +526,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1739446958,
-        "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
+        "lastModified": 1737062831,
+        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
+        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
        "type": "github"
      },
      "original": {
@@ -547,11 +547,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1739589581,
-        "narHash": "sha256-8/3jzauKwx4xZQf2yol/E1YDRfHTt5/tYEK3n5+Py4A=",
+        "lastModified": 1737170882,
+        "narHash": "sha256-Km700i1Eg72bFsU2X2ZgH4qEgx6SrdZFJURJGTSQH2M=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "e353ac4b999db166ad92074ca66f2394d65aeb1d",
+        "rev": "62cdd681201843553ec740a85ccf2f0a6fca75c6",
        "type": "github"
      },
      "original": {
@@ -563,11 +563,11 @@
    "nvim-lint-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1738838825,
-        "narHash": "sha256-E/KcQr4RM4gz+ItENI9e7hMicyBKyzoIaDO5D1VDYSw=",
+        "lastModified": 1736154173,
+        "narHash": "sha256-OChCLXHAqa129NiGfmwddq0Hj5F9AtC3TmFbnNCZqfo=",
        "owner": "mfussenegger",
        "repo": "nvim-lint",
-        "rev": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8",
+        "rev": "dfa45de973c3ce7bd1b9a6d346f896a68ad07e44",
        "type": "github"
      },
      "original": {
@@ -596,11 +596,11 @@
    "nvim-tree-lua-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1739135162,
-        "narHash": "sha256-EprjYnY3cr2l+hEeVrf58yUl0mC60HQUmngHxoJo+KA=",
+        "lastModified": 1737156486,
+        "narHash": "sha256-b8YOOIYML9aKy4Y7S+iLKIaTfCqrxK1wB/ZaeFRCUmo=",
        "owner": "kyazdani42",
        "repo": "nvim-tree.lua",
-        "rev": "80523101f0ae48b7f1990e907b685a3d79776c01",
+        "rev": "fca0b67c0b5a31727fb33addc4d9c100736a2894",
        "type": "github"
      },
      "original": {
@@ -662,11 +662,11 @@
    "rep": {
      "flake": false,
      "locked": {
-        "lastModified": 1738376193,
-        "narHash": "sha256-gBxrbGCy6JEHnmgJmcm8sgtEvCAqra8/gPGsfCEfLqg=",
+        "lastModified": 1707216692,
+        "narHash": "sha256-/dH+mNtNHaYFndVhoqmz4Sc3HeemoQt1HGD98mb9Qhw=",
        "owner": "robenkleene",
        "repo": "rep-grep",
-        "rev": "2a24f95170aa14b5182b2287125664a62f8688ef",
+        "rev": "10510d47e392cb9d30a861c69f702fd194b3fa88",
        "type": "github"
      },
      "original": {
@@ -732,11 +732,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737685583,
-        "narHash": "sha256-p+NVABRpGi+pT+xxf9HcLcFVxG6L+vEEy+NwzB9T0f8=",
+        "lastModified": 1735784864,
+        "narHash": "sha256-tIl5p3ueaPw7T5T1UXkLc8ISMk6Y8CI/D/rd0msf73I=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "eb64cbcc8eee0fa87ebded92805280d2ec97415a",
+        "rev": "04d5f1836721461b256ec452883362c5edc5288e",
        "type": "github"
      },
      "original": {
@@ -842,11 +842,11 @@
    "tiny-inline-diagnostic-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1738756980,
-        "narHash": "sha256-M4CD2usIp6IR4EKdYvHxuf6kitE60/8RTS8F/5GRWT0=",
+        "lastModified": 1736959343,
+        "narHash": "sha256-11+Z54shcy5oRevfTOu3dt5DtXhnYaH9zvktH6Lvxjs=",
        "owner": "rachartier",
        "repo": "tiny-inline-diagnostic.nvim",
-        "rev": "576351d53c1f6bda70252c3aaa710b01472024aa",
+        "rev": "aaa6f0dd097f8ca2478cad259e61b7cb26ec0eb8",
        "type": "github"
      },
      "original": {
@@ -875,11 +875,11 @@
    "tree-sitter-bash": {
      "flake": false,
      "locked": {
-        "lastModified": 1738310128,
-        "narHash": "sha256-ODWgFpCLLPgzNYXFhfAVvDXPr5bW8/49ezsaS9MOWMk=",
+        "lastModified": 1731338420,
+        "narHash": "sha256-JW+30zIyq8Xc7NG9V+YoFqC+57BjZXIbAvWPD2lqvIE=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-bash",
-        "rev": "0c46d792d54c536be5ff7eb18eb95c70fccdb232",
+        "rev": "49c31006d8307dcb12bc5770f35b6d5b9e2be68e",
        "type": "github"
      },
      "original": {
@@ -908,11 +908,11 @@
    "tree-sitter-lua": {
      "flake": false,
      "locked": {
-        "lastModified": 1738303275,
-        "narHash": "sha256-mE84uI5AKbLvX5CM7NvA59Z8Ux+QFdqVjZf4hi06NAM=",
+        "lastModified": 1729494737,
+        "narHash": "sha256-v+fFcIOv+bu+2IGI/Lh/Xbqd5BzbBjaa51ECd0hG7Ow=",
        "owner": "MunifTanjim",
        "repo": "tree-sitter-lua",
-        "rev": "68d29aa745b68ae22cbbdb5dcb68c20232521ff6",
+        "rev": "34e60e7f45fc313463c68090d88d742a55d1bd7a",
        "type": "github"
      },
      "original": {
@@ -941,11 +941,11 @@
    "tree-sitter-python": {
      "flake": false,
      "locked": {
-        "lastModified": 1738275152,
-        "narHash": "sha256-t9etfZcrliF7f9hfiomh2U9P+3ufAm8iSK1y9rOhP7s=",
+        "lastModified": 1736288149,
+        "narHash": "sha256-IIAL2qteFPBCPmDK1N2EdDgpI4CwfMuuVL8t5tYueLU=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-python",
-        "rev": "710796b8b877a970297106e5bbc8e2afa47f86ec",
+        "rev": "409b5d671eb0ea4972eeacaaca24bbec1acf79b1",
        "type": "github"
      },
      "original": {
@@ -1032,11 +1032,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739577062,
-        "narHash": "sha256-u/trdPzJO8UotNq48RbG7m6Pe8761IEMCOY0QidNjY4=",
+        "lastModified": 1736095716,
+        "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "0b2b8b31f69f24e9a75b4b18a32c771a48612d5e",
+        "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0",
        "type": "github"
      },
      "original": {
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -194,7 +194,18 @@
      nixpkgs.config.permittedInsecurePackages = config.insecurePackages;

      # Pin a state version to prevent warnings
-      home-manager.users.${config.user}.home.stateVersion = stateVersion;
      home-manager.users.root.home.stateVersion = stateVersion;
+
+      # Fix for running home-manager against the repo directly
+      # See: https://github.com/nix-community/home-manager/issues/2033
+      home-manager.users.${config.user} = {
+        home.stateVersion = stateVersion;
+        news = {
+          display = "silent";
+          entries = lib.mkForce [ ];
+          json = lib.mkForce { "output" = { }; };
+        };
+      };
+
    };
 }
--- a/modules/common/shell/work.nix
+++ b/modules/common/shell/work.nix
@@ -48,19 +48,11 @@
          fi
          ${ldap_script}/bin/ldap "$@" | jq '[ .[].member] | add'
        '';
-        ldapl_script = pkgs.writeShellScriptBin "ldapl" ''
-          if ! [ "$LDAP_HOST" ]; then
-              echo "No LDAP_HOST specified!"
-              exit 1
-          fi
-          ${ldap_script}/bin/ldap "*$@*" | jq -r '.[].name'
-        '';
      in
      [
        ldap_script
        ldapm_script
        ldapg_script
-        ldapl_script
        jq_parse
      ];
  };
--- a/modules/darwin/homebrew.nix
+++ b/modules/darwin/homebrew.nix
@@ -20,10 +20,7 @@
    '';

    # Add homebrew paths to CLI path
-    home-manager.users.${config.user}.home.sessionPath = [
-      "/opt/homebrew/bin/"
-      "/opt/homebrew/opt/trash/bin/"
-    ];
+    home-manager.users.${config.user}.home.sessionPath = [ "/opt/homebrew/bin/" ];

    homebrew = {
      enable = true;