diff --git a/flake.nix b/flake.nix index 10f7395..e155dd8 100644 --- a/flake.nix +++ b/flake.nix @@ -131,6 +131,7 @@ vault (vault-push-approle-envs self { }) (vault-push-approles self { }) + rnix-lsp ]; }; }; diff --git a/nixos/hosts/thalassa/null/home/theme.nix b/nixos/hosts/thalassa/null/home/theme.nix index b19f181..87e8b6d 100644 --- a/nixos/hosts/thalassa/null/home/theme.nix +++ b/nixos/hosts/thalassa/null/home/theme.nix @@ -44,7 +44,7 @@ in home.pointerCursor = { name = "Catppuccin-Frappe-Pink-Cursors"; size = 32; - package = pkgs.catppuccin.cursors; + package = pkgs.catppuccin-cursors.frappePink; }; gtk = { diff --git a/nixos/pkgs/catppuccin/cursors/default.nix b/nixos/pkgs/catppuccin/cursors/default.nix deleted file mode 100644 index 6e11c4e..0000000 --- a/nixos/pkgs/catppuccin/cursors/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenvNoCC, lib, fetchFromGitHub, xcursorgen, inkscape, makeFontsConf }: - -stdenvNoCC.mkDerivation { - pname = "catppuccin-cursors"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "catppuccin"; - repo = "cursors"; - rev = "3d3023606939471c45cff7b643bffc5d5d4ff29c"; - sha256 = "sha256-0wb84q1VtD1myIRxrfQMn9n6w1gFzMA1rHkPqXuXLP0="; - }; - - nativeBuildInputs = [ xcursorgen inkscape ]; - - FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; - - buildPhase = '' - mv src src_orig - mkdir src - mv src_orig/Catppuccin-Frappe-Pink-Cursors ./src/ - mv src_orig/cursorList ./src/ - mv src_orig/config ./src/ - mv src_orig/_svgo.yml ./src/ - HOME="$NIX_BUILD_ROOT" PREFIX="/" DESTDIR=$out make build - ''; - - installPhase = '' - HOME="$NIX_BUILD_ROOT" PREFIX="/" DESTDIR=$out make install - ''; - - meta = with lib; { - description = "Soothing pastel mouse cursors"; - homepage = "https://github.com/catppuccin/cursors"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ nullx76 ]; - }; -} diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix index b13c7d8..fb2d0e8 100644 --- a/nixos/pkgs/default.nix +++ b/nixos/pkgs/default.nix @@ -1,7 +1,5 @@ # nix-build -E 'with import {}; callPackage ./platformio.nix {}' final: prev: { - catppuccin.cursors = prev.callPackage ./catppuccin/cursors { }; - v = { glitch-soc = prev.callPackage ./glitch-soc { };