diff --git a/private_dot_config/alacritty/alacritty.toml b/private_dot_config/alacritty/alacritty.toml deleted file mode 100644 index 4500d2d..0000000 --- a/private_dot_config/alacritty/alacritty.toml +++ /dev/null @@ -1,44 +0,0 @@ -[colors.bright] -black = "#2a2644" -blue = "#445f9b" -cyan = "#5bcefa" -green = "#98db95" -magenta = "#ee5e95" -red = "#f5a9b8" -white = "#bfbfc0" -yellow = "#ffe70a" - -[colors.cursor] -cursor = "CellForeground" -text = "CellBackground" - -[colors.footer_bar] -background = "#0B5393" -foreground = "#EBF6FF" - -[colors.normal] -black = "#1E1B30" -blue = "#334773" -cyan = "#2A98B1" -green = "#6FA47E" -magenta = "#a34a78" -red = "#A04558" -white = "#808082" -yellow = "#CCB700" - -[colors.primary] -background = "#010206" -bright_foreground = "#F0F2FF" -dim_foreground = "#BFBFC0" -foreground = "#EBF6FF" - -[font] -size = 10.0 - -[font.normal] -# family = "MonaspiceNe NF" -family = "Berkeley Mono" -style = "Regular" - -[window] -opacity = 0.9 diff --git a/private_dot_config/dunst/dunstrc b/private_dot_config/dunst/dunstrc index e2fd11a..12c691c 100644 --- a/private_dot_config/dunst/dunstrc +++ b/private_dot_config/dunst/dunstrc @@ -36,7 +36,7 @@ offset = 10x50 # Scale factor. It is auto-detected if value is 0. - scale = 0 + scale = 1.25 # Maximum number of notification (0 means no limit) notification_limit = 20 @@ -123,7 +123,7 @@ ### Text ### - font = Atkinson Hyperlegible, FontAwesome 10 + font = Atkinson Hyperlegible, FontAwesome 12 # The spacing between lines. If the height is smaller than the # font height, it will get raised to the font height. diff --git a/private_dot_config/external_nvim b/private_dot_config/external_nvim index ba85f27..d1313ec 160000 --- a/private_dot_config/external_nvim +++ b/private_dot_config/external_nvim @@ -1 +1 @@ -Subproject commit ba85f279ae5f90d9eb3c1ba250a6849e8365fe0d +Subproject commit d1313ec3626b148042706e656c6e58d5f86038f0 diff --git a/private_dot_config/git/executable_config.tmpl b/private_dot_config/git/executable_config.tmpl index dec82f5..0565e77 100644 --- a/private_dot_config/git/executable_config.tmpl +++ b/private_dot_config/git/executable_config.tmpl @@ -70,3 +70,10 @@ autoSetupRemote = true [alias] lg = log --graph --branches --oneline st = status + +[filter "lfs"] + process = git-lfs filter-process + required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + diff --git a/private_dot_config/kitty/colors.conf b/private_dot_config/kitty/colors.conf new file mode 100644 index 0000000..04e9808 --- /dev/null +++ b/private_dot_config/kitty/colors.conf @@ -0,0 +1,22 @@ +# Color theme: 3024 Night +# Auto-generated by Gogh (https://Gogh-Co.github.io/Gogh/) + +color0 #1e1b30 +color1 #a04558 +color2 #76AA73 +color3 #AD9D3D +color4 #334773 +color5 #A34A78 +color6 #2A97B1 +color7 #9A9AB8 +color8 #504573 +color9 #ED8096 +color10 #A0DC9B +color11 #C1B254 +color12 #445F9B +color13 #EE5E95 +color14 #5BCEFA +color15 #C1C7DB +background #010206 +foreground #EBF6FF +cursor #EBF6FF diff --git a/private_dot_config/kitty/kitty.conf b/private_dot_config/kitty/kitty.conf index b0efa2c..b0e365f 100644 --- a/private_dot_config/kitty/kitty.conf +++ b/private_dot_config/kitty/kitty.conf @@ -35,29 +35,11 @@ font_size 12.0 #: Font size (in pts) # force_ltr no -#: kitty does not support BIDI (bidirectional text), however, for RTL -#: scripts, words are automatically displayed in RTL. That is to say, -#: in an RTL script, the words "HELLO WORLD" display in kitty as -#: "WORLD HELLO", and if you try to select a substring of an RTL- -#: shaped string, you will get the character that would be there had -#: the the string been LTR. For example, assuming the Hebrew word -#: ירושלים, selecting the character that on the screen appears to be ם -#: actually writes into the selection buffer the character י. kitty's -#: default behavior is useful in conjunction with a filter to reverse -#: the word order, however, if you wish to manipulate RTL glyphs, it -#: can be very challenging to work with, so this option is provided to -#: turn it off. Furthermore, this option can be used with the command -#: line program GNU FriBidi -#: to get BIDI -#: support, because it will force kitty to always treat the text as -#: LTR, which FriBidi expects for terminals. - symbol_map U+002A ProFont IIx symbol_map U+0023 ProFont IIx symbol_map U+002F ProFont IIx symbol_map U+005C ProFont IIx -# symbol_map # https://github.com/ryanoasis/nerd-fonts/wiki/Glyph-Sets-and-Code-Points # symbol_map U+E5FA-U+E62B Symbols Nerd Font Mono # # Devicons @@ -98,16 +80,6 @@ symbol_map U+005C ProFont IIx # # Seti-UI + custom # symbol_map U+e5fa-U+e6b2 Symbols Nerd Font Mono -#: Map the specified Unicode codepoints to a particular font. Useful -#: if you need special rendering for some symbols, such as for -#: Powerline. Avoids the need for patched fonts. Each Unicode code -#: point is specified in the form `U+`. You -#: can specify multiple code points, separated by commas and ranges -#: separated by hyphens. This option can be specified multiple times. -#: The syntax is:: - -#: symbol_map codepoints Font Family Name - # narrow_symbols #: E.g. narrow_symbols U+E0A0-U+E0A3,U+E0C0-U+E0C7 1 @@ -1112,44 +1084,7 @@ selection_background none #: dull and bright version, for the first 16 colors. You can set the #: remaining 240 colors as color16 to color255. -color0 #2a2644 -color8 #3E3E65 -#: black - -color1 #A04558 -color9 #f5a9b8 - -#: red - -color2 #6FA47E -color10 #98db95 - -#: green - -color3 #CCB700 -color11 #FFE70A - -#: yellow - -color4 #334773 -color12 #445F9B - -#: blue - -color5 #A34A78 -color13 #EE5E95 - -#: magenta - -color6 #2A98B1 -color14 #5BCEFA - -#: cyan - -color7 #808082 -color15 #bfbfc0 - -#: white +include colors.conf # mark1_foreground black diff --git a/private_dot_config/nushell/scripts/starship.nu b/private_dot_config/nushell/scripts/starship.nu index 8b0d95a..6b95578 100644 --- a/private_dot_config/nushell/scripts/starship.nu +++ b/private_dot_config/nushell/scripts/starship.nu @@ -5,7 +5,7 @@ export-env { $env.STARSHIP_SHELL = "nu"; load-env { STARSHIP_SESSION_KEY: (random chars -l 16) PROMPT_MULTILINE_INDICATOR: ( - ^/home/akristip/.nix-profile/bin/starship prompt --continuation + ^starship prompt --continuation ) # Does not play well with default character module. @@ -15,7 +15,7 @@ export-env { $env.STARSHIP_SHELL = "nu"; load-env { PROMPT_COMMAND: {|| # jobs are not supported ( - ^/home/akristip/.nix-profile/bin/starship prompt + ^starship prompt --cmd-duration $env.CMD_DURATION_MS $"--status=($env.LAST_EXIT_CODE)" --terminal-width (term size).columns @@ -28,7 +28,7 @@ export-env { $env.STARSHIP_SHELL = "nu"; load-env { PROMPT_COMMAND_RIGHT: {|| ( - ^/home/akristip/.nix-profile/bin/starship prompt + ^starship prompt --right --cmd-duration $env.CMD_DURATION_MS $"--status=($env.LAST_EXIT_CODE)" diff --git a/private_dot_config/sway/config b/private_dot_config/sway/config index 9b5f911..3d3e642 100644 --- a/private_dot_config/sway/config +++ b/private_dot_config/sway/config @@ -33,7 +33,7 @@ set $ws27 "27" set $ws28 "28" set $ws29 "29" set $ws20 "20" - +exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec hash dbus-update-activation-environment 2>/dev/null && \ dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway include "keybinds" @@ -52,3 +52,4 @@ exec nm-tray exec_always wl-paste --watch cliphist store exec_always gnome-keyring-daemon -r exec ~/.config/swhkd/hotkeys.sh +exec udiskie diff --git a/private_dot_config/sway/i3blocks.conf b/private_dot_config/sway/i3blocks.conf index ba6d00c..cc55dfa 100644 --- a/private_dot_config/sway/i3blocks.conf +++ b/private_dot_config/sway/i3blocks.conf @@ -33,7 +33,7 @@ markup=none # The first parameter sets the step (and units to display) # The second parameter overrides the mixer selection # See the script for details. -[volume-pipewire] +[volume] interval=persist signal=1 AUDIO_HIGH_SYMBOL= @@ -78,33 +78,18 @@ interval=30 # If the instance is not specified, use the interface used for default route. # The address can be forced to IPv4 or IPv6 with -4 or -6 switches. [iface] -color=#98db95 +color=#A0DC9B interval=10 separator=false [wifi] interval=10 -COLOR_GE80=#98db95 -COLOR_GE60=#CCB700 -COLOR_GE40=#F4B766 -COLOR_LOWR=#A04558 +COLOR_GE80=#A0DC9B +COLOR_GE60=#C1B254 +COLOR_GE40=#EAA950 +COLOR_LOWR=#EE5E95 COLOR_DOWN=#A04558 -#[bandwidth] -#instance=eth0 -#interval=5 - -# CPU usage -# -# The script may be called with -w and -c switches to specify thresholds, -# see the script for details. -#[cpu_usage] -#label=CPU -#interval=10 -#min_width=CPU: 100.00% -#separator=false - - # Battery indicator # # The battery instance defaults to 0. @@ -113,20 +98,15 @@ label=󱊣 instance=1 interval=30 -#[battery2] -#label=⚡ -#markup=pango -#interval=30 - # Temperature # # Support multiple chips, though lm-sensors. # The script may be called with -w and -c switches to specify thresholds, # see the script for details. -[temperature] -label=🌡️ -interval=10 -SENSOR_CHIP='k10temp-pci-00c3' +# [temperature] +# label=🌡️ +# interval=10 +# SENSOR_CHIP='k10temp-pci-00c3' # Date Time # diff --git a/private_dot_config/sway/keybinds b/private_dot_config/sway/keybinds index 25cd4b7..db97761 100644 --- a/private_dot_config/sway/keybinds +++ b/private_dot_config/sway/keybinds @@ -1,5 +1,5 @@ # start a terminal -#bindsym $mod+Return exec i3-sensible-terminal +bindsym $mod+Shift+Return exec kitty # kill focused window bindsym $mod+Shift+q kill diff --git a/private_dot_config/swhkd/executable_hotkeys.sh b/private_dot_config/swhkd/executable_hotkeys.sh index ada783d..f8565fe 100644 --- a/private_dot_config/swhkd/executable_hotkeys.sh +++ b/private_dot_config/swhkd/executable_hotkeys.sh @@ -1,6 +1,7 @@ -#!/usr/bin/env bash +#!/usr/bin/env bash +set -x killall swhks -source ~/.env +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 index 26f54c9..f94734c 100644 --- a/private_dot_config/swhkd/swhkdrc +++ b/private_dot_config/swhkd/swhkdrc @@ -41,20 +41,20 @@ super + tab rofi -show window -show-icons -theme lunar-witch print - grim - | tee "$XDG_PICTURES_DIR/screenshots/$(date -Is).png" | wl-copy + grim - | tee "$XDG_PICTURES_DIR/screenshots/$(date -Is).png" | wl-copy -t image/png shift + print - grim -g "$(slurp)" - | tee "$XDG_PICTURES_DIR/screenshots/$(date -Is).png" | wl-copy + grim -g "$(slurp)" - | tee "$XDG_PICTURES_DIR/screenshots/$(date -Is).png" | wl-copy -t image/png ctrl + print TEMP=$(mktemp); grim -g "$(slurp)" $TEMP && notify-send "$TEMP" && flatpak run org.gimp.GIMP -- $TEMP -#super + shift + v -# cliphist list | rofi -dmenu -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) + 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 + . 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 new file mode 100644 index 0000000..9cb1fb0 --- /dev/null +++ b/private_dot_config/systemd/user/default.target.wants/symlink_hotkeys.service @@ -0,0 +1 @@ +/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 new file mode 100644 index 0000000..317222a --- /dev/null +++ b/private_dot_config/systemd/user/default.target.wants/symlink_syncthing.service @@ -0,0 +1 @@ +/usr/lib/systemd/user/syncthing.service diff --git a/private_dot_config/tmux/executable_tmux.conf b/private_dot_config/tmux/executable_tmux.conf index d1c9146..500885b 100644 --- a/private_dot_config/tmux/executable_tmux.conf +++ b/private_dot_config/tmux/executable_tmux.conf @@ -54,3 +54,4 @@ bind r source-file "$XDG_CONFIG_HOME/tmux.conf" # don't rename windows automatically set-option -g allow-rename off +set -g set-clipboard on diff --git a/private_dot_config/xdg-desktop-portal/portals.conf b/private_dot_config/xdg-desktop-portal/portals.conf new file mode 100644 index 0000000..80d1469 --- /dev/null +++ b/private_dot_config/xdg-desktop-portal/portals.conf @@ -0,0 +1,2 @@ +[preferred] +default=gtk diff --git a/private_dot_config/xdg-desktop-portal/sway-portals.conf b/private_dot_config/xdg-desktop-portal/sway-portals.conf index 5e28540..9372366 100644 --- a/private_dot_config/xdg-desktop-portal/sway-portals.conf +++ b/private_dot_config/xdg-desktop-portal/sway-portals.conf @@ -1,6 +1,6 @@ [preferred] # use xdg-desktop-portal-gtk for every portal interface -default=wlr # ;gtk +default=wlr;gtk # except for the xdg-desktop-portal-wlr supplied interfaces org.freedesktop.impl.portal.Screencast=wlr org.freedesktop.impl.portal.Screenshot=wlr