From 6136d8c6be2ce4d16448eef2dbd4adef93ce544d Mon Sep 17 00:00:00 2001 From: winston Date: Sat, 11 Mar 2023 22:53:47 +0100 Subject: [PATCH] feat(wayland): remove cursors, check for linux --- flake.lock | 36 ++++++++++++++++++------------------ home/apps/rice.nix | 6 ------ home/apps/wayland.nix | 4 ++-- 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index a8dddd4..4462c58 100644 --- a/flake.lock +++ b/flake.lock @@ -95,11 +95,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1678271387, - "narHash": "sha256-H2dv/i1LRlunRtrESirELzfPWdlG/6ElDB1ksO529H4=", + "lastModified": 1678464939, + "narHash": "sha256-pRMlwOUkO1OwSi7qF6XR/zcocWy/ZYxXgbYWvnZQO9k=", "owner": "nix-community", "repo": "home-manager", - "rev": "36999b8d19eb6eebb41983ef017d7e0095316af2", + "rev": "7224d7c54c5fc74cdf60b208af6148ed3295aa32", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1678371846, - "narHash": "sha256-fOFX0PASpIpU4NK9Wen9yJKwg5RYe5jFIu1H0OUzglE=", + "lastModified": 1678557514, + "narHash": "sha256-yNrik47cr8qPgl6zTMNJSfoC2zKZJaNUQAMWFYTajcE=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c9167d96467f0c1546f337828e874d7dd849f900", + "rev": "71ef1bde7e45f94ceaab925ae065f32f91510890", "type": "github" }, "original": { @@ -220,11 +220,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1678298120, - "narHash": "sha256-iaV5xqgn29xy765Js3EoZePQyZIlLZA3pTYtTnKkejg=", + "lastModified": 1678500213, + "narHash": "sha256-A5s2rXawJ+dCThkMXoMuYW8dgyUmkElcyfVJUot/Vr0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1e383aada51b416c6c27d4884d2e258df201bc11", + "rev": "2ce9b9842b5e63884dfc3dea6689769e2a1ea309", "type": "github" }, "original": { @@ -236,11 +236,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1678230755, - "narHash": "sha256-SFAXgNjNTXzcAideXcP0takfUGVft/VR5CACmYHg+Fc=", + "lastModified": 1678426640, + "narHash": "sha256-3Q4KN0XAXQT7YE3A8n3LzLtRNUCo0U++W3gl+5NhKHs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a7cc81913bb3cd1ef05ed0ece048b773e1839e51", + "rev": "824f886682fc893e6dbf27114e5001ebf2770ea1", "type": "github" }, "original": { @@ -284,11 +284,11 @@ }, "nur": { "locked": { - "lastModified": 1678414741, - "narHash": "sha256-Q6NPrcIp8IM29scARnwMg4mpN3/o9/6lLuLrjxvxTwU=", + "lastModified": 1678565873, + "narHash": "sha256-bN2/lJ52A1bkNgu8ZPIQ6T2wjDWGa5ABqko1Flgi3Fs=", "owner": "nix-community", "repo": "NUR", - "rev": "39f460d03b2faf38131cf8ff5ab19fe5848fc23c", + "rev": "ac1c05d68b2d3733845d3caafb272c15f2874653", "type": "github" }, "original": { @@ -339,11 +339,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1678264398, - "narHash": "sha256-COgbuQH/oAQZUBFTTQgSifabzZ5/GRCCbBIqZJjR3s0=", + "lastModified": 1678440572, + "narHash": "sha256-zfL09Yy6H7QQwfacCPL0gOfWpVkTbE5jXJh5oZmGf8g=", "owner": "Mic92", "repo": "sops-nix", - "rev": "00e9e9cd46600d68dd98a392025d4894c3711b58", + "rev": "1568702de0d2488c1e77011a9044de7fadec80c4", "type": "github" }, "original": { diff --git a/home/apps/rice.nix b/home/apps/rice.nix index cb56b26..1a13fc6 100644 --- a/home/apps/rice.nix +++ b/home/apps/rice.nix @@ -9,10 +9,6 @@ in { gtk = lib.mkIf isLinux { enable = true; - cursorTheme = { - name = "Catppuccin-Mocha-Cursors"; - package = pkgs.unstable.catppuccin-cursors.mochaPink; - }; iconTheme = { package = pkgs.nur.repos.nekowinston.papirus-folders-catppuccin.override { flavour = "mocha"; @@ -51,6 +47,4 @@ in { terminal = "wezterm"; theme = ./rofi/theme.rasi; }; - - xdg.dataFile."icons/default".source = "${pkgs.catppuccin-cursors.mochaPink}/share/icons/Catppuccin-Mocha-Pink-Cursors"; } diff --git a/home/apps/wayland.nix b/home/apps/wayland.nix index a6a9c57..3edee7a 100644 --- a/home/apps/wayland.nix +++ b/home/apps/wayland.nix @@ -25,13 +25,13 @@ in { package = pkgs.waybar-hyprland; }; - home.packages = with pkgs; [ + home.packages = lib.mkIf isLinux (with pkgs; [ cliphist grim slurp wl-clipboard nur.repos.nekowinston.swww - ]; + ]); xdg = lib.mkIf isLinux { configFile."waybar" = {