From 5f78645348a93a2c9e39998952824daac40c8cdd Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Wed, 31 Jan 2024 14:47:55 -0600 Subject: [PATCH] drop wezterm flake --- flake.lock | 175 +++------------------------------------- flake.nix | 12 ++- modules/desktop/gui.nix | 2 +- 3 files changed, 16 insertions(+), 173 deletions(-) diff --git a/flake.lock b/flake.lock index 0715374..9e8ce20 100644 --- a/flake.lock +++ b/flake.lock @@ -54,58 +54,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "freetype2": { - "flake": false, - "locked": { - "lastModified": 1675923892, - "narHash": "sha256-dOm8VKYdclTLLkqWMLv7DQI0Qyjit7S4SOCszKEkG3o=", - "owner": "wez", - "repo": "freetype2", - "rev": "de8b92dd7ec634e9e2b25ef534c54a3537555c11", - "type": "github" - }, - "original": { - "owner": "wez", - "repo": "freetype2", - "rev": "de8b92dd7ec634e9e2b25ef534c54a3537555c11", - "type": "github" - } - }, - "harfbuzz": { - "flake": false, - "locked": { - "lastModified": 1677798343, - "narHash": "sha256-Lsd0Vrkrv67CMyV0ZveShfjUvqh/jDhI8rAK9ps+SZQ=", - "owner": "harfbuzz", - "repo": "harfbuzz", - "rev": "60841e26187576bff477c1a09ee2ffe544844abc", - "type": "github" - }, - "original": { - "owner": "harfbuzz", - "repo": "harfbuzz", - "rev": "60841e26187576bff477c1a09ee2ffe544844abc", - "type": "github" - } - }, "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", @@ -117,11 +65,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1706571425, - "narHash": "sha256-VwVUPb5vuy4GGUx1XMhDMaKk9n8Gs5xUTG9CItoHL04=", + "lastModified": 1706722456, + "narHash": "sha256-oZkX+r/dA63f09vXLk1HrCprIKtdw0LXhqG2cAw6MjA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3ff59e7e1d859daa503b88ef125d087bc100abfe", + "rev": "4f804d5f962070c531dea5025e61be8a0da8129e", "type": "github" }, "original": { @@ -217,23 +165,6 @@ "type": "github" } }, - "libpng": { - "flake": false, - "locked": { - "lastModified": 1549245649, - "narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=", - "owner": "glennrp", - "repo": "libpng", - "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", - "type": "github" - }, - "original": { - "owner": "glennrp", - "repo": "libpng", - "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", - "type": "github" - } - }, "nix-eval-jobs": { "inputs": { "flake-parts": "flake-parts", @@ -280,11 +211,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706487304, - "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", + "lastModified": 1706683685, + "narHash": "sha256-FtPPshEpxH/ewBOsdKBNhlsL2MLEFv1hEnQ19f/bFsQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", + "rev": "5ad9903c16126a7d949101687af0aa589b1d7d3d", "type": "github" }, "original": { @@ -321,11 +252,11 @@ ] }, "locked": { - "lastModified": 1706566528, - "narHash": "sha256-HIroL+8AkOepx29p1H39E6wyJ2bGoUKomNav4Ys9YWY=", + "lastModified": 1706732152, + "narHash": "sha256-yz832sMi8PqEpvfX2UKpOuLSfIZdzAeG2zvFjFsZciY=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "22f20ab185fc4bcd8b2241a67cc3ad8100932fb8", + "rev": "5571db30011cb2689242d7d2892b3dab9940e908", "type": "github" }, "original": { @@ -340,33 +271,7 @@ "hyprland-contrib": "hyprland-contrib", "nix-eval-jobs": "nix-eval-jobs", "nixpkgs": "nixpkgs", - "nixpkgs-wayland": "nixpkgs-wayland", - "wezterm": "wezterm" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "wezterm", - "flake-utils" - ], - "nixpkgs": [ - "wezterm", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1705457855, - "narHash": "sha256-5cCHQtP/PEHK1YNTQyZN9v8ehpLTjc723ZSKAP3Tva8=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "a854609265af0e9f48c92e497679edf8fab9e690", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" + "nixpkgs-wayland": "nixpkgs-wayland" } }, "systems": { @@ -399,21 +304,6 @@ "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" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -435,34 +325,6 @@ "type": "github" } }, - "wezterm": { - "inputs": { - "flake-utils": "flake-utils_2", - "freetype2": "freetype2", - "harfbuzz": "harfbuzz", - "libpng": "libpng", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay", - "zlib": "zlib" - }, - "locked": { - "dir": "nix", - "lastModified": 1706591020, - "narHash": "sha256-6+LznzN56Gr9oyY15SmV590XS7uMR2ui7lAFBVdkI98=", - "owner": "wez", - "repo": "wezterm", - "rev": "47f647cadcaa0f06df107999221c661a0ff5017d", - "type": "github" - }, - "original": { - "dir": "nix", - "owner": "wez", - "repo": "wezterm", - "type": "github" - } - }, "wlroots": { "flake": false, "locked": { @@ -511,23 +373,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "zlib": { - "flake": false, - "locked": { - "lastModified": 1484501380, - "narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=", - "owner": "madler", - "repo": "zlib", - "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f", - "type": "github" - }, - "original": { - "owner": "madler", - "repo": "zlib", - "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 3260b0a..da1753e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,18 +3,15 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + hyprland.url = "github:hyprwm/Hyprland/main"; + hyprland.inputs.nixpkgs.follows = "nixpkgs"; + hyprland-contrib.url = "github:hyprwm/contrib"; + hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs"; nixpkgs-wayland.inputs.nix-eval-jobs.follows = "nix-eval-jobs"; nix-eval-jobs.url = "github:nix-community/nix-eval-jobs"; nix-eval-jobs.inputs.nixpkgs.follows = "nixpkgs"; - hyprland.url = "github:hyprwm/Hyprland/main"; - hyprland.inputs.nixpkgs.follows = "nixpkgs"; - hyprland-contrib.url = "github:hyprwm/contrib"; - hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs"; - # need unreleased version for wayland issue - wezterm.url = "github:wez/wezterm?dir=nix"; - wezterm.inputs.nixpkgs.follows = "nixpkgs"; }; nixConfig = { @@ -29,6 +26,7 @@ "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k=" ]; }; + outputs = inputs @ { nixpkgs, ... diff --git a/modules/desktop/gui.nix b/modules/desktop/gui.nix index ba356f2..4ee14d9 100644 --- a/modules/desktop/gui.nix +++ b/modules/desktop/gui.nix @@ -10,7 +10,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - inputs.wezterm.packages.${pkgs.system}.default + wezterm alacritty inkscape