diff --git a/flake.lock b/flake.lock index 478e1c4..d0cc1ba 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,22 @@ "type": "github" } }, + "base16-schemes": { + "flake": false, + "locked": { + "lastModified": 1696158499, + "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", + "owner": "tinted-theming", + "repo": "base16-schemes", + "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-schemes", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -201,6 +217,25 @@ "type": "github" } }, + "nix-colors": { + "inputs": { + "base16-schemes": "base16-schemes", + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1707825078, + "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", + "owner": "misterio77", + "repo": "nix-colors", + "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", + "type": "github" + }, + "original": { + "owner": "misterio77", + "repo": "nix-colors", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1736643958, @@ -283,6 +318,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1697935651, + "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-locked": { "locked": { "lastModified": 1739661218, @@ -402,6 +452,7 @@ "dotfiles": "dotfiles", "home-manager": "home-manager_2", "hyprpanel": "hyprpanel", + "nix-colors": "nix-colors", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_4", "nixpkgs-45570c2": "nixpkgs-45570c2", diff --git a/flake.nix b/flake.nix index 8b0571c..7e42bad 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,7 @@ hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor"; + nix-colors.url = "github:misterio77/nix-colors"; dotfiles = { url = "git+https://code.m3tam3re.com/m3tam3re/dotfiles.git"; diff --git a/home/common/default.nix b/home/common/default.nix index 47c575a..4a78ea2 100644 --- a/home/common/default.nix +++ b/home/common/default.nix @@ -1,4 +1,5 @@ { + inputs, lib, outputs, pkgs, @@ -7,6 +8,7 @@ imports = [ (import ../../modules/home-manager/zellij-ps.nix) + inputs.nix-colors.homeManagerModules.default ]; #imports = builtins.attrValues outputs.homeManagerModules; nixpkgs = { # You can add overlays here diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix index b893554..3394e78 100644 --- a/home/features/desktop/default.nix +++ b/home/features/desktop/default.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + config, + pkgs, + ... +}: { imports = [ ./coding.nix ./crypto.nix @@ -59,7 +63,57 @@ }; font = {name = "Fira Code";}; themeFile = "Dracula"; - settings = {copy_on_select = "yes";}; + settings = { + copy_on_select = "yes"; + + # Base colors + foreground = "#${config.colorScheme.palette.base05}"; + background = "#${config.colorScheme.palette.base00}"; + selection_foreground = "#${config.colorScheme.palette.base07}"; + selection_background = "#${config.colorScheme.palette.base02}"; + + # URL color + url_color = "#${config.colorScheme.palette.base08}"; + + # Cursor + cursor = "#${config.colorScheme.palette.base05}"; + cursor_text_color = "#${config.colorScheme.palette.base00}"; + + # Colors 0-15 + color0 = "#${config.colorScheme.palette.base01}"; + color8 = "#${config.colorScheme.palette.base03}"; + + color1 = "#${config.colorScheme.palette.base08}"; + color9 = "#${config.colorScheme.palette.base08}"; + + color2 = "#${config.colorScheme.palette.base0B}"; + color10 = "#${config.colorScheme.palette.base0B}"; + + color3 = "#${config.colorScheme.palette.base0A}"; + color11 = "#${config.colorScheme.palette.base0A}"; + + color4 = "#${config.colorScheme.palette.base0D}"; + color12 = "#${config.colorScheme.palette.base0D}"; + + color5 = "#${config.colorScheme.palette.base0E}"; + color13 = "#${config.colorScheme.palette.base0E}"; + + color6 = "#${config.colorScheme.palette.base0C}"; + color14 = "#${config.colorScheme.palette.base0C}"; + + color7 = "#${config.colorScheme.palette.base05}"; + color15 = "#${config.colorScheme.palette.base07}"; + + # Tab colors + active_tab_foreground = "#${config.colorScheme.palette.base00}"; + active_tab_background = "#${config.colorScheme.palette.base05}"; + inactive_tab_foreground = "#${config.colorScheme.palette.base05}"; + inactive_tab_background = "#${config.colorScheme.palette.base01}"; + + # Mark colors + mark1_foreground = "#${config.colorScheme.palette.base00}"; + mark1_background = "#${config.colorScheme.palette.base08}"; + }; }; home.pointerCursor = { diff --git a/home/features/desktop/hyprland.nix b/home/features/desktop/hyprland.nix index a74a18e..5208fc0 100644 --- a/home/features/desktop/hyprland.nix +++ b/home/features/desktop/hyprland.nix @@ -46,8 +46,9 @@ in { gaps_in = 5; gaps_out = 5; border_size = 1; + # Keeping the existing active border as requested "col.active_border" = "rgba(9742b5ee) rgba(9742b5ee) 45deg"; - "col.inactive_border" = "rgba(595959aa)"; + "col.inactive_border" = "rgba(${config.colorScheme.palette.base03}aa)"; layout = "dwindle"; }; @@ -56,7 +57,7 @@ in { enabled = true; range = 60; render_power = 3; - color = "rgba(1E202966)"; + color = "rgba(${config.colorScheme.palette.base00}66)"; offset = "1 2"; scale = 0.97; }; diff --git a/home/features/desktop/theme.nix b/home/features/desktop/theme.nix index 6f1190c..a22db01 100644 --- a/home/features/desktop/theme.nix +++ b/home/features/desktop/theme.nix @@ -1,4 +1,9 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + ... +}: { + colorScheme = inputs.nix-colors.colorSchemes.dracula; qt = { enable = true; platformTheme.name = "gtk";