diff --git a/.chezmoiignore b/.chezmoiignore index a3ceed8..acd2a01 100644 --- a/.chezmoiignore +++ b/.chezmoiignore @@ -17,6 +17,7 @@ .config/rofi/wal.rasi .config/nvim .config/sway/outputs +.config/systemd/user/default.target.wants .inputrc .env {{- end }} diff --git a/dot_envrc b/dot_envrc index cc5a836..ac698e2 100644 --- a/dot_envrc +++ b/dot_envrc @@ -139,6 +139,10 @@ esac export LOCALE_ARCHIVE=/usr/lib/locale/locale-archive # this better fix libadwaita? export ADW_DISABLE_PORTAL=1 +# fix firefox wayland? export MOZ_ENABLE_WAYLAND=1 +# fix sway setting env vars? export XDG_CURRENT_DESKTOP="${XDG_CURRENT_DESKTOP:-sway}" -export FREETYPE_PROPERTIES="truetype:interpreter-version=40" +# fix font rendering? +export FREETYPE_PROPERTIES="truetype:interpreter-version=40 cff:no-stem-darkening=0 autofitter:no-stem-darkening=0" + diff --git a/dot_nix-channels b/dot_nix-channels index 2872056..8b2dec1 100644 --- a/dot_nix-channels +++ b/dot_nix-channels @@ -1 +1,2 @@ -https://nixos.org/channels/nixos-unstable nixos-unstable +# https://github.com/nix-community/NUR/archive/master.tar.gz nur +https://nixos.org/channels/nixpkgs-unstable nixpkgs diff --git a/executable_dot_aliasrc b/executable_dot_aliasrc index 7f04088..6d3ce4c 100644 --- a/executable_dot_aliasrc +++ b/executable_dot_aliasrc @@ -138,10 +138,7 @@ load_aliases() { alias fd="fdfind" fi - if [[ $TERM =~ ".*kitty*" ]]; then - alias icat="kitty +kitten icat" - alias ssh="kitten ssh" - fi + alias icat="kitty +kitten icat" } load_aliases unset -f load_aliases diff --git a/executable_dot_bashrc b/executable_dot_bashrc index 0db0b6d..2ed6aad 100644 --- a/executable_dot_bashrc +++ b/executable_dot_bashrc @@ -106,4 +106,4 @@ fi PATH=$OLDPATH unset OLDPATH -source /home/mira/.config/broot/launcher/bash/br +# export UUID=552fbc4c-1e9b-11b2-a85c-a01fe49e12ee diff --git a/private_dot_config/external_nvim b/private_dot_config/external_nvim deleted file mode 160000 index c0d58e2..0000000 --- a/private_dot_config/external_nvim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c0d58e2334df16128533abb0d6deb2d49c272e27 diff --git a/private_dot_config/ghostty/config b/private_dot_config/ghostty/config new file mode 100644 index 0000000..7506e6d --- /dev/null +++ b/private_dot_config/ghostty/config @@ -0,0 +1,34 @@ +clipboard-read = allow +clipboard-write = allow +clipboard-trim-trailing-spaces = true +window-theme = dark +mouse-shift-capture = true +gtk-titlebar = false +gtk-wide-tabs = false +font-family = TX-02 +confirm-close-surface = false + +window-padding-x = 4,2 +window-padding-y = 0 + +minimum-contrast=1 + + +background = #010206 +foreground = #ebf6ff +palette = 0=#1e1b30 +palette = 1=#a04558 +palette = 2=#76aa73 +palette = 3=#ad9d3d +palette = 4=#334773 +palette = 5=#a34a78 +palette = 6=#2a97b1 +palette = 7=#9a9ab8 +palette = 8=#504573 +palette = 9=#ed8096 +palette = 10=#a0dc9b +palette = 11=#c1b254 +palette = 12=#445f9b +palette = 13=#ee5e95 +palette = 14=#5bcefa +palette = 15=#c1c7db diff --git a/private_dot_config/kitty/kitty.conf b/private_dot_config/kitty/kitty.conf index 2bca6f0..c29a84b 100644 --- a/private_dot_config/kitty/kitty.conf +++ b/private_dot_config/kitty/kitty.conf @@ -19,10 +19,10 @@ #: heavy. Setting them manually is useful for font families that have #: many weight variants like Book, Medium, Thick, etc. For example:: -font_family MonaspiceNe Nerd Font Mono -bold_family MonaspiceNe Nerd Font Mono -italic_family MonaspiceNe Nerd Font Mono -bold_italic_family MonaspiceNe Nerd Font Mono +font_family TX-02 +# bold_family MonaspiceNe Nerd Font Mono +# italic_family MonaspiceNe Nerd Font Mono +# bold_italic_family MonaspiceNe Nerd Font Mono font_size 12.0 diff --git a/private_dot_config/mako/config b/private_dot_config/mako/config index 8608169..166835e 100644 --- a/private_dot_config/mako/config +++ b/private_dot_config/mako/config @@ -1,4 +1,4 @@ -font=Atkinson Hyperlegible, FontAwesome 12 +font=TX-02, FontAwesome 11 max-icon-size=32 height=300 width=300 @@ -7,3 +7,4 @@ text-color=#fbfbff border-radius=8 border-color=#746e95 default-timeout=10000 +layer=overlay diff --git a/private_dot_config/nvim-config b/private_dot_config/nvim-config deleted file mode 160000 index e3a99eb..0000000 --- a/private_dot_config/nvim-config +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e3a99eb8f20c358f8376579594c0ebbf62c1db55 diff --git a/private_dot_config/rofi/config.rasi b/private_dot_config/rofi/config.rasi index f3da05f..8908d6d 100644 --- a/private_dot_config/rofi/config.rasi +++ b/private_dot_config/rofi/config.rasi @@ -1,6 +1,7 @@ configuration { modes: "window,drun,run,ssh,combi"; -font: "Atkinson Hyperlegible 12"; +/*font: "FOT-UDKakugo_Large Pr6N semibold 12";*/ +font: "TX-02 bold 12"; /* location: 0;*/ /* yoffset: 0;*/ /* xoffset: 0;*/ diff --git a/private_dot_config/starship.toml b/private_dot_config/starship.toml index 66e6f9e..1c2ec75 100644 --- a/private_dot_config/starship.toml +++ b/private_dot_config/starship.toml @@ -160,10 +160,11 @@ style = "bg:bright-blue fg:black" format = '[ $time ]($style)' [shell] -bash_indicator = "" +bash_indicator = " " powershell_indicator = " " zsh_indicator = " " nu_indicator = "ν" +xonsh_indicator = "🐚" style = "bg:bright-purple fg:black" format = '[$indicator]($style)' disabled = false diff --git a/private_dot_config/sway/keybinds b/private_dot_config/sway/keybinds index db97761..4219566 100644 --- a/private_dot_config/sway/keybinds +++ b/private_dot_config/sway/keybinds @@ -1,5 +1,5 @@ # start a terminal -bindsym $mod+Shift+Return exec kitty +bindsym $mod+Return exec ghostty # kill focused window bindsym $mod+Shift+q kill @@ -148,3 +148,27 @@ bindsym $mod+Shift+z move workspace to output left bindsym $mod+Shift+n move container to output up bindsym $mod+Shift+m move workspace to output up +# Pipewire controls +bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% +bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% +bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle +bindsym XF86AudioPlay exec playerctl play-pause +bindsym XF86AudioNext exec playerctl next +bindsym XF86AudioPrev exec playerctl previous + +# Sreen brightness controls +bindsym XF86MonBrightnessUp exec brightnessctl -e s 5%+ +bindsym XF86MonBrightnessDown exec brightnessctl -e s 5%- + + +bindsym $mod+b exec xdg-open http:// +bindsym $mod+Shift+e exec rofi -show p -modi p:'rofi-power-menu --symbols-font "Symbols Nerd Font Mono"' -theme lunar-witch +bindsym $mod+space exec rofi -combi-modi "drun#run" -show combi -show-icons -theme lunar-witch + +bindsym Print exec grim - | tee "$XDG_PICTURES_DIR/screenshots/$(date -Is).png" | wl-copy -t image/png +bindsym Shift+Print exec grim -g "$(slurp)" - | tee "$XDG_PICTURES_DIR/screenshots/$(date -Is).png" | wl-copy -t image/png +bindsym Ctrl+Print exec TEMP=$(mktemp); grim -g "$(slurp)" $TEMP && notify-send "$TEMP" && flatpak run org.gimp.GIMP -- $TEMP + +bindsym $mod+Shift+v exec cliphist list | rofi -dmenu -display-columns 2 -p "Select item to copy" -lines 10 -width 35 -theme lunar-witch | cliphist decode | wl-copy + +# bindsym $mod+Shift+. exec rofi -show emoji -modi emoji -theme lunar-witch | cb diff --git a/private_dot_config/sway/theme b/private_dot_config/sway/theme index bdac7a4..373d3d4 100644 --- a/private_dot_config/sway/theme +++ b/private_dot_config/sway/theme @@ -11,11 +11,15 @@ client.urgent $urgent $urgent $fg $bg $bg client.placeholder $bg $bg $fg $bg $bg client.background $bg -font pango:Atkinson Hyperlegible bold 9 +# font pango:Atkinson Hyperlegible bold 9 +# font pango:FOT-UDKakugo_Large Pr6N semibold 10 +font pango:TX-02 bold 11 bar { status_command i3blocks -c ~/.config/sway/i3blocks.conf - font pango:MonaspiceNe NF, CommitMono Nerd Font, FontAwesome 9 + # font pango:MonaspiceNe NF, CommitMono Nerd Font, FontAwesome 9 + font pango:TX-02 bold 11 + # font pango:FOT-UDKakugo_Large Pr6N semibold 10 #mode hide colors { background $inactive diff --git a/private_dot_config/swhkd/executable_hotkeys.sh b/private_dot_config/swhkd/executable_hotkeys.sh deleted file mode 100644 index f8565fe..0000000 --- a/private_dot_config/swhkd/executable_hotkeys.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -x - -killall swhks -source ~/.envrc -SWHKDRC="${XDG_CONFIG_HOME:-$HOME/.config}/swhkd/swhkdrc" -swhks & pkexec swhkd -d -c $SWHKDRC diff --git a/private_dot_config/swhkd/swhkdrc b/private_dot_config/swhkd/swhkdrc deleted file mode 100644 index 0d01fd2..0000000 --- a/private_dot_config/swhkd/swhkdrc +++ /dev/null @@ -1,60 +0,0 @@ -# Browser -super + b - exec xdg-open http:// - -# Pipewire controls -XF86AudioRaiseVolume - exec pactl set-sink-volume @DEFAULT_SINK@ +5%;# increase sound volume -XF86AudioLowerVolume - exec pactl set-sink-volume @DEFAULT_SINK@ -5%; # decrease sound volume - -XF86AudioMute - exec pactl set-sink-mute @DEFAULT_SINK@ toggle # mute sound - -# Media player controls -XF86AudioPlay - exec playerctl play-pause -XF86AudioNext - exec playerctl next -XF86AudioPrev - exec playerctl previous - -# Sreen brightness controls -#sudo chmod +s $(which brightnessctl) -XF86MonBrightnessUp - exec brightnessctl -e s 5%+ -XF86MonBrightnessDown - exec brightnessctl -e s 5%- - -super + enter - exec kitty - -super + shift + e - exec rofi \ - exec -show p \ - exec -modi p:'rofi-power-menu --symbols-font "Symbols Nerd Font Mono"' \ - exec -theme lunar-witch - -super + space - exec rofi -combi-modi "drun#run" -show combi -show-icons -theme lunar-witch -super + tab - exec rofi -show window -show-icons -theme lunar-witch - -print - exec grim - | tee "$XDG_PICTURES_DIR/screenshots/$(date -Is).png" | wl-copy -t image/png - -shift + print - exec grim -g "$(slurp)" - | tee "$XDG_PICTURES_DIR/screenshots/$(date -Is).png" | wl-copy -t image/png - - -ctrl + print - exec TEMP=$(mktemp); grim -g "$(slurp)" $TEMP && notify-send "$TEMP" && flatpak run org.gimp.GIMP -- $TEMP - - -super + shift + v - exec cliphist list | rofi -dmenu -display-columns 2 -p "Select item to copy" -lines 10 -width 35 -theme lunar-witch | cliphist decode | wl-copy -# super + shift + v -# cb hs $(cb hs | jq '.[] | .content.path? // .content' | rofi -dmenu -format i -theme lunar-witch) - -super + shift + . - exec rofi -show emoji -modi emoji -theme lunar-witch | cb diff --git a/private_dot_config/systemd/user/default.target.wants/symlink_hotkeys.service b/private_dot_config/systemd/user/default.target.wants/symlink_hotkeys.service deleted file mode 100644 index 9cb1fb0..0000000 --- a/private_dot_config/systemd/user/default.target.wants/symlink_hotkeys.service +++ /dev/null @@ -1 +0,0 @@ -/home/mira/.config/systemd/user/hotkeys.service diff --git a/private_dot_config/systemd/user/default.target.wants/symlink_syncthing.service b/private_dot_config/systemd/user/default.target.wants/symlink_syncthing.service deleted file mode 100644 index 317222a..0000000 --- a/private_dot_config/systemd/user/default.target.wants/symlink_syncthing.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/user/syncthing.service