diff --git a/flake.lock b/flake.lock index b0c7914e..4a297b4a 100644 --- a/flake.lock +++ b/flake.lock @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1736336279, - "narHash": "sha256-9Xp2X7ofKY4h39vUbd4coNambsG7Y/9axLFyTXaXOMU=", + "lastModified": 1736204492, + "narHash": "sha256-CoBPRgkUex9Iz6qGSzi/BFVUQjndB0PmME2B6eEyeCs=", "owner": "nix-community", "repo": "home-manager", - "rev": "45bcdbc910dc5131943bb6f7edb156617898fd1a", + "rev": "20665c6efa83d71020c8730f26706258ba5c6b2a", "type": "github" }, "original": { @@ -369,6 +369,7 @@ ] }, "locked": { + "lastModified": 1736269059, "narHash": "sha256-VaZlkrcfZOl85fz3o+GnNv+FkMG4RtnZA1eVa6v2TJs=", "owner": "nix-community", @@ -441,6 +442,7 @@ }, "nixpkgs-master": { "locked": { + "lastModified": 1736348064, "narHash": "sha256-if5MiqGTiRFgbtVZT8D0i9dIrmd+GSglQIQk6Sy7zLw=", "owner": "nixos", @@ -551,6 +553,7 @@ }, "original": { "owner": "pinpox", + "ref": "default-colors", "repo": "pinpox-neovim", "type": "github" } diff --git a/flake.nix b/flake.nix index 2fde16af..dadc8eea 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,7 @@ }; pinpox-neovim = { - url = "github:pinpox/pinpox-neovim"; + url = "github:pinpox/pinpox-neovim/default-colors"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home-manager/colorscheme.nix b/home-manager/colorscheme.nix index f7375e64..86897b59 100644 --- a/home-manager/colorscheme.nix +++ b/home-manager/colorscheme.nix @@ -43,7 +43,7 @@ in # magenta = "#4c0049" # red = "#5e0009" # yellow = "#6e5600" - # + # Light: # blue = "#9fd8ff" # cyan = "#83efef" @@ -55,23 +55,27 @@ in # magenta = "#ffc3fa" # red = "#ffbcb5" # yellow = "#f4d88c" - # - Black = "24273a"; # 24273a - BrightBlack = "5b6078"; # 5b6078 - White = "cad3f5"; # cad3f5 - BrightWhite = "747c9e"; # 747c9e - Red = "ed8796"; # ed8796 - BrightRed = "ff5370"; # FF5370 - Green = "a6da95"; # a6da95 - BrightGreen = "68f288"; # 68f288 - Yellow = "eed49f"; # eed49f - BrightYellow = "fab387"; # fab387 - Blue = "8aadf4"; # 8aadf4 - BrightBlue = "74c7ec"; # 74c7ec - Magenta = "cba6f7"; # cba6f7 - BrightMagenta = "f5bde6"; # f5bde6 - Cyan = "8bd5ca"; # 8bd5ca - BrightCyan = "aee2da"; # aee2da + # foreground = e0e2ea + # background = 14161b + + Black = "14161b"; + BrightBlack = "2c2e33"; + # BrightBlack = "4f5258"; + White = "e0e2ea"; + BrightWhite = "9b9ea4"; + + BrightRed = "5e0009"; + Red = "ffbcb5"; + BrightGreen = "015825"; + Green = "aaedb7"; + BrightYellow = "6e5600"; + Yellow = "f4d88c"; + BrightBlue = "005078"; + Blue = "9fd8ff"; + BrightMagenta = "4c0049"; + Magenta = "ffc3fa"; + BrightCyan = "007676"; + Cyan = "83efef"; }; } diff --git a/home-manager/modules/sway/default.nix b/home-manager/modules/sway/default.nix index c54bd680..d043bcfa 100644 --- a/home-manager/modules/sway/default.nix +++ b/home-manager/modules/sway/default.nix @@ -53,7 +53,8 @@ in "${modifier}+n" = "exec swaync-client -t -sw"; # Scratchpad - "${modifier}+u" = ''[app_id="dropdown"] scratchpad show; [app_id="dropdown"] resize set 98ppt 98ppt; [app_id="dropdown"] move position center''; + "${modifier}+u" = + ''[app_id="dropdown"] scratchpad show; [app_id="dropdown"] resize set 98ppt 98ppt; [app_id="dropdown"] move position center''; }; modifier = "Mod4"; # Win key @@ -112,10 +113,10 @@ in { focused = { - background = "#${c.Blue}"; - border = "#${c.BrightBlue}"; - childBorder = "#${c.Blue}"; - indicator = "#${c.BrightBlue}"; + background = "#${c.BrightGreen}"; + border = "#${c.Green}"; + childBorder = "#${c.Green}"; + indicator = "#${c.BrightGreen}"; text = "#${c.Black}"; }; @@ -129,10 +130,10 @@ in unfocused = { background = "#${c.Black}"; - border = "#${c.BrightBlack}"; + border = "#${c.Green}"; childBorder = "#${c.Black}"; indicator = "#${c.BrightBlack}"; - text = "#${c.BrightBlack}"; + text = "#${c.Green}"; }; urgent = { diff --git a/home-manager/modules/swaylock/default.nix b/home-manager/modules/swaylock/default.nix index 99b9cfe6..85e7568c 100644 --- a/home-manager/modules/swaylock/default.nix +++ b/home-manager/modules/swaylock/default.nix @@ -42,32 +42,3 @@ in }; }; } -# -i, --image [[]:] Display the given image, optionally only on the given output. -# -k, --show-keyboard-layout Display the current xkb layout while typing. -# -K, --hide-keyboard-layout Hide the current xkb layout while typing. -# -L, --disable-caps-lock-text Disable the Caps Lock text. -# -l, --indicator-caps-lock Show the current Caps Lock state also on the indicator. -# -s, --scaling Image scaling mode: stretch, fill, fit, center, tile, solid_color. -# -t, --tiling Same as --scaling=tile. -# -u, --no-unlock-indicator Disable the unlock indicator. -# --indicator-thickness Sets the indicator thickness. -# --indicator-x-position Sets the horizontal position of the indicator. -# --indicator-y-position Sets the vertical position of the indicator. -# --caps-lock-bs-hl-color Sets the color of backspace highlight segments when Caps Lock is active. -# --caps-lock-key-hl-color Sets the color of the key press highlight segments when Caps Lock is active. -# --inside-color Sets the color of the inside of the indicator. -# --inside-clear-color Sets the color of the inside of the indicator when cleared. -# --inside-caps-lock-color Sets the color of the inside of the indicator when Caps Lock is active. -# --inside-ver-color Sets the color of the inside of the indicator when verifying. -# --key-hl-color Sets the color of the key press highlight segments. -# --layout-bg-color Sets the background color of the box containing the layout text. -# --layout-border-color Sets the color of the border of the box containing the layout text. -# --ring-clear-color Sets the color of the ring of the indicator when cleared. -# --ring-caps-lock-color Sets the color of the ring of the indicator when Caps Lock is active. -# --ring-ver-color Sets the color of the ring of the indicator when verifying. -# --ring-wrong-color Sets the color of the ring of the indicator when invalid. -# --separator-color Sets the color of the lines that separate highlight segments. -# --text-clear-color Sets the color of the text when cleared. -# --text-caps-lock-color Sets the color of the text when Caps Lock is active. -# --text-ver-color Sets the color of the text when verifying. -# --text-wrong-color Sets the color of the text when invalid. diff --git a/home-manager/modules/waybar/style.css b/home-manager/modules/waybar/style.css index a79911d8..2044b91d 100644 --- a/home-manager/modules/waybar/style.css +++ b/home-manager/modules/waybar/style.css @@ -58,13 +58,13 @@ window#waybar { #workspaces button, #tags button { background: @Black; - color: @White; + color: @Green; padding: 0px 0px; } #workspaces button.focused, #tags button.focused { - background: @Blue; + background: @Green; color: @Black; }