From 2de002ef1bfeb78d397842073f58480d13ebb491 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 27 Mar 2025 19:57:34 +0100 Subject: [PATCH] remove dead code 1 (old themeing code) --- .../home/notifications.nix | 1 + modules/desktop/themeing.nix | 21 +------ modules/shell/tty.nix | 55 +------------------ 3 files changed, 3 insertions(+), 74 deletions(-) diff --git a/modules/desktop-environment/home/notifications.nix b/modules/desktop-environment/home/notifications.nix index 8c5f9aa..37390e9 100644 --- a/modules/desktop-environment/home/notifications.nix +++ b/modules/desktop-environment/home/notifications.nix @@ -14,6 +14,7 @@ foreground = "#ebdbb2"; frame_color = "#504945"; frame_width = 2; + font = "Atkinson Hyperlegible"; }; }; }; diff --git a/modules/desktop/themeing.nix b/modules/desktop/themeing.nix index 1803dc4..ad065df 100644 --- a/modules/desktop/themeing.nix +++ b/modules/desktop/themeing.nix @@ -5,41 +5,22 @@ ... }: { config = { - # fonts.packages = with pkgs; [ - # atkinson-hyperlegible - # ]; home-manager.users.jade = {pkgs, ...}: { home.packages = with pkgs; [ - # gtk-engine-murrine - # gruvbox-dark-gtk gruvbox-dark-icons-gtk ]; gtk = { - # enable = true; + enable = true; cursorTheme = { package = pkgs.phinger-cursors; name = "phinger-cursors"; size = 30; }; - # font = { - # package = pkgs.atkinson-hyperlegible; - # name = "Atkinson Hyperlegible"; - # size = 11.5; - # }; iconTheme = { package = pkgs.gruvbox-dark-icons-gtk; name = "gruvbox-dark-icons"; }; }; - # theme = { - # package = pkgs.gruvbox-dark-gtk; - # name = "gruvbox-dark"; - # }; - # }; - # qt = { - # enable = true; - # platformTheme.name = "gtk"; - # }; }; }; } diff --git a/modules/shell/tty.nix b/modules/shell/tty.nix index 764d905..becd7b0 100644 --- a/modules/shell/tty.nix +++ b/modules/shell/tty.nix @@ -1,10 +1,4 @@ -{ - pkgs, - config, - lib, - ... -}: let - # generate shell command options for kmscon fom an attrset +{config, ...}: let generateOptions = with builtins; ( opts: toString ( @@ -13,26 +7,6 @@ ) ) ); - # generate a hexadecimal number lookup table to get integers from them - hexLookupTable = with lib; (listToAttrs (genList (i: { - name = let - r = toHexString i; - in ( - # pad with 0 in front if only 1 digit - if (stringLength r) == 1 - then "0${r}" - else r - ); - value = toString i; - }) - 256)); - # "parse" hex color strings and convert them to kmscon options - hexToOpt = with lib; (color: - concatStringsSep "," [ - (getAttr (substring 1 2 (toUpper color)) hexLookupTable) - (getAttr (substring 3 2 (toUpper color)) hexLookupTable) - (getAttr (substring 5 2 (toUpper color)) hexLookupTable) - ]); in { # TODO: global colorscheme vars for everything console.colors = [ @@ -56,37 +30,10 @@ in { services.kmscon = { enable = true; - # fonts = [ - # { - # name = "Departure Mono Nerd Font"; - # package = pkgs.nerd-fonts.departure-mono; - # } - # ]; extraConfig = "font-size=14"; - # extraOptions = "--term xterm-256color"; extraOptions = generateOptions { xkb-layout = config.services.xserver.xkb.layout; xkb-variant = config.services.xserver.xkb.variant; - - # palette = "custom"; - # palette-foreground = hexToOpt "#ebdbb2"; - # palette-background = hexToOpt "#282828"; - # palette-black = hexToOpt "#282828"; - # palette-red = hexToOpt "#cc241d"; - # palette-green = hexToOpt "#98971a"; - # palette-yellow = hexToOpt "#d79921"; - # palette-blue = hexToOpt "#458588"; - # palette-magenta = hexToOpt "#b16286"; - # palette-cyan = hexToOpt "#689d6a"; - # palette-light-grey = hexToOpt "#a89984"; - # palette-dark-grey = hexToOpt "#928374"; - # palette-light-red = hexToOpt "#fb4934"; - # palette-light-green = hexToOpt "#b8bb26"; - # palette-light-yellow = hexToOpt "#fabd2f"; - # palette-light-blue = hexToOpt "#83a598"; - # palette-light-magenta = hexToOpt "#d3869b"; - # palette-light-cyan = hexToOpt "#8ec07c"; - # palette-white = hexToOpt "#ebdbb2"; }; hwRender = true; };