From 34f8e5cb61ebb578424c38d6aad8321fb4ebfe22 Mon Sep 17 00:00:00 2001 From: victor Date: Mon, 5 Sep 2022 16:12:17 +0200 Subject: [PATCH] laptop: initial setup for theme.nix --- flake.lock | 12 +-- nixos/hosts/thalassa/null/home/default.nix | 26 +----- nixos/hosts/thalassa/null/home/eww/eww.scss | 29 +------ nixos/hosts/thalassa/null/home/theme.nix | 92 +++++++++++++++++++++ 4 files changed, 102 insertions(+), 57 deletions(-) create mode 100644 nixos/hosts/thalassa/null/home/theme.nix diff --git a/flake.lock b/flake.lock index e96b8a0..c2c01a5 100644 --- a/flake.lock +++ b/flake.lock @@ -187,11 +187,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1661824092, - "narHash": "sha256-nSWLWytlXbeLrx5A+r5Pso7CvVrX5EgmIIXW/EXvPHQ=", + "lastModified": 1662381277, + "narHash": "sha256-ytrms5bE5d/XLkge/b91yLTh5iA9YuPz3Wp7/ZqWdnw=", "owner": "nix-community", "repo": "home-manager", - "rev": "5bd66dc6cd967033489c69d486402b75d338eeb6", + "rev": "de079ec3714e7b201c17cbe03b62be8d6dc7b3c0", "type": "github" }, "original": { @@ -206,11 +206,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1662312458, - "narHash": "sha256-FAWHn2aMytRc7AciZABnemaIdTL8ed0Vw66V7nRII3Q=", + "lastModified": 1662378652, + "narHash": "sha256-+GN9ZKyCh3p0fVsVYqPaq0csJlIFOohCCqG3QuQJemg=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "6afab12b91baddb6d4a9c348e3fb2bf8c4e6e6ea", + "rev": "a74b8033ca97bdfc53a0a8aaf3aec9aec56fa410", "type": "github" }, "original": { diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix index ce581d5..d1f16c9 100644 --- a/nixos/hosts/thalassa/null/home/default.nix +++ b/nixos/hosts/thalassa/null/home/default.nix @@ -8,6 +8,7 @@ imports = [ ./hyprland ./eww + ./theme.nix ]; home.packages = with pkgs; [ @@ -45,27 +46,7 @@ programs.foot = { enable = true; - # Note, pink and blue are switched - settings.colors = { - foreground = "c6d0f5"; # Text - background = "303446"; # Base - regular0 = "51576d"; # Surface 1 - regular1 = "e78284"; # red - regular2 = "a6d189"; # green - regular3 = "e5c890"; # yellow - regular4 = "f4b8e4"; # pink - regular5 = "8caaee"; # blue - regular6 = "81c8be"; # teal - regular7 = "b5bfe2"; # Subtext 1 - bright0 = "626880"; # Surface 2 - bright1 = "e78284"; # red - bright2 = "a6d189"; # green - bright3 = "e5c890"; # yellow - bright4 = "f4b8e4"; # pink - bright5 = "8caaee"; # blue - bright6 = "81c8be"; # teal - bright7 = "a5adce"; # Subtext 0 - }; + }; programs.git = { @@ -77,10 +58,7 @@ programs.mako = { enable = true; - backgroundColor = "#292c3c"; borderRadius = 5; - borderColor = "#f4b8e4"; - textColor = "#c6d0f5"; }; programs.tmux = { diff --git a/nixos/hosts/thalassa/null/home/eww/eww.scss b/nixos/hosts/thalassa/null/home/eww/eww.scss index b3cb3fd..ff48fd2 100644 --- a/nixos/hosts/thalassa/null/home/eww/eww.scss +++ b/nixos/hosts/thalassa/null/home/eww/eww.scss @@ -1,31 +1,6 @@ -$light-gray: #9699b7; +@import url(./colours.scss); -$rosewater: #f2d5cf; -$flamingo: #eebebe; -$pink: #f4b8e4; -$mauve: #ca9ee6; -$red: #e78284; -$maroon: #ea999c; -$peach: #ef9f76; -$yellow: #e5c890; -$green: #a6d189; -$teal: #81c8be; -$sky: #99d1db; -$sapphire: #85c1dc; -$blue: #8caaee; -$lavender: #babbf1; -$text: #c6d0f5; -$subtext1: #b5bfe2; -$subtext0: #a5adce; -$overlay2: #949cbb; -$overlay1: #838ba7; -$overlay0: #737994; -$surface2: #626880; -$surface1: #51576d; -$surface0: #414559; -$base: #303446; -$mantle: #292c3c; -$crust: #232634; +$light-gray: #9699b7; * { all: unset; //Unsets everything so you can style everything from scratch diff --git a/nixos/hosts/thalassa/null/home/theme.nix b/nixos/hosts/thalassa/null/home/theme.nix new file mode 100644 index 0000000..c74e81a --- /dev/null +++ b/nixos/hosts/thalassa/null/home/theme.nix @@ -0,0 +1,92 @@ +{ ... }: +let + # Catpuccin Frappe Pink + colour = rec { + rosewater = "f2d5cf"; + flamingo = "eebebe"; + pink = "f4b8e4"; + mauve = "ca9ee6"; + red = "e78284"; + maroon = "ea999c"; + peach = "ef9f76"; + yellow = "e5c890"; + green = "a6d189"; + teal = "81c8be"; + sky = "99d1db"; + sapphire = "85c1dc"; + blue = "8caaee"; + lavender = "babbf1"; + text = "c6d0f5"; + subtext1 = "b5bfe2"; + subtext0 = "a5adce"; + overlay2 = "949cbb"; + overlay1 = "838ba7"; + overlay0 = "737994"; + surface2 = "626880"; + surface1 = "51576d"; + surface0 = "414559"; + base = "303446"; + mantle = "292c3c"; + crust = "232634"; + + hex = builtins.mapAttrs (name: value: "#${value}") colour; + }; +in +{ + home.file.".config/eww/colours.scss".text = '' + $rosewater: #${colour.rosewater}; + $flamingo: #${colour.flamingo}; + $pink: #${colour.pink}; + $mauve: #${colour.mauve}; + $red: #${colour.red}; + $maroon: #${colour.maroon}; + $peach: #${colour.peach}; + $yellow: #${colour.yellow}; + $green: #${colour.green}; + $teal: #${colour.teal}; + $sky: #${colour.sky}; + $sapphire: #${colour.sapphire}; + $blue: #${colour.blue}; + $lavender: #${colour.lavender}; + $text: #${colour.text}; + $subtext1: #${colour.subtext1}; + $subtext0: #${colour.subtext0}; + $overlay2: #${colour.overlay2}; + $overlay1: #${colour.overlay1}; + $overlay0: #${colour.overlay0}; + $surface2: #${colour.surface2}; + $surface1: #${colour.surface1}; + $surface0: #${colour.surface0}; + $base: #${colour.base}; + $mantle: #${colour.mantle}; + $crust: #${colour.crust}; + ''; + + # Note, pink and blue are switched + programs.foot.settings.colors = { + foreground = colour.text; # Text + background = colour.base; # Base + regular0 = colour.surface1; # Surface 1 + regular1 = colour.red; # red + regular2 = colour.green; # green + regular3 = colour.yellow; # yellow + regular4 = colour.pink; # pink + regular5 = colour.blue; # blue + regular6 = colour.teal; # teal + regular7 = colour.subtext1; # Subtext 1 + bright0 = colour.surface2; # Surface 2 + bright1 = colour.red; # red + bright2 = colour.green; # green + bright3 = colour.yellow; # yellow + bright4 = colour.pink; # pink + bright5 = colour.blue; # blue + bright6 = colour.teal; # teal + bright7 = colour.subtext0; # Subtext 0 + }; + + programs.mako = { + backgroundColor = colour.hex.mantle; + borderColor = colour.hex.pink; + textColor = colour.hex.text; + }; +}