From 77360fda1bbe4f75e8b85f3800772290ff298e16 Mon Sep 17 00:00:00 2001 From: Tyler Kelley Date: Fri, 9 Feb 2024 01:53:11 -0600 Subject: [PATCH] Setup Alacritty, Wezterm, & Kitty Support --- config/home/alacritty.nix | 34 ++++++++++++++++++++++++++++++++++ config/home/default.nix | 1 + config/home/hyprland.nix | 8 ++------ config/home/kitty.nix | 6 ++++-- options.nix | 21 ++++++++++++++++++++- 5 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 config/home/alacritty.nix diff --git a/config/home/alacritty.nix b/config/home/alacritty.nix new file mode 100644 index 0000000..ca982a8 --- /dev/null +++ b/config/home/alacritty.nix @@ -0,0 +1,34 @@ +{ pkgs, config, lib, ... }: + +let + palette = config.colorScheme.palette; + inherit (import ../../options.nix) alacritty; +in lib.mkIf (alacritty == true) { + programs.alacritty = { + enable = true; + settings = { + window = { + padding.x = 15; + padding.y = 15; + decorations = "none"; + startup_mode = "Windowed"; + dynamic_title = true; + opacity = 0.85; + }; + cursor = { + style = { + shape = "Beam"; + blinking = "On"; + }; + }; + live_config_reload = true; + font = { + normal.family = "JetBrainsMono Nerd Font"; + bold.family = "JetBrainsMono Nerd Font"; + italic.family = "JetBrainsMono Nerd Font"; + bold_italic.family = "JetBrainsMono Nerd Font"; + size = 14; + }; + }; + }; +} diff --git a/config/home/default.nix b/config/home/default.nix index 8b3a1b3..e34bec5 100644 --- a/config/home/default.nix +++ b/config/home/default.nix @@ -3,6 +3,7 @@ { imports = [ # Enable &/ Configure Programs + ./alacritty.nix ./bash.nix ./gtk-qt.nix ./hyprland.nix diff --git a/config/home/hyprland.nix b/config/home/hyprland.nix index f80a209..ba2de57 100644 --- a/config/home/hyprland.nix +++ b/config/home/hyprland.nix @@ -6,7 +6,7 @@ let inherit (import ../../options.nix) browser cpuType gpuType wallpaperDir borderAnim - theKBDLayout wezterm + theKBDLayout terminal theSecondKBDLayout; in with lib; { wayland.windowManager.hyprland = { @@ -125,11 +125,7 @@ in with lib; { master { new_is_master = true } - ${if wezterm == true then '' - bind = ${modifier},Return,exec,wezterm - '' else '' - bind = ${modifier},Return,exec,kitty - ''} + bind = ${modifier},Return,exec,${terminal} bind = ${modifier}SHIFT,Return,exec,rofi-launcher bind = ${modifier}SHIFT,W,exec,web-search bind = ${modifier}SHIFT,S,exec,swaync-client -rs diff --git a/config/home/kitty.nix b/config/home/kitty.nix index fc1c04d..72ebcd2 100644 --- a/config/home/kitty.nix +++ b/config/home/kitty.nix @@ -1,8 +1,10 @@ -{ pkgs, config, ... }: +{ pkgs, config, lib, ... }: let palette = config.colorScheme.palette; -in { + inherit (import ../../options.nix) alacritty wezterm kitty; +in lib.mkIf (wezterm == false && alacritty == false + || kitty == true) { # Configure Kitty programs.kitty = { enable = true; diff --git a/options.nix b/options.nix index 672ba92..df8827f 100644 --- a/options.nix +++ b/options.nix @@ -17,6 +17,7 @@ in { wallpaperDir = "${userHome}/Pictures/Wallpapers"; flakeDir = "${userHome}/zaneyos"; screenshotDir = "${userHome}/Pictures/Screenshots"; + terminal = "alacritty"; # System Settings theLocale = "en_US.UTF-8"; @@ -25,22 +26,40 @@ in { theLCVariables = "en_US.UTF-8"; theTimezone = "America/Chicago"; theShell = "bash"; # Possible options: bash, zsh + # For Hybrid Systems intel-nvidia + # Should Be Used As gpuType cpuType = "intel"; gpuType = "amd"; - # Optional Settings + # Nvidia Hybrid Devices + # ONLY NEEDED FOR HYBRID + # SYSTEMS! intel-bus-id = "PCI:0:2:0"; nvidia-bus-id = "PCI:14:0:0"; + + # Enable / Setup NFS nfs = false; nfsMountPoint = "/mnt/nas"; nfsDevice = "nas:/volume1/nas"; + + # Printer, NTP, HWClock Settings localHWClock = false; ntp = true; printer = false; + + # Enable Flatpak & Larger Programs flatpak = false; kdenlive = true; blender = true; + + # Enable Support For + # Logitech Devices logitech = true; + + # Enable Terminals + # If You Disable All You Get Kitty wezterm = false; + alacritty = true; + kitty = false; }