diff --git a/home/alacritty.nix b/home/alacritty.nix deleted file mode 100644 index 7ef12a7..0000000 --- a/home/alacritty.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, ... }: -let - cfg = config.my.home.alacritty; - alacrittyTheme = config.my.theme.alacrittyTheme; -in -{ - options.my.home.alacritty.enable = lib.mkEnableOption "Alacritty terminal"; - - config.programs.alacritty = lib.mkIf cfg.enable { - enable = true; - - settings = { - window = { - padding = { - x = 8; - y = 8; - }; - decorations = "none"; - }; - - font = { - normal = { - family = "Input Mono Narrow"; - }; - size = 9.0; - }; - - colors = alacrittyTheme; - }; - }; -} diff --git a/home/default.nix b/home/default.nix index 64acc10..22ffb90 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,7 +1,6 @@ { ... }: { imports = [ - ./alacritty.nix ./emacs.nix ./flameshot.nix ./secrets diff --git a/home/themes/alacritty.nix b/home/themes/alacritty.nix deleted file mode 100644 index 0e1aeb3..0000000 --- a/home/themes/alacritty.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib }: -with lib; -let - mkColorOption = import ./color.nix { inherit lib; }; - - primaryColorModule = types.submodule { - options = { - background = mkColorOption {}; - foreground = mkColorOption {}; - }; - }; - - cursorColorModule = types.submodule { - options = { - text = mkColorOption {}; - cursor = mkColorOption {}; - }; - }; - - rainbowColorModule = types.submodule { - options = { - black = mkColorOption {}; - red = mkColorOption {}; - green = mkColorOption {}; - yellow = mkColorOption {}; - blue = mkColorOption {}; - magenta = mkColorOption {}; - cyan = mkColorOption {}; - white = mkColorOption {}; - }; - }; -in -types.submodule { - options = { - primary = mkOption { - type = primaryColorModule; - default = { - foreground = "#c5c8c6"; - background = "#1d1f21"; - }; - }; - cursor = mkOption { - type = cursorColorModule; - default = { - text = "#1d1f21"; - cursor = "#c5c8c6"; - }; - }; - normal = mkOption { - type = rainbowColorModule; - default = { - black = "#1d1f21"; - red = "#cc6666"; - green = "#b5bd68"; - yellow = "#f0c674"; - blue = "#81a2be"; - magenta = "#b294bb"; - cyan = "#8abeb7"; - white = "#c5c8c6"; - }; - }; - bright = mkOption { - type = rainbowColorModule; - default = { - black = "#666666"; - red = "#d54e53"; - green = "#b9ca4a"; - yellow = "#e7c547"; - blue = "#7aa6da"; - magenta = "#c397d8"; - cyan = "#70c0b1"; - white = "#eaeaea"; - }; - }; - dim = mkOption { - type = rainbowColorModule; - default = { - black = "#131415"; - red = "#864343"; - green = "#777c44"; - yellow = "#9e824c"; - blue = "#556a7d"; - magenta = "#75617b"; - cyan = "#5b7d78"; - white = "#828482"; - }; - }; - }; -} diff --git a/home/themes/default.nix b/home/themes/default.nix index ebf417e..0ee7404 100644 --- a/home/themes/default.nix +++ b/home/themes/default.nix @@ -3,13 +3,8 @@ with lib; let themeType = types.submodule { options = { - alacrittyTheme = mkOption { - type = import ./alacritty.nix { inherit lib; }; - default = {}; - }; i3Theme = mkOption { type = import ./i3.nix { inherit lib; }; - default = {}; }; }; }; @@ -17,7 +12,6 @@ in { options.my.theme = mkOption { type = themeType; - default = {}; }; options.my.themes = mkOption { diff --git a/home/themes/i3.nix b/home/themes/i3.nix index 450f26a..9e9d72d 100644 --- a/home/themes/i3.nix +++ b/home/themes/i3.nix @@ -103,8 +103,6 @@ types.submodule { }; }; }; - - default = {}; }; background = mkOption { diff --git a/home/themes/solarizedLight/alacritty.nix b/home/themes/solarizedLight/alacritty.nix deleted file mode 100644 index 9f2149f..0000000 --- a/home/themes/solarizedLight/alacritty.nix +++ /dev/null @@ -1,39 +0,0 @@ -let - colors = import ./colors.nix; -in -with colors; -{ - primary = { - background = base3; - foreground = base00; - }; - - cursor = { - text = base3; - cursor = base00; - }; - - normal = { - black = base02; - red = red; - green = green; - yellow = yellow; - blue = blue; - magenta = magenta; - cyan = cyan; - white = base2; - }; - - bright = { - black = base03; - red = orange; - green = base01; - yellow = base00; - blue = base0; - magenta = violet; - cyan = base1; - white = base3; - }; - - dim = {}; -} diff --git a/home/themes/solarizedLight/colors.nix b/home/themes/solarizedLight/colors.nix index e5cac20..7c7f771 100644 --- a/home/themes/solarizedLight/colors.nix +++ b/home/themes/solarizedLight/colors.nix @@ -1,31 +1,12 @@ { - i3 = { - background = "#282828"; - red = "#cc241d"; - green = "#98971a"; - yellow = "#d79921"; - blue = "#458588"; - purple = "#b16286"; - aqua = "#689d68"; - gray = "#a89984"; - darkGray = "#1d2021"; - white = "#ffffff"; - }; - - base03 = "#002b36"; # brblack - base02 = "#073642"; # black - base01 = "#586e75"; # brgreen - base00 = "#657b83"; # bryellow - base0 = "#839496"; # brblue - base1 = "#93a1a1"; # brcyan - base2 = "#eee8d5"; # white - base3 = "#fdf6e3"; # brwhite - yellow = "#b58900"; # yellow - orange = "#cb4b16"; # brred - red = "#dc322f"; # red - magenta = "#d33682"; # magenta - violet = "#6c71c4"; # brmagenta - blue = "#268bd2"; # blue - cyan = "#2aa198"; # cyan - green = "#859900"; # green + background = "#282828"; + red = "#cc241d"; + green = "#98971a"; + yellow = "#d79921"; + blue = "#458588"; + purple = "#b16286"; + aqua = "#689d68"; + gray = "#a89984"; + darkGray = "#1d2021"; + white = "#ffffff"; } diff --git a/home/themes/solarizedLight/default.nix b/home/themes/solarizedLight/default.nix index 299fec1..f0646f6 100644 --- a/home/themes/solarizedLight/default.nix +++ b/home/themes/solarizedLight/default.nix @@ -1,4 +1,3 @@ { i3Theme = import ./i3.nix; - alacrittyTheme = import ./alacritty.nix; } diff --git a/home/themes/solarizedLight/i3.nix b/home/themes/solarizedLight/i3.nix index 69a9982..75399b3 100644 --- a/home/themes/solarizedLight/i3.nix +++ b/home/themes/solarizedLight/i3.nix @@ -1,7 +1,7 @@ let colors = import ./colors.nix; in -with colors.i3; +with colors; { bar = { background = background; diff --git a/home/tmux.nix b/home/tmux.nix index b19036a..8325fa9 100644 --- a/home/tmux.nix +++ b/home/tmux.nix @@ -10,6 +10,5 @@ in config.programs.tmux = lib.mkIf cfg.enable { enable = true; baseIndex = 1; - terminal = "screen-256color"; }; } diff --git a/hosts/boreal/home.nix b/hosts/boreal/home.nix index b178f61..623800a 100644 --- a/hosts/boreal/home.nix +++ b/hosts/boreal/home.nix @@ -4,7 +4,6 @@ # Keyboard settings & i3 settings my.home.x.enable = true; my.home.x.cursor.enable = true; - my.home.alacritty.enable = true; my.home.emacs.enable = true; my.home.tmux.enable = true; my.theme = config.home-manager.users.alarsyo.my.themes.solarizedLight;