diff --git a/flake.lock b/flake.lock index bc193bd..aac1a70 100644 --- a/flake.lock +++ b/flake.lock @@ -24,19 +24,45 @@ "type": "github" } }, + "crane_2": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nekowinston-nur", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1676846788, + "narHash": "sha256-XLsHLgXyMdliMeAXuzdGP+TXBaV44kG1RPTUHNOs6Jk=", + "owner": "ipetkov", + "repo": "crane", + "rev": "953b70da2813fb882c39890f2514e7db76fc8843", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "ref": "v0.11.3", + "repo": "crane", + "type": "github" + } + }, "emacs-overlay": { "inputs": { "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1683571286, - "narHash": "sha256-W9pObaS2aKdHKghnTniTAPoMam1bqL6LACaIbzpP22A=", + "lastModified": 1686886849, + "narHash": "sha256-pBscV99gEBiC+KODEphw9IQRPcpMzudkjlzPdQIdo6g=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5faeffd3d6d7f35348ef21f5245da783c7cd395f", + "rev": "f95c33d692cc174df41e40330aec4abf2a94b673", "type": "github" }, "original": { @@ -77,6 +103,22 @@ "type": "github" } }, + "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-utils": { "locked": { "lastModified": 1676283394, @@ -93,12 +135,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -109,14 +154,32 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems" + "systems": "systems_2" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_3" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -148,16 +211,18 @@ }, "nekowinston-nur": { "inputs": { + "crane": "crane_2", "nixpkgs": [ "nixpkgs-unstable" - ] + ], + "wezterm-src": "wezterm-src" }, "locked": { - "lastModified": 1682804856, - "narHash": "sha256-6wid+0ayFgmUUdEgKO7AmXEk6bUZNmq8bn4pFA0Kyhs=", + "lastModified": 1686874448, + "narHash": "sha256-FKD1FYFVT0GY8AgXe7+kLgJvFi22hj7eQyV3kmQrJls=", "owner": "nekowinston", "repo": "nur", - "rev": "a2df2ca00e11a1b5e3c5d5e10c200a32f5461834", + "rev": "eb3cda0b36a64cf77ea6037231befc9dfe2bf648", "type": "github" }, "original": { @@ -188,18 +253,18 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1682982995, - "narHash": "sha256-PK0pSY48JkcLDFphafjpLqeTDs0XUqGMHjsiNuEq5s0=", + "lastModified": 1686480427, + "narHash": "sha256-cs2cg+x21jM3e7gOX9zYRh/19i8DFInBDLtUWMEAdvA=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "c5d7db84c422be515dac8fc26420900c349374e8", + "rev": "c192f97d59acb878fd1f2f6f362c8632d1e8426e", "type": "github" }, "original": { @@ -210,42 +275,58 @@ }, "nixpkgs": { "locked": { - "lastModified": 1686846322, - "narHash": "sha256-FtBG6hLN9Ui41F+S0Mjveo/FarUawLBAYQ1EBBNmiTo=", + "lastModified": 1686828063, + "narHash": "sha256-Cv0Sx1N5+3xBDF5OnmFU3Qoh9OqZmXDBKg1fgXlXTWs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "083cb1a04d196e35b9c8293a379266c854e284c1", + "rev": "683f2f5ba2ea54abb633d0b17bc9f7f6dede5799", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "release-23.05", + "ref": "nixpkgs-unstable", "type": "indirect" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1686736559, + "narHash": "sha256-YyUSVoOKIDAscTx7IZhF9x3qgZ9dPNF19fKk+4c5irc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ddf4688dc7aeb14e8a3c549cb6aa6337f187a884", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { - "lastModified": 1684481515, - "narHash": "sha256-sDMEZ4HLP6sVNiBcgla3KWihdDjh67DP5ZWkGKWFgY0=", + "lastModified": 1686828063, + "narHash": "sha256-Cv0Sx1N5+3xBDF5OnmFU3Qoh9OqZmXDBKg1fgXlXTWs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b1bc788f578cd83d54b48bb057d6f6703ae7725", + "rev": "683f2f5ba2ea54abb633d0b17bc9f7f6dede5799", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1683589805, - "narHash": "sha256-RNgF8bPDZn8mGzjvLJ5MifGgcV4Ow+l53Sx6H1Y/xtE=", + "lastModified": 1686892756, + "narHash": "sha256-F4HuotNa2m6VVS4qdFHipPH2kUCKKBPz8TD5lFgUjx0=", "owner": "nix-community", "repo": "nur", - "rev": "c7a57ebbd3a6ec7d203070f54eaf8ea0bb455f42", + "rev": "ecc758e68e90828690d621862ef4a3072e4982c6", "type": "github" }, "original": { @@ -294,6 +375,33 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "flake-utils": [ + "nekowinston-nur", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "nekowinston-nur", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685759304, + "narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "c535b4f3327910c96dcf21851bbdd074d0760290", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sanctureplicum-nur": { "inputs": { "nixpkgs": [ @@ -307,11 +415,11 @@ "rev": "72e258ac341e9e91314a2738b7577273354a386b", "revCount": 24, "type": "git", - "url": "file:///Users/carsten/source/nur" + "url": "https://gitea.pid1.sh/sanctureplicum/nur" }, "original": { "type": "git", - "url": "file:///Users/carsten/source/nur" + "url": "https://gitea.pid1.sh/sanctureplicum/nur" } }, "sops-nix": { @@ -324,11 +432,11 @@ ] }, "locked": { - "lastModified": 1683545104, - "narHash": "sha256-48wC0zzHAej/wLFWIgV+uj63AvQ2UUk85g7wmXJzTqk=", + "lastModified": 1686453485, + "narHash": "sha256-75iPAcS6xuw4SNfqLmFCi9wWG1JmDNKaC8l3WJUkmDk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "36b062a2c85a0efb37de1300c79c54602a094fab", + "rev": "cb85e297937af1bd1434cf5f85a3f86a21dc8207", "type": "github" }, "original": { @@ -351,6 +459,54 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "wezterm-src": { + "flake": false, + "locked": { + "lastModified": 1686577193, + "narHash": "sha256-9dCCT3Nd6XAZBKIlbqKQZj8ruUudtwcbd3CYJIK9Dl8=", + "ref": "refs/heads/main", + "rev": "baf9d970816e015bee41ed5eb9186ef7f71c454c", + "revCount": 7256, + "submodules": true, + "type": "git", + "url": "https://github.com/wez/wezterm" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://github.com/wez/wezterm" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 6a1b8a1..71434ae 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { inputs = { - nixpkgs.url = "nixpkgs/release-23.05"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "nixpkgs/nixpkgs-unstable"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nur.url = "github:nix-community/nur"; sanctureplicum-nur = { - url = "git+file:///Users/carsten/source/nur"; + url = "git+https://gitea.pid1.sh/sanctureplicum/nur"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; nekowinston-nur = { diff --git a/users/carsten/default.nix b/users/carsten/default.nix index 63905fa..eddefe5 100644 --- a/users/carsten/default.nix +++ b/users/carsten/default.nix @@ -29,9 +29,9 @@ ]; home = { - stateVersion = "23.05"; + stateVersion = builtins.trace config.users.users.carsten.home "23.05"; - homeDirectory = if pkgs.stdenv.isDarwin then "/Users/carsten" else "/home/carsten"; + homeDirectory = lib.mkIf pkgs.stdenv.isLinux "/home/carsten"; username = "carsten"; }; };