diff --git a/flake.lock b/flake.lock index f0a7d161..10be0dfa 100644 --- a/flake.lock +++ b/flake.lock @@ -195,6 +195,26 @@ "type": "github" } }, + "nix-cursors": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716041700, + "narHash": "sha256-4jDR/KQmtsDw/nCvpy9VvWQgtc+4R4eyrb8eJSz+KCw=", + "owner": "LilleAila", + "repo": "nix-cursors", + "rev": "d119b747e47a7a24660676f59c77272d664ec61e", + "type": "github" + }, + "original": { + "owner": "LilleAila", + "repo": "nix-cursors", + "type": "github" + } + }, "nix-formatter-pack": { "inputs": { "nixpkgs": [ @@ -763,6 +783,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "nix-cursors": "nix-cursors", "nix-on-droid": "nix-on-droid", "nixpkgs": "nixpkgs", "nixpkgsJobber": "nixpkgsJobber", diff --git a/flake.nix b/flake.nix index 8ecfc4ef..94c27d0c 100644 --- a/flake.nix +++ b/flake.nix @@ -4,16 +4,16 @@ nixpkgsUnstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgsMaster.url = "github:nixos/nixpkgs/master"; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - stylix.url = "github:danth/stylix"; nixpkgsJobber.url = "github:nixos/nixpkgs/051f920625ab5aabe37c920346e3e69d7d34400e"; poetry2nixJobber.url = "github:nix-community/poetry2nix/304f8235fb0729fd48567af34fcd1b58d18f9b95"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-on-droid = { url = "github:t184256/nix-on-droid/release-24.05"; inputs = { @@ -22,6 +22,11 @@ }; }; + nix-cursors = { + url = "github:LilleAila/nix-cursors"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nvimAlign = { flake = false; url = "github:echasnovski/mini.align"; }; nvimAutoclose = { flake = false; url = "github:m4xshen/autoclose.nvim"; }; nvimBufferline = { flake = false; url = "github:akinsho/bufferline.nvim"; }; diff --git a/option/Style.nix b/option/Style.nix index b44b0cb1..46e9ae24 100644 --- a/option/Style.nix +++ b/option/Style.nix @@ -2,6 +2,7 @@ { __findFile, config, + inputs, lib, pkgs, ... @@ -71,9 +72,14 @@ in { }; cursor = { - name = mkStrOption "phinger-cursors-light"; - package = mkPkgOption pkgs.phinger-cursors; - size = mkIntOption 24; + package = mkPkgOption (inputs.nix-cursors.packages.${pkgs.system}.google-cursor.override { + accent_color = "#${cfg.color.accent}"; + background_color = "#${cfg.color.fg.light}"; + outline_color = "#${cfg.color.border}"; + }); + # name = mkStrOption "Fuchsia-Custom"; + name = mkStrOption "GoogleDot-Custom"; + size = mkIntOption 18; }; font = {