From c3f2d41406fefb183c0e0bfd81e0dfde8740f56f Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Tue, 21 Nov 2023 11:42:10 -0800 Subject: [PATCH] changes for kitty and tmuxp scratch --- home/dot_config/alacritty/alacritty.yml | 60 ------------------- home/dot_config/sway/config.tmpl | 43 +++++-------- provision/home-modules/desktop/kitty.nix | 4 +- .../hosts/kestrel/home-configuration.nix | 7 ++- provision/modules/desktop/sway.nix | 1 - 5 files changed, 21 insertions(+), 94 deletions(-) delete mode 100644 home/dot_config/alacritty/alacritty.yml diff --git a/home/dot_config/alacritty/alacritty.yml b/home/dot_config/alacritty/alacritty.yml deleted file mode 100644 index 50a974c9..00000000 --- a/home/dot_config/alacritty/alacritty.yml +++ /dev/null @@ -1,60 +0,0 @@ -# Configuration for Alacritty, the GPU enhanced terminal emulator - -# Any items in the `env` entry below will be added as -# environment variables. Some entries may override variables -# set by alacritty it self. -env: - # TERM env customization. - # - # If this property is not set, alacritty will set it to xterm-256color. - # - # Note that some xterm terminfo databases don't declare support for italics. - # You can verify this by checking for the presence of `smso` and `sitm` in - # `infocmp xterm-256color`. - TERM: xterm-256color - -shell: - program: /run/current-system/sw/bin/bash - args: - - -l - - -c - - "tmux" - -# Font configuration (changes require restart) -font: - # Normal (roman) font face - normal: - family: Jet Brains Mono Nerd Font - # The `style` can be specified to pick a specific face. - style: Regular - - # Bold font face - bold: - family: Jet Brains Mono Nerd Font - # The `style` can be specified to pick a specific face. - style: Bold - - # Italic font face - italic: - family: Jet Brains Mono Nerd Font - # The `style` can be specified to pick a specific face. - style: Italic - - # Point size of the font - size: 12.0 - - # Offset is the extra space around each character. `offset.y` can be thought of - # as modifying the line spacing, and `offset.x` as modifying the letter spacing. - offset: - x: 0 - y: 1 - - # Glyph offset determines the locations of the glyphs within their cells with - # the default being at the bottom. Increasing `x` moves the glyph to the right, - # increasing `y` moves the glyph upwards. - glyph_offset: - x: 0 - y: 1 - -import: - - ~/.config/alacritty/themes/themes/dracula.yaml diff --git a/home/dot_config/sway/config.tmpl b/home/dot_config/sway/config.tmpl index c6eb84b1..424488c1 100644 --- a/home/dot_config/sway/config.tmpl +++ b/home/dot_config/sway/config.tmpl @@ -28,7 +28,7 @@ set $e exec swaymsg mode default set $mode_power "[r]eboot | [s]hutdown" -set $TERM alacritty +set $TERM kitty #------------------------------------------------------------------------------- #----- COLORS @@ -93,13 +93,8 @@ for_window [title="Steam - News"] floating enable for_window [title="Friends List"] floating enable for_window [title=".*mpv$"] sticky toggle for_window [title=".*mpv$"] floating enable - -for_window [app_id="file"] floating enable, \ - border pixel 5, \ - resize set 70 ppt 60 ppt, \ - move position center, \ - move to scratchpad, \ - scratchpad show +# Float w3m image previews from newsboat +for_window [title="ImageMagick"] floating enable #------------------------------------------------------------------------------- #----- BINDING APPLICATIONS TO WORKSPACE @@ -188,10 +183,10 @@ bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -2% bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle # Open applications -bindsym $mod+Return exec alacritty +bindsym $mod+Shift+Return exec $TERM bindsym $mod+a mode launcher mode launcher { - bindsym r exec alacritty --title launcher -e ~/bin/linux-app-launcher, $e + bindsym r exec "$TERM --title launcher -e ~/bin/linux-app-launcher", $e bindsym Escape mode default } bindsym $mod+o mode open @@ -207,28 +202,18 @@ mode open { for_window [con_mark="SCRATCHPAD_jop"] border pixel 1 # Scratchpads commands +bindsym $mod+Return exec sway-scratchpad \ + --command "$TERM -e tmuxp load ~/.config/tmuxp/scratch.yml" \ + --mark scratch \ + --width 71 \ + --height 71, $e bindsym $mod+c mode scratch mode scratch { - bindsym Return exec sway-scratchpad \ - --command "alacritty" \ - --mark term \ - --width 40 \ - --height 71, $e bindsym b exec sway-scratchpad \ - --command "blueman-manager" \ - --mark blue \ - --width 40 \ - --height 71, $e - bindsym f exec sway-scratchpad \ - --command "alacritty -e tmuxp load /home/{{ .user }}/.config/tmuxp/files.yml" \ - --mark files \ - --width 71 \ - --height 71, $e - bindsym d exec sway-scratchpad \ - --command "alacritty -e tmuxp load /home/{{ .user }}/.config/tmuxp/dot.yml" \ - --mark dot \ - --width 90 \ - --height 90, $e + --command "blueman-manager" \ + --mark blue \ + --width 40 \ + --height 71, $e bindsym Shift+c move scratchpad, $e bindsym c scratchpad show, $e bindsym Escape mode default diff --git a/provision/home-modules/desktop/kitty.nix b/provision/home-modules/desktop/kitty.nix index c8db1edf..f83115ec 100644 --- a/provision/home-modules/desktop/kitty.nix +++ b/provision/home-modules/desktop/kitty.nix @@ -1,8 +1,8 @@ { config, lib, pkgs, user, ... }: -let cfg = config.modules.gaming.steam; +let cfg = config.modules.desktop.kitty; in { - options.modules.gaming.steam.enable = lib.mkEnableOption "steam"; + options.modules.desktop.kitty.enable = lib.mkEnableOption "kitty"; config = lib.mkIf cfg.enable { programs.kitty = { enable = true; diff --git a/provision/hosts/kestrel/home-configuration.nix b/provision/hosts/kestrel/home-configuration.nix index 805c4d0a..8cf1a58c 100644 --- a/provision/hosts/kestrel/home-configuration.nix +++ b/provision/hosts/kestrel/home-configuration.nix @@ -22,8 +22,11 @@ ]; # Enable home modules - #modules = { - #}; + modules = { + desktop = { + kitty.enable = true; + }; + }; home.stateVersion = "23.05"; } diff --git a/provision/modules/desktop/sway.nix b/provision/modules/desktop/sway.nix index abca0858..ce201e18 100644 --- a/provision/modules/desktop/sway.nix +++ b/provision/modules/desktop/sway.nix @@ -28,7 +28,6 @@ in { config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ - alacritty sway swayidle swaybg