From 320ae2fc893449a71e81648f2ce74d4920f9d132 Mon Sep 17 00:00:00 2001 From: Nickiel12 Date: Mon, 9 Dec 2024 20:16:02 -0800 Subject: [PATCH] added self-packages xcursor McMojave cursors --- flake.lock | 59 +++++++++++++++++++++++++++++++++-------- flake.nix | 7 ++++- home.nix | 8 ++++-- hosts/configuration.nix | 16 +++++++---- 4 files changed, 71 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index dd186ee..0d1d2cf 100644 --- a/flake.lock +++ b/flake.lock @@ -188,7 +188,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1681202837, @@ -206,7 +206,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1726560853, @@ -224,7 +224,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1731533236, @@ -242,7 +242,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1726560853, @@ -260,7 +260,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1705309234, @@ -564,6 +564,27 @@ "type": "github" } }, + "mcmojave-xcursor": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_4" + }, + "locked": { + "lastModified": 1733803873, + "narHash": "sha256-T7w0GYIqxoYA//dHxBbsmlruaqU6ZY1mvuNj8i/LBMs=", + "ref": "refs/heads/master", + "rev": "3730719c2e5554b900b6dd637e92a73e8ea64995", + "revCount": 12, + "type": "git", + "url": "https://git.nickiel.net/Nickiel/McMojave-cursors.git" + }, + "original": { + "type": "git", + "url": "https://git.nickiel.net/Nickiel/McMojave-cursors.git" + } + }, "nicks_nextcloud_integrations": { "inputs": { "nixpkgs": "nixpkgs_4", @@ -826,6 +847,7 @@ "home-manager": "home-manager", "kmonad": "kmonad", "mcmojave-hyprcursor": "mcmojave-hyprcursor", + "mcmojave-xcursor": "mcmojave-xcursor", "nicks_nextcloud_integrations": "nicks_nextcloud_integrations", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_7", @@ -904,6 +926,21 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1689347949, @@ -936,16 +973,16 @@ }, "systems_4": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1047,7 +1084,7 @@ }, "utils": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index 4fe82fe..5dc25a5 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + mcmojave-xcursor = { + url = "git+https://git.nickiel.net/Nickiel/McMojave-cursors.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixpkgs-stable = { url = "github:NixOS/nixpkgs/release-23.11"; }; @@ -197,7 +202,7 @@ useGlobalPkgs = true; useUserPackages = true; extraSpecialArgs = { - inherit user ewwtilities atuin pkgs-stable zls; + inherit inputs user ewwtilities atuin pkgs-stable zls; }; users.${user} = { imports = [ diff --git a/home.nix b/home.nix index 431f56f..05ee0fa 100644 --- a/home.nix +++ b/home.nix @@ -50,6 +50,7 @@ let pkgs-stable.nodejs # required for coc-nvim ] ++ pkgs.lib.optionals (! builtins.elem osConfig.networking.hostName commandline_only_hosts ) [ + # Gui application pkgs-stable.darktable # RAW processing dbeaver-bin # SQL management tool @@ -137,8 +138,11 @@ in # the Home Manager release notes for a list of state version # changes in each release. stateVersion = "22.11"; - - packages = install_packages; + + packages = install_packages ++ [ + inputs.mcmojave-hyprcursor.packages.${pkgs.stdenv.hostPlatform.system}.default + inputs.mcmojave-xcursor.packages.${pkgs.stdenv.hostPlatform.system}.default + ]; sessionVariables = { NIX_SHELL_PRESERVE_PROMPT = 1; EDITOR = "nvim"; diff --git a/hosts/configuration.nix b/hosts/configuration.nix index 683797e..3999675 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -15,11 +15,17 @@ WLR_NO_HARDWARE_CURSORS = "1"; }; - environment.variables.HYPRCURSOR_THEME = "McMojave"; - environment.variables.HYPRCURSOR_SIZE = "32"; - environment.systemPackages = [ - inputs.mcmojave-hyprcursor.packages.${pkgs.stdenv.hostPlatform.system}.default - ]; + # Also run + # dconf write /org/gnome/desktop/interface/cursor-theme "'THEME_NAME'" + environment.variables = { + HYPRCURSOR_THEME = "McMojave"; + HYPRCURSOR_SIZE = "32"; + XCURSOR_THEME = "McMojave-cursors"; + XCURSOR_SIZE = "32"; + }; + #environment.systemPackages = [ + #inputs.mcmojave-hyprcursor.packages.${pkgs.stdenv.hostPlatform.system}.default + #]; programs.hyprland.enable = true;