diff --git a/.gitignore b/.gitignore index 9d68e4466..583928137 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ zhistory zcompdump .sys *cache* -dots/.config/mpd/state -dots/.config/mpd/sticker.sql +dots/config/mpd/state +dots/config/mpd/sticker.sql +dots/config/alacritty/alacritty.toml diff --git a/dots/config/alacritty/alacritty.toml b/dots/config/alacritty/alacritty.toml deleted file mode 100644 index 67cd88608..000000000 --- a/dots/config/alacritty/alacritty.toml +++ /dev/null @@ -1,44 +0,0 @@ -# █████╗ ██╗ █████╗ ██████╗██████╗ ██╗████████╗████████╗██╗ ██╗ -# ██╔══██╗██║ ██╔══██╗██╔════╝██╔══██╗██║╚══██╔══╝╚══██╔══╝╚██╗ ██╔╝ -# ███████║██║ ███████║██║ ██████╔╝██║ ██║ ██║ ╚████╔╝ -# ██╔══██║██║ ██╔══██║██║ ██╔══██╗██║ ██║ ██║ ╚██╔╝ -# ██║ ██║███████╗██║ ██║╚██████╗██║ ██║██║ ██║ ██║ ██║ -# ╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝╚═╝ ╚═╝ ╚═╝ ╚═╝ - -import = ["~/.config/alacritty/rice-colors.toml", "~/.config/alacritty/fonts.toml"] - -live_config_reload = true - -[cursor] -blink_interval = 550 -unfocused_hollow = false -thickness = 0.15 - -[cursor.style] -blinking = "On" -shape = "Block" - -[selection] -save_to_clipboard = true - -[window] -decorations = "none" -dynamic_title = true -opacity = 1.0 -dynamic_padding = true - -[window.padding] -x = 5 -y = 5 - -[scrolling] -history = 10000 -multiplier = 3 - -# [bell] -# animation = "Linear" -# duration = 0 -# command = { program = "paplay", args = ["/usr/share/sounds/freedesktop/stereo/dialog-error.oga"] } - -[env] -WINIT_X11_SCALE_FACTOR = "1.4" diff --git a/dots/config/alacritty/alacritty.toml b/dots/config/alacritty/alacritty.toml new file mode 120000 index 000000000..2b84f667f --- /dev/null +++ b/dots/config/alacritty/alacritty.toml @@ -0,0 +1 @@ +/nix/store/61pqq1cjsd5fj9fyfdnmsp563rwr70nd-home-manager-files/.config/alacritty/alacritty.toml \ No newline at end of file diff --git a/nix-config/home/alacritty.nix b/nix-config/home/alacritty.nix new file mode 100644 index 000000000..914ae6856 --- /dev/null +++ b/nix-config/home/alacritty.nix @@ -0,0 +1,45 @@ + +{ pkgs, config, lib, host, ... }: + +let + palette = config.colorScheme.palette; + inherit (import ../hosts/${host}/options.nix) alacritty x11ScaleFactor; +in lib.mkIf (alacritty == true) { + programs.alacritty = { + enable = true; + settings = { + import = [ + "~/.config/alacritty/rice-colors.toml" + "~/.config/alacritty/fonts.toml" + ]; + live_config_reload = true; + cursor = { + style = { + shape = "Beam"; + blinking = "On"; + }; + blink_interval = 550; + unfocused_hollow = false; + thickness = 0.15; + }; + env = { + WINIT_X11_SCALE_FACTOR = x11ScaleFactor; + }; + selection = { + save_to_clipboard = true; + }; + window = { + decorations = "none"; + dynamic_title = true; + dynamic_padding = true; + padding.x = 5; + padding.y = 5; + opacity = 1; + }; + scrolling = { + history = 10000; + multiplier = 3; + }; + }; + }; +} diff --git a/nix-config/home/default.nix b/nix-config/home/default.nix index 508f49de6..1758ae49a 100644 --- a/nix-config/home/default.nix +++ b/nix-config/home/default.nix @@ -3,7 +3,7 @@ { imports = [ # Enable &/ Configure Programs -# ./alacritty.nix + ./alacritty.nix # ./bash.nix ./betterlockscreen.nix ./firefox.nix diff --git a/nix-config/hosts/nix-deskstar/options.nix b/nix-config/hosts/nix-deskstar/options.nix index e0ee7f630..e254f9f9f 100644 --- a/nix-config/hosts/nix-deskstar/options.nix +++ b/nix-config/hosts/nix-deskstar/options.nix @@ -78,6 +78,9 @@ in { # Enable SyncThing syncthing = true; + # Xorg scaling + x11ScaleFactor = "1.0"; + # Power profiles daemon powerprofiles = false; diff --git a/nix-config/hosts/nix-lappy/options.nix b/nix-config/hosts/nix-lappy/options.nix index 68f08f006..3d1a2171d 100644 --- a/nix-config/hosts/nix-lappy/options.nix +++ b/nix-config/hosts/nix-lappy/options.nix @@ -77,6 +77,7 @@ in { syncthing = true; # Xorg scaling + x11ScaleFactor = "1.4"; xrandrScale = "0.8x0.8"; # Power profiles daemon @@ -84,4 +85,6 @@ in { # Use lanzaboote for secureboot secureboot = true; + + } diff --git a/nix-config/hosts/nix-vm/options.nix b/nix-config/hosts/nix-vm/options.nix index 78a0ed687..e70f1b364 100644 --- a/nix-config/hosts/nix-vm/options.nix +++ b/nix-config/hosts/nix-vm/options.nix @@ -55,6 +55,7 @@ in { printer = false; # Program options + terminal = "alacritty"; # This sets the terminal that is used by the hyprland terminal keybinding browser = "firefox"; distrobox = false; @@ -78,6 +79,9 @@ in { # Enable SyncThing syncthing = true; + # Xorg scaling + x11ScaleFactor = "1.0"; + # Power profiles daemon powerprofiles = false;