diff --git a/flake.lock b/flake.lock index 0f2cc18..f7eb38f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,27 @@ { "nodes": { + "crane": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, + "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" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -52,6 +74,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": { "inputs": { "systems": "systems" @@ -71,6 +109,24 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -128,14 +184,16 @@ }, "nekowinston-nur": { "inputs": { - "nixpkgs": "nixpkgs" + "crane": "crane", + "nixpkgs": "nixpkgs_2", + "wezterm-src": "wezterm-src" }, "locked": { - "lastModified": 1683947575, - "narHash": "sha256-aKc3vzJLkhPXkcovK+X3tMbs+lk6tzj8l4qKmVTL3ts=", + "lastModified": 1684686200, + "narHash": "sha256-qXN0d304LwALJKokFNlkRtLIGCfkmmrm5NN9IdTF5HE=", "owner": "nekowinston", "repo": "nur", - "rev": "9a8861b5367f4242973fdae7aa2a6f51e34fa90d", + "rev": "7d19401388642c6a1a160da6eb71e6fe1d2377c9", "type": "github" }, "original": { @@ -166,11 +224,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683777345, - "narHash": "sha256-V2p/A4RpEGqEZussOnHYMU6XglxBJGCODdzoyvcwig8=", + "lastModified": 1683020768, + "narHash": "sha256-ZyZl6k9NWS5QPwD3NoAVz/eSgodQDvl+y+fu8MVbrHc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "635a306fc8ede2e34cb3dd0d6d0a5d49362150ed", + "rev": "44f30edf5661d86fb3a95841c35127f3d0ea8b0f", "type": "github" }, "original": { @@ -213,6 +271,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1684525479, + "narHash": "sha256-Cq4jQE5OpB13nuEV3Ahm0UlpzeJBkb3PUz5pox4ih2E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4a22f6f0a4b4354778f786425babce9a56f6b5d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1684464849, "narHash": "sha256-f8th/GWE9M2hePTMZc0YyFboigt9AG/ioEcyHcdFK2I=", @@ -228,7 +302,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1681303793, "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", @@ -244,7 +318,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1683777345, "narHash": "sha256-V2p/A4RpEGqEZussOnHYMU6XglxBJGCODdzoyvcwig8=", @@ -277,10 +351,10 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -304,16 +378,43 @@ "home-manager": "home-manager", "nekowinston-nur": "nekowinston-nur", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nur": "nur", "pre-commit-hooks": "pre-commit-hooks", "sops": "sops", "swayfx": "swayfx" } }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "nekowinston-nur", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "nekowinston-nur", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1683080331, + "narHash": "sha256-nGDvJ1DAxZIwdn6ww8IFwzoHb2rqBP4wv/65Wt5vflk=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "d59c3fa0cba8336e115b376c2d9e91053aa59e56", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sops": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -332,7 +433,7 @@ }, "swayfx": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ] @@ -366,6 +467,39 @@ "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" + } + }, + "wezterm-src": { + "flake": false, + "locked": { + "lastModified": 1684511858, + "narHash": "sha256-xQPnLRmJfLuMuTGyPa897TF0Zw0frRk3EfL359zvK68=", + "ref": "refs/heads/main", + "rev": "4ae176dd8a019eeaf955cc947e3789995edbed07", + "revCount": 7215, + "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 6b821a2..60bb91e 100644 --- a/flake.nix +++ b/flake.nix @@ -45,9 +45,7 @@ nurpkgs = prev; pkgs = prev; repoOverrides = { - nekowinston = import nekowinston-nur { - pkgs = import nixpkgs {system = prev.system;}; - }; + nekowinston = nekowinston-nur.packages.${prev.system}; }; }; sway-unwrapped = swayfx.packages.${prev.system}.default; diff --git a/home/apps/wezterm.nix b/home/apps/wezterm.nix index 3ab41f5..351187e 100644 --- a/home/apps/wezterm.nix +++ b/home/apps/wezterm.nix @@ -1,12 +1,12 @@ { config, flakePath, + pkgs, ... }: { programs.wezterm = { enable = true; - # TODO: fix my wezterm NUR package :( - # package = pkgs.nur.repos.nekowinston.wezterm-nightly; + package = pkgs.nur.repos.nekowinston.wezterm-nightly; }; # disable the default config created by Home-Manager xdg.configFile."wezterm/wezterm.lua".enable = false;