From 9a2d0eed405c59169f35caf0b4b3d7e7bfa67da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 18 May 2025 18:32:43 +0200 Subject: [PATCH 1/2] feat!: switch to stylix --- flake.lock | 248 ++++++++++ flake.nix | 8 + modules/moritz/config/theming/_catppuccin.nix | 455 ------------------ .../config/theming/catppuccin-frappe.nix | 43 -- .../config/theming/catppuccin-latte.nix | 43 -- .../config/theming/catppuccin-macchiato.nix | 43 -- .../config/theming/catppuccin-mocha.nix | 43 -- modules/moritz/config/theming/default.nix | 214 -------- modules/moritz/config/theming/dracula.nix | 441 ----------------- modules/moritz/profiles/base.nix | 29 ++ modules/moritz/profiles/desktop.nix | 12 +- modules/moritz/programs/foot.nix | 4 - modules/moritz/programs/kitty.nix | 5 - modules/moritz/programs/niri.nix | 5 +- .../programs/nvim/plugins/catppuccin.nix | 9 - modules/moritz/programs/river/default.nix | 2 +- modules/moritz/programs/zathura.nix | 1 - modules/moritz/services/dunst.nix | 17 - 18 files changed, 291 insertions(+), 1331 deletions(-) delete mode 100644 modules/moritz/config/theming/_catppuccin.nix delete mode 100644 modules/moritz/config/theming/catppuccin-frappe.nix delete mode 100644 modules/moritz/config/theming/catppuccin-latte.nix delete mode 100644 modules/moritz/config/theming/catppuccin-macchiato.nix delete mode 100644 modules/moritz/config/theming/catppuccin-mocha.nix delete mode 100644 modules/moritz/config/theming/default.nix delete mode 100644 modules/moritz/config/theming/dracula.nix delete mode 100644 modules/moritz/programs/nvim/plugins/catppuccin.nix delete mode 100644 modules/moritz/services/dunst.nix diff --git a/flake.lock b/flake.lock index 30b6e66..f7e4336 100644 --- a/flake.lock +++ b/flake.lock @@ -33,6 +33,73 @@ "type": "github" } }, + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1736852337, + "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1732806396, + "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "type": "github" + } + }, "blobs": { "flake": false, "locked": { @@ -198,6 +265,22 @@ "url": "https://gitea.moritzboeh.me/moritz/filetags.git" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1744642301, + "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1747046372, @@ -305,6 +388,22 @@ "type": "github" } }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -350,6 +449,23 @@ "type": "github" } }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "48.1", + "repo": "gnome-shell", + "type": "github" + } + }, "hercules-ci-effects": { "inputs": { "flake-parts": "flake-parts_2", @@ -940,6 +1056,7 @@ "nixvim": "nixvim", "nur": "nur", "stable": "stable", + "stylix": "stylix", "systems": "systems_2", "timers": "timers", "treefmt-nix": "treefmt-nix", @@ -1000,6 +1117,55 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", + "flake-compat": [ + "flake-compat" + ], + "flake-parts": [ + "flake-parts" + ], + "git-hooks": [ + "git-hooks" + ], + "gnome-shell": "gnome-shell", + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ], + "nur": [ + "nur" + ], + "systems": [ + "systems" + ], + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" + }, + "locked": { + "lastModified": 1747578370, + "narHash": "sha256-7pk8quDMQcGIVmm7KXMQLI5CbfamwPv/vO20cTcT/wI=", + "owner": "nix-community", + "repo": "stylix", + "rev": "2eaa338eb879b8432f7e252d6ab8725ada98f52d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -1067,6 +1233,88 @@ "url": "https://gitea.moritzboeh.me/moritz/timers.git" } }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1744974599, + "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1745111349, + "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index cc23268..58facc2 100644 --- a/flake.nix +++ b/flake.nix @@ -122,6 +122,7 @@ flake-compat.url = "github:edolstra/flake-compat"; niri.url = "github:sodiboo/niri-flake"; systems.url = "github:nix-systems/default"; + stylix.url = "github:nix-community/stylix"; # Programs timers.url = "git+https://gitea.moritzboeh.me/moritz/timers.git"; @@ -172,6 +173,13 @@ nur.inputs.flake-parts.follows = "flake-parts"; nur.inputs.nixpkgs.follows = "nixpkgs"; nur.inputs.treefmt-nix.follows = "treefmt-nix"; + stylix.inputs.flake-compat.follows = "flake-compat"; + stylix.inputs.flake-parts.follows = "flake-parts"; + stylix.inputs.git-hooks.follows = "git-hooks"; + stylix.inputs.home-manager.follows = "home-manager"; + stylix.inputs.nixpkgs.follows = "nixpkgs"; + stylix.inputs.nur.follows = "nur"; + stylix.inputs.systems.follows = "systems"; timers.inputs.nixpkgs.follows = "nixpkgs"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/moritz/config/theming/_catppuccin.nix b/modules/moritz/config/theming/_catppuccin.nix deleted file mode 100644 index 4056659..0000000 --- a/modules/moritz/config/theming/_catppuccin.nix +++ /dev/null @@ -1,455 +0,0 @@ -{ - config, - pkgs, - flavor, - rosewater, - flamingo, - pink, - mauve, - red, - maroon, - peach, - yellow, - green, - teal, - sapphire, - blue, - lavender, - text, - subtext1, - subtext0, - overlay1, - overlay0, - surface2, - surface1, - surface0, - base, - mantle, - crust, - ... -}: { - my.programs.tofi.settings = { - text-color = "#${text}"; - prompt-color = "#${red}"; - selection-color = "#${yellow}"; - background-color = "#${base}"; - }; - home-manager.users.moritz = { - programs = { - fzf.colors = { - "bg+" = "#${surface0}"; - "fg+" = "#${text}"; - "hl+" = "#${red}"; - bg = "#${base}"; - fg = "#${text}"; - header = "#${red}"; - hl = "#${red}"; - info = "#${mauve}"; - marker = "#${rosewater}"; - pointer = "#${rosewater}"; - prompt = "#${mauve}"; - spinner = "#${rosewater}"; - }; - foot.settings.colors = { - foreground = text; # Text - background = base; # Base - regular0 = surface1; # Surface 1 - regular1 = red; # red - regular2 = green; # green - regular3 = yellow; # yellow - regular4 = blue; - regular5 = pink; - regular6 = teal; - regular7 = subtext1; - bright0 = surface2; - bright1 = red; - bright2 = green; - bright3 = yellow; - bright4 = blue; - bright5 = pink; - bright6 = teal; - bright7 = subtext0; - }; - kitty.extraConfig = '' - # vim:ft=kitty - - ## name: Catppuccin-Frappe - ## author: Pocco81 (https://github.com/Pocco81) - ## license: MIT - ## upstream: https://github.com/catppuccin/kitty/blob/main/frappe.conf - ## blurb: Soothing pastel theme for the high-spirited! - - - - # The basic colors - foreground #${text} - background #${base} - selection_foreground #${base} - selection_background #${rosewater} - - # Cursor colors - cursor #${rosewater} - cursor_text_color #${base} - - # URL underline color when hovering with mouse - url_color #${rosewater} - - # Kitty window border colors - active_border_color #${lavender} - inactive_border_color #${overlay0} - bell_border_color #${yellow} - - # OS Window titlebar colors - wayland_titlebar_color system - macos_titlebar_color system - - # Tab bar colors - active_tab_foreground #${crust} - active_tab_background #${mauve} - inactive_tab_foreground #${text} - inactive_tab_background #${mantle} - tab_bar_background #${crust} - - # Colors for marks (marked text in the terminal) - mark1_foreground #${base} - mark1_background #${lavender} - mark2_foreground #${base} - mark2_background #${mauve} - mark3_foreground #${base} - mark3_background #${sapphire} - - # The 16 terminal colors - - # black - color0 #${surface1} - color8 #${surface2} - - # red - color1 #${red} - color9 #${red} - - # green - color2 #${green} - color10 #${green} - - # yellow - color3 #${yellow} - color11 #${yellow} - - # blue - color4 #${blue} - color12 #${blue} - - # magenta - color5 #${pink} - color13 #${pink} - - # cyan - color6 #${teal} - color14 #${teal} - - # white - color7 #${subtext1} - color15 #${subtext0} - ''; - tmux.plugins = with pkgs.tmuxPlugins; [ - { - plugin = catppuccin; - extraConfig = "set -g @catppuccin_flavour '${flavor}'"; - } - ]; - zathura.extraConfig = '' - set window-title-basename "true" - set selection-clipboard "clipboard" - - set default-fg "#${text}" - set default-bg "#${base}" - - set completion-bg "#${surface0}" - set completion-fg "#${text}" - set completion-highlight-bg "#575268" - set completion-highlight-fg "#${text}" - set completion-group-bg "#${surface0}" - set completion-group-fg "#${blue}" - - set statusbar-fg "#${text}" - set statusbar-bg "#${surface0}" - - set notification-bg "#${surface0}" - set notification-fg "#${text}" - set notification-error-bg "#${surface0}" - set notification-error-fg "#${red}" - set notification-warning-bg "#${surface0}" - set notification-warning-fg "#FAE3B0" - - set inputbar-fg "#${text}" - set inputbar-bg "#${surface0}" - - set recolor-lightcolor "#${base}" - set recolor-darkcolor "#${text}" - - set index-fg "#${text}" - set index-bg "#${base}" - set index-active-fg "#${text}" - set index-active-bg "#${surface0}" - - set render-loading-bg "#${base}" - set render-loading-fg "#${text}" - - set highlight-color "#575268" - set highlight-fg "#${pink}" - set highlight-active-color "#${pink}" - ''; - rofi = { - theme = "custom"; - extraConfig = { - show-icons = true; - terminal = "alacritty"; - drun-display-format = "{icon} {name}"; - location = 0; - disable-history = false; - hide-scrollbar = true; - display-drun = "  Apps "; - display-run = "  Run "; - display-window = " 﩯 Window"; - display-Network = " 󰤨 Network"; - sidebar-mode = true; - }; - }; - }; - xsession.windowManager.bspwm.settings = { - focused_border_color = "#${mauve}"; - normal_border_color = "#${base}"; - active_border_color = "#${base}"; - }; - services = { - dunst.settings = { - global = { - # Defines color of the frame around the notification window. - frame_color = "#${blue}"; - - # Define a color for the separator. - # possible values are: - # * auto: dunst tries to find a color fitting to the background; - # * foreground: use the same color as the foreground; - # * frame: use the same color as the frame; - # * anything else will be interpreted as a X color. - separator_color = "frame"; - }; - - urgency_low = { - background = "#${base}"; - foreground = "#${text}"; - }; - urgency_normal = { - background = "#${base}"; - foreground = "#${text}"; - }; - urgency_critical = { - background = "#${base}"; - foreground = "#${text}"; - frame_color = "#${peach}"; - }; - }; - polybar = { - config = { - "bar/bottom" = { - background = base; - foreground = text; - border-color = base; - }; - "module/bspwm" = { - label-focused-foreground = pink; - label-occupied-foreground = overlay1; - label-urgent-foreground = maroon; - label-empty-foreground = overlay1; - label-separator-foreground = base; - }; - "module/cpu" = { - format-foreground = base; - format-background = green; - }; - "module/time" = { - format-foreground = base; - format-background = blue; - }; - "module/date" = { - format-foreground = base; - format-background = peach; - }; - "module/memory" = { - format-foreground = base; - format-background = blue; - }; - "module/pulseaudio" = { - format-volume-foreground = base; - format-volume-background = mauve; - label-muted = "婢 muted"; - format-muted-foreground = base; - format-muted-background = red; - }; - "module/network" = { - format-connected-foreground = base; - format-connected-background = mauve; - }; - "module/battery" = { - format-charging-foreground = base; - format-charging-background = green; - format-full-foreground = base; - format-full-background = green; - format-discharging-foreground = base; - format-discharging-background = red; - }; - }; - }; - }; - xdg.configFile = { - "fish/conf.d/theme.fish".text = '' - # Catppuccin color palette - - # --> special - set -l foreground ${text} - set -l selection ${surface0} - - # --> palette - set -l teal ${teal} - set -l flamingo ${flamingo} - set -l mauve ${mauve} - set -l pink ${pink} - set -l red ${red} - set -l peach ${peach} - set -l green ${green} - set -l yellow ${yellow} - set -l blue ${blue} - set -l gray ${overlay0} - - # Syntax Highlighting - set -g fish_color_normal $foreground - set -g fish_color_command $blue - set -g fish_color_param $flamingo - set -g fish_color_keyword $red - set -g fish_color_quote $green - set -g fish_color_redirection $pink - set -g fish_color_end $peach - set -g fish_color_error $red - set -g fish_color_gray $gray - set -g fish_color_selection --background=$selection - set -g fish_color_search_match --background=$selection - set -g fish_color_operator $pink - set -g fish_color_escape $flamingo - set -g fish_color_autosuggestion $gray - set -g fish_color_cancel $red - - # Prompt - set -g fish_color_cwd $yellow - set -g fish_color_user $teal - set -g fish_color_host $blue - - # Completion Pager - set -g fish_pager_color_progress $gray - set -g fish_pager_color_prefix $pink - set -g fish_pager_color_completion $foreground - set -g fish_pager_color_description $gray - ''; - "rofi/custom.rasi".text = '' - * { - bg-col: #${base}; - bg-col-light: #${base}; - border-col: #${base}; - selected-col: #${base}; - blue: #${blue}; - fg-col: #${text}; - fg-col2: #${red}; - grey: #${overlay0}; - - width: 900; - font: "JetBrainsMono Nerd Font 14"; - } - - element-text, element-icon , mode-switcher { - background-color: inherit; - text-color: inherit; - } - - window { - height: 360px; - border: 3px; - border-color: @border-col; - background-color: @bg-col; - } - - mainbox { - background-color: @bg-col; - } - - inputbar { - children: [prompt,entry]; - background-color: @bg-col; - border-radius: 5px; - padding: 2px; - } - - prompt { - background-color: @blue; - padding: 6px; - text-color: @bg-col; - border-radius: 3px; - margin: 20px 0px 0px 20px; - } - - textbox-prompt-colon { - expand: false; - str: ":"; - } - - entry { - padding: 6px; - margin: 20px 0px 0px 10px; - text-color: @fg-col; - background-color: @bg-col; - } - - listview { - border: 0px 0px 0px; - padding: 6px 0px 0px; - margin: 10px 0px 0px 20px; - columns: 2; - lines: 5; - background-color: @bg-col; - } - - element { - padding: 5px; - background-color: @bg-col; - text-color: @fg-col ; - } - - element-icon { - size: 25px; - } - - element selected { - background-color: @selected-col ; - text-color: @fg-col2 ; - } - - mode-switcher { - spacing: 0; - } - - button { - padding: 10px; - background-color: @bg-col-light; - text-color: @grey; - vertical-align: 0.5; - horizontal-align: 0.5; - } - - button selected { - background-color: @bg-col; - text-color: @blue; - } - ''; - }; - }; -} diff --git a/modules/moritz/config/theming/catppuccin-frappe.nix b/modules/moritz/config/theming/catppuccin-frappe.nix deleted file mode 100644 index 5fa1729..0000000 --- a/modules/moritz/config/theming/catppuccin-frappe.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.my.theming; -in { - config = - mkIf (cfg.enable && cfg.scheme == "catppuccin-frappe") - (import ./_catppuccin.nix - { - inherit config lib pkgs; - flavor = "mocha"; - 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"; - }); -} diff --git a/modules/moritz/config/theming/catppuccin-latte.nix b/modules/moritz/config/theming/catppuccin-latte.nix deleted file mode 100644 index 204d87c..0000000 --- a/modules/moritz/config/theming/catppuccin-latte.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.my.theming; -in { - config = - mkIf (cfg.enable && cfg.scheme == "catppuccin-latte") - (import ./_catppuccin.nix - { - inherit config lib pkgs; - flavor = "mocha"; - rosewater = "dc8a78"; - flamingo = "dd7878"; - pink = "ea76cb"; - mauve = "8839ef"; - red = "d20f39"; - maroon = "e64553"; - peach = "fe640b"; - yellow = "df8e1d"; - green = "40a02b"; - teal = "179299"; - sky = "04a5e5"; - sapphire = "209fb5"; - blue = "1e66f5"; - lavender = "7287fd"; - text = "4c4f69"; - subtext1 = "5c5f77"; - subtext0 = "6c6f85"; - overlay2 = "7c7f93"; - overlay1 = "8c8fa1"; - overlay0 = "9ca0b0"; - surface2 = "acb0be"; - surface1 = "bcc0cc"; - surface0 = "ccd0da"; - base = "eff1f5"; - mantle = "e6e9ef"; - crust = "dce0e8"; - }); -} diff --git a/modules/moritz/config/theming/catppuccin-macchiato.nix b/modules/moritz/config/theming/catppuccin-macchiato.nix deleted file mode 100644 index 05bba51..0000000 --- a/modules/moritz/config/theming/catppuccin-macchiato.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.my.theming; -in { - config = - mkIf (cfg.enable && cfg.scheme == "catppuccin-macchiato") - (import ./_catppuccin.nix - { - inherit config lib pkgs; - flavor = "macchiato"; - rosewater = "f4dbd6"; - flamingo = "f0c6c6"; - pink = "f5bde6"; - mauve = "c6a0f6"; - red = "ed8796"; - maroon = "ee99a0"; - peach = "f5a97f"; - yellow = "eed49f"; - green = "a6da95"; - teal = "8bd5ca"; - sky = "91d7e3"; - sapphire = "7dc4e4"; - blue = "8aadf4"; - lavender = "b7bdf8"; - text = "cad3f5"; - subtext1 = "b8c0e0"; - subtext0 = "a5adcb"; - overlay2 = "939ab7"; - overlay1 = "8087a2"; - overlay0 = "6e738d"; - surface2 = "5b6078"; - surface1 = "494d64"; - surface0 = "363a4f"; - base = "24273a"; - mantle = "1e2030"; - crust = "181926"; - }); -} diff --git a/modules/moritz/config/theming/catppuccin-mocha.nix b/modules/moritz/config/theming/catppuccin-mocha.nix deleted file mode 100644 index 6946459..0000000 --- a/modules/moritz/config/theming/catppuccin-mocha.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.my.theming; -in { - config = - mkIf (cfg.enable && cfg.scheme == "catppuccin-mocha") - (import ./_catppuccin.nix - { - inherit config lib pkgs; - flavor = "mocha"; - rosewater = "f5e0dc"; - flamingo = "f2cdcd"; - pink = "f5c2e7"; - mauve = "cba6f7"; - red = "f38ba8"; - maroon = "eba0ac"; - peach = "fab387"; - yellow = "f9e2af"; - green = "a6e3a1"; - teal = "94e2d5"; - sky = "89dceb"; - sapphire = "74c7ec"; - blue = "89b4fa"; - lavender = "b4befe"; - text = "cdd6f4"; - subtext1 = "bac2de"; - subtext0 = "a6adc8"; - overlay2 = "9399b2"; - overlay1 = "7f849c"; - overlay0 = "6c7086"; - surface2 = "585b70"; - surface1 = "45475a"; - surface0 = "494d64"; - base = "1e1e2e"; - mantle = "181825"; - crust = "11111b"; - }); -} diff --git a/modules/moritz/config/theming/default.nix b/modules/moritz/config/theming/default.nix deleted file mode 100644 index add3045..0000000 --- a/modules/moritz/config/theming/default.nix +++ /dev/null @@ -1,214 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.my.theming; -in { - imports = [ - ./dracula.nix - ./catppuccin-frappe.nix - ./catppuccin-latte.nix - ./catppuccin-macchiato.nix - ./catppuccin-mocha.nix - ]; - - options.my.theming = { - enable = mkEnableOption "theming"; - scheme = mkOption { - type = types.enum [ - "dracula" - "catppuccin-latte" - "catppuccin-frappe" - "catppuccin-macchiato" - "catppuccin-mocha" - ]; - }; - }; - - config = mkIf cfg.enable { - my.programs.tofi.settings = { - font-size = "20"; - font = let - fontBasePath = pkgs.nerd-fonts.fira-code; - in "${fontBasePath}/share/fonts/truetype/NerdFonts/FiraCodeNerdFont-Regular.ttf"; - height = "360"; - width = "720"; - outline-width = "0"; - border-width = "0"; - }; - my.programs.ghostty.settings.theme = cfg.scheme; - home-manager.users.moritz = { - services.polybar = { - config = { - "bar/bottom" = { - # position - monitor = "\${env:MONITOR}"; - bottom = true; - width = "100%"; - height = 15; - - border-size = 2; - - separator = " "; - - font-0 = "FiraCode Nerd Font:size=8;0"; - font-1 = "FiraCode Nerd Font:size=8;1"; - font-2 = "FiraCode Nerd Font:size=8;2"; - - modules-left = "cpu memory network battery"; - modules-center = "bspwm"; - modules-right = "pulseaudio date time"; - - tray-position = "right"; - tray-padding = 2; - - wm-restack = "bspwm"; - - cursor-click = "pointer"; - cursor-scroll = "ns-resize"; - }; - "module/battery" = { - type = "internal/battery"; - battery = "BATT"; - adapter = "ACAD"; - time-format = "%H:%M"; - - format-charging = " "; - format-charging-padding = 1; - format-discharging = " "; - format-discharging-padding = 1; - format-full = " "; - format-full-padding = 1; - - label-charging = "%percentage%% %time% remaining"; - label-discharging = "%percentage%% %time% remaining"; - label-full = "Fully charged"; - - animation-charging-0 = " "; - animation-charging-1 = " "; - animation-charging-2 = " "; - animation-charging-3 = " "; - animation-charging-4 = " "; - animation-charging-framerate = 500; - - animation-discharging-0 = " "; - animation-discharging-1 = " "; - animation-discharging-2 = " "; - animation-discharging-3 = " "; - animation-discharging-4 = " "; - animation-discharging-framerate = 500; - }; - "module/bspwm" = { - type = "internal/bspwm"; - - label-focused = ""; - label-focused-padding = 1; - - label-occupied = ""; - label-occupied-padding = 1; - - label-urgent = ""; - label-urgent-padding = 1; - - label-empty = ""; - label-empty-padding = 1; - - label-separator = " "; - label-separator-padding = 1; - - pin-workspaces = true; - }; - "module/cpu" = { - type = "internal/cpu"; - interval = 2; - - format = "