From 15f26a50e9df70a2c8ef4bcc8550d0e4121ba6f4 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar <54011232+arpitchakladar@users.noreply.github.com> Date: Sat, 12 Oct 2024 01:23:54 +0530 Subject: Using desktop background. Using window transparency with picom. Using alacritty because kitty is having problems with colors when picom is running. --- modules/desktop/terminal/alacritty/default.nix | 83 -------------------------- modules/desktop/terminal/default.nix | 23 ------- modules/desktop/terminal/kitty/default.nix | 52 ---------------- 3 files changed, 158 deletions(-) delete mode 100644 modules/desktop/terminal/alacritty/default.nix delete mode 100644 modules/desktop/terminal/default.nix delete mode 100644 modules/desktop/terminal/kitty/default.nix (limited to 'modules/desktop/terminal') diff --git a/modules/desktop/terminal/alacritty/default.nix b/modules/desktop/terminal/alacritty/default.nix deleted file mode 100644 index 151e098..0000000 --- a/modules/desktop/terminal/alacritty/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ pkgs, config, lib, ... }: - -{ - options.desktop.terminal.alacritty = { - enable = lib.mkEnableOption "Enables alacritty."; - }; - - config = lib.mkIf config.desktop.terminal.alacritty.enable { - programs.alacritty.enable = true; - desktop.terminal.default = lib.mkDefault "alacritty"; - desktop.terminal.command = - if config.desktop.terminal.default == "alacritty" then - lib.mkForce "${pkgs.kitty}/bin/alacritty" - else ""; - - programs.alacritty.settings = { - window = { - opacity = 1.0; - padding = { - x = 4; - y = 0; - }; - decorations = "full"; - }; - - font = { - normal = { - family = config.fonts.normal; - style = "Retina"; - }; - bold = { - family = config.fonts.bold; - style = "Bold"; - }; - italic = { - family = config.fonts.italic; - }; - size = config.fonts.size; - }; - - colors = with config.scheme; { - primary = { - background = "0x${base00}"; - foreground = "0x${base05}"; - }; - normal = { - black = "0x${base00}"; - red = "0x${base08}"; - green = "0x${base0B}"; - yellow = "0x${base0A}"; - blue = "0x${base0D}"; - magenta = "0x${base0E}"; - cyan = "0x${base0C}"; - white = "0x${base05}"; - }; - bright = { - black = "0x${base03}"; - red = "0x${base08}"; - green = "0x${base0B}"; - yellow = "0x${base0A}"; - blue = "0x${base0D}"; - magenta = "0x${base0E}"; - cyan = "0x${base0C}"; - white = "0x${base07}"; - }; - dim = { - black = "0x${base01}"; - red = "0x${base08}"; - green = "0x${base0B}"; - yellow = "0x${base0A}"; - blue = "0x${base0D}"; - magenta = "0x${base0E}"; - cyan = "0x${base0C}"; - white = "0x${base04}"; - }; - }; - - shell = { - program = config.shell.command; - }; - }; - }; -} diff --git a/modules/desktop/terminal/default.nix b/modules/desktop/terminal/default.nix deleted file mode 100644 index 189c794..0000000 --- a/modules/desktop/terminal/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, ... }: - -{ - imports = [ - ./alacritty - ./kitty - ]; - - options.desktop.terminal = { - command = lib.mkOption { - type = lib.types.str; - description = "Command for the terminal."; - }; - - default = lib.mkOption { - type = lib.types.enum [ - "kitty" - "alacritty" - ]; - description = "Default terminal."; - }; - }; -} diff --git a/modules/desktop/terminal/kitty/default.nix b/modules/desktop/terminal/kitty/default.nix deleted file mode 100644 index a34e58a..0000000 --- a/modules/desktop/terminal/kitty/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ pkgs, config, lib, ... }: - -{ - options.desktop.terminal.kitty = { - enable = lib.mkEnableOption "Enables kitty."; - }; - - config = lib.mkIf config.desktop.terminal.kitty.enable { - assertions = [ - { - assertion = config.desktop.xdg-portal.enable; - message ="Module desktop.terminal.kitty requires desktop.xdg-portal module to be enabled."; - } - ]; - programs.kitty.enable = true; - desktop.terminal.default = lib.mkDefault "kitty"; - desktop.terminal.command = - if config.desktop.terminal.default == "kitty" then - lib.mkForce "${pkgs.kitty}/bin/kitty" - else ""; - - programs.kitty.settings = with config.scheme.withHashtag; { - window_padding_width = config.desktop.window-manager.gap; - font_size = config.fonts.size; - font_family = config.fonts.normal; - filter_notification = "all"; - update_check_interval = 0; # disable notifications - scrollback_indicator_opacity = "0.5"; - - dynamic_background_opacity = false; - allow_remote_control = false; - enable_audio_bell = false; - - background = base00; - foreground = base05; - - color0 = base00; # Black - color1 = base08; # Red - color2 = base0B; # Green - color3 = base0A; # Yellow - color4 = base0D; # Blue - color5 = base0E; # Magenta - color6 = base0C; # Cyan - color7 = base05; # White - - selection_background = base03; - selection_foreground = base00; - - shell = config.shell.command; - }; - }; -} -- cgit v1.2.3