diff options
30 files changed, 337 insertions, 156 deletions
diff --git a/.config/gtk-2.0/gtkfilechooser.ini b/.config/gtk-2.0/gtkfilechooser.ini index 37d2aa8..d085325 100644 --- a/.config/gtk-2.0/gtkfilechooser.ini +++ b/.config/gtk-2.0/gtkfilechooser.ini @@ -1,11 +1,11 @@ [Filechooser Settings] LocationMode=path-bar -ShowHidden=false +ShowHidden=true ShowSizeColumn=true -GeometryX=634 -GeometryY=359 -GeometryWidth=780 -GeometryHeight=585 +GeometryX=-1 +GeometryY=-1 +GeometryWidth=-1 +GeometryHeight=-1 SortColumn=name SortOrder=ascending StartupMode=recent diff --git a/.config/gtk-3.0/bookmarks b/.config/gtk-3.0/bookmarks index f5462c9..95061ed 100644 --- a/.config/gtk-3.0/bookmarks +++ b/.config/gtk-3.0/bookmarks @@ -1,3 +1,3 @@ -file:///home/freya/downloads file:///home/tylerm/code +file:///home/freya/downloads file:///home/tylerm/sync diff --git a/.config/hypr/config.d/autostart.sh b/.config/hypr/config.d/autostart.sh index 9b18715..b506e3d 100755 --- a/.config/hypr/config.d/autostart.sh +++ b/.config/hypr/config.d/autostart.sh @@ -1,21 +1,11 @@ #!/bin/bash -pipewire & &> ~/.log/pipewire -pipewire-pulse & &> ~/.log/pipewire-pulse -wireplumber & &> ~/.log/wireplumber - -/usr/lib/xdg-desktop-portal -r & -/usr/lib/xdg-desktop-portal-hyprland -r & - -waybar & - -mako & - -hyprpaper & +waybar --config $HOME/.config/waybar/config.hypr & nm-applet --indicator & /usr/bin/gnome-keyring-daemon --foreground & -discord --enable-features=UseOzonePlatform --ozone-platform=wayland & -element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland & +discord & +element-desktop & +thunderbird & diff --git a/.config/hypr/config.d/input.conf b/.config/hypr/config.d/input.conf index 947ae3d..32843aa 100644 --- a/.config/hypr/config.d/input.conf +++ b/.config/hypr/config.d/input.conf @@ -1,5 +1,5 @@ -monitor= eDP-1, 3072x1920, 0x0, $scale +monitor= eDP-1, 2560x1600, 0x0, $scale env = XCURSOR_SIZE, 24 diff --git a/.config/hypr/config.d/keybinds.conf b/.config/hypr/config.d/keybinds.conf index 3351e85..eaa625f 100644 --- a/.config/hypr/config.d/keybinds.conf +++ b/.config/hypr/config.d/keybinds.conf @@ -4,18 +4,13 @@ bind = $mod, W, exec, $browser bind = $mod SHIFT, SPACE, togglefloating bind = $mod, D, exec, $menu bind = $mod, J, togglesplit +bind = $mod SHIFT, C, togglegroup bind = $mod, F, fullscreen -bind = $mod, L, exec, killall wlogout || wlogout --css ~/scripts/power/style.css -l ~/scripts/power/layout -bind = $mod, P, exec, killall wlogout || wlogout --css ~/scripts/monitor/style.css -l ~/scripts/monitor/layout -b 2 -L 400 -R 400 -bind = $mod SHIFT, B, exec, killall waybar && waybar +bind = $mod SHIFT, B, exec, killall waybar && waybar --config ~/.config/waybar/config.hypr bind = $mod SHIFT, Q, killactive -bind = $mod SHIFT, W, exec, hyprpaper - -$monitor_sh = ~/scripts/monitor -bind = $mod ALT, right, exec, $monitor_sh right -bind = $mod ALT, left, exec, $monitor_sh left -bind = $mod ALT, up, exec, $monitor_sh mirror -bind = $mod ALT, down, exec, $monitor_sh disable +bind = $mod, L, exec, swaylock +bind = $mod SHIFT, L, exec, killall Hyprland +bind = $mod, TAB, changegroupactive binde =, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+ binde =, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- @@ -29,6 +24,7 @@ binde =, XF86AudioPlay, exec, playerctl play-pause binde =, XF86AudioNext, exec, playerctl next binde =, XF86AudioPrev, exec, playerctl previous -bind = ,Print, exec, grim -g "$(slurp)" - | wl-copy -bind = SHIFT, Print, exec, slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy -bind = CONTROL, Print, exec, +bind = $mod SHIFT, s, exec, grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Sway" "Screenshot copied to clipboard" +bind = , Print, exec, grim - | wl-copy -t iamge/png && notify-send -t 3000 "Hyprland" "Full screen copied to clipboard" +bind = , Shift Print, exec, slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy + diff --git a/.config/hypr/config.d/theme.conf b/.config/hypr/config.d/theme.conf index 90e23e8..22ff1bd 100644 --- a/.config/hypr/config.d/theme.conf +++ b/.config/hypr/config.d/theme.conf @@ -1,18 +1,31 @@ general { gaps_in = $radius gaps_out = $gaps - border_size = $border - col.active_border = rgba(aaaaaa90) - col.inactive_border = rgba(77777790) - col.group_border_active = rgba(aaaaaa90) - col.group_border = rgba(77777790) - + border_size = 0 + col.active_border = rgba(aaaaaa00) + col.inactive_border = rgba(77777700) layout = dwindle } -decoration { +group { + col.border_active = 0x14171d 0x14171d 360deg + col.border_inactive = 0x14171d 0x14171d 360deg + col.border_locked_active = rgb(14171d) rgb(14171d) 0deg + col.border_locked_inactive = rgb(14171d) rgb(14171d) 0deg + groupbar { + enabled = false + gradients = false + font_family = monospace + font_size = 14 + col.active = rgb(14171d) rgb(14171d) 0deg + col.inactive = rgb(14171d) rgb(14171d) 0deg + col.locked_active = rgb(14171d) rgb(14171d) 0deg + col.locked_inactive = rgb(14171d) rgb(14171d) 0deg + } +} - rounding = 5 +decoration { + rounding = 0 drop_shadow = yes shadow_range = 4 shadow_render_power = 3 @@ -22,19 +35,10 @@ decoration { animations { enabled = yes - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - - #animation = windows, 1, 7, myBezier - #animation = windowsOut, 1, 7, default, popin 80% + animation = windows, 1, 7, default + animation = windowsOut, 1, 7, default animation = border, 1, 10, default animation = borderangle, 1, 8, default animation = fade, 1, 7, default animation = workspaces, 1, 6, default } - -windowrule = float, ^(wlogout)$ -windowrule = move 12.5% 12.5%, ^(wlogout)$ -windowrule = size 75% 75%, ^(wlogout)$ -windowrule = noborder, ^(wlogout)$ -windowrule = noshadow, ^(wlogout)$ -windowrule = nofullscreenrequest, ^(wlogout)$ diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index c3542a7..b3611a7 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -1,5 +1,5 @@ -exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP GTK_THEME -exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY GTK_THEME XDG_CURRENT_DESKTOP=Hyprland +exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP GTK_THEME +exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY GTK_THEME XDG_CURRENT_DESKTOP=Hyprland $mod = SUPER @@ -15,8 +15,8 @@ $border = 3 $browser = librewolf -source = ~/.config/hypr/config.d/theme.conf source = ~/.config/hypr/config.d/keybinds.conf +source = ~/.config/hypr/config.d/theme.conf source = ~/.config/hypr/config.d/input.conf source = ~/.config/hypr/config.d/workspaces.conf diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 9926c22..299d17d 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -24,3 +24,5 @@ draw_minimal_borders yes confirm_os_window_close 0 enable_audio_bell no + +paste_actions no-op diff --git a/.config/mimeapps.list b/.config/mimeapps.list index af70863..b5ea897 100644 --- a/.config/mimeapps.list +++ b/.config/mimeapps.list @@ -34,6 +34,7 @@ text/x-c++=nvim.desktop application/x-zerosize=nvim.desktop application/x-shellscript=nvim.desktop x-scheme-handler/msteams=teams.desktop +x-scheme-handler/mspa=unofficial-homestuck-collection.desktop [Added Associations] application/x-zerosize=nvim.desktop; diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua index 56f1993..547c8dc 100644 --- a/.config/nvim/lua/lsp.lua +++ b/.config/nvim/lua/lsp.lua @@ -14,7 +14,7 @@ require('mason-lspconfig').setup({ 'yamlls', 'jdtls', 'bashls', - 'lua_ls' + 'lua_ls', }, handlers = { lsp.default_setup, @@ -69,12 +69,19 @@ require('lspconfig/prolog_lsp') lsp.configure('prolog_lsp', {force_setup = true}) lsp.setup() -require'lspconfig'.phpactor.setup{ - on_attach = on_attach, - init_options = { - ["language_server_phpstan.enabled"] = false, - ["language_server_psalm.enabled"] = false, - } +require('phpactor').setup { + install = { + branch = "master", + bin = "/home/freya/.local/bin/phpactor", + php_bin = "php", + composer_bin = "composer", + git_bin = "git", + check_on_startup = "none", + }, + lspconfig = { + enabled = true, + options = {}, + }, } vim.diagnostic.config({ @@ -83,4 +90,3 @@ vim.diagnostic.config({ require("neodev").setup() require("nvim-surround").setup() -require("toggleterm").setup() diff --git a/.config/nvim/lua/plugin.lua b/.config/nvim/lua/plugin.lua index 0aa0611..13fce87 100644 --- a/.config/nvim/lua/plugin.lua +++ b/.config/nvim/lua/plugin.lua @@ -37,5 +37,7 @@ Plug('goolord/alpha-nvim') Plug('Darazaki/indent-o-matic') Plug('iamcco/markdown-preview.nvim', {["do"] = "cd app && npx --yes yarn install"}) Plug('skywind3000/asyncrun.vim') +Plug('folke/todo-comments.nvim') +Plug('gbprod/phpactor.nvim') vim.call('plug#end') diff --git a/.config/nvim/lua/theme.lua b/.config/nvim/lua/theme.lua index cfcfb04..c0acb8f 100644 --- a/.config/nvim/lua/theme.lua +++ b/.config/nvim/lua/theme.lua @@ -40,6 +40,8 @@ require('lualine').setup { }, } +require('todo-comments').setup() + require('indent-o-matic').setup { max_lines = 2048, standard_widths = { 2, 4, 8 }, diff --git a/.config/nvim/lua/treesitter.lua b/.config/nvim/lua/treesitter.lua index b383d79..7b578d6 100644 --- a/.config/nvim/lua/treesitter.lua +++ b/.config/nvim/lua/treesitter.lua @@ -26,4 +26,7 @@ require('nvim-treesitter.configs').setup { end, additional_vim_regex_highlighting = false, }, + indent = { + enable = true + } } diff --git a/.config/nvim/lua/vimopt.lua b/.config/nvim/lua/vimopt.lua index 1114a66..d205926 100644 --- a/.config/nvim/lua/vimopt.lua +++ b/.config/nvim/lua/vimopt.lua @@ -20,3 +20,13 @@ vim.filetype.add({ ['.*%.php.m4'] = 'php', } }) + +vim.api.nvim_create_autocmd({ "BufWritePre" }, { + pattern = { "*" }, + command = [[%s/\s\+$//e]], +}) + +vim.api.nvim_create_autocmd({ "BufWritePost" }, { + pattern = { "*.md" }, + command = 'silent !pandoc % --output=/home/freya/.temp.pdf' +}) diff --git a/.config/nvim/nvim b/.config/nvim/nvim new file mode 120000 index 0000000..44e0dfc --- /dev/null +++ b/.config/nvim/nvim @@ -0,0 +1 @@ +nvim
\ No newline at end of file diff --git a/.config/ranger/rifle.conf b/.config/ranger/rifle.conf index c5ae654..ab9a0e9 100644 --- a/.config/ranger/rifle.conf +++ b/.config/ranger/rifle.conf @@ -2,7 +2,7 @@ # web ext x?html?, has librewolf, X, flag f = librewolf -- "$@" -ext x?html?, has firefox, X, flag f = firefox -- "$@" +ext x?html?, has firefox, X, flag f = firefox -- "$@" # editor mime ^text, label editor = ${VISUAL:-$EDITOR} -- "$@" diff --git a/.config/sway/config b/.config/sway/config index 36d1bcd..de658df 100755 --- a/.config/sway/config +++ b/.config/sway/config @@ -1,7 +1,3 @@ -# xdg desktop portal fix -exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP GTK_THEME -exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY GTK_THEME XDG_CURRENT_DESKTOP=sway - # Set super key set $mod Mod4 @@ -17,9 +13,12 @@ set $scale 1.25 # Set background set $bg ~/.config/desktop-common/wallpapers/blue.jpg +# Set lockscreen +set $lock swaylock + # Set Efects set $gaps 10 -set $radius 0 +set $radius 5 set $shadows on set $shadow_blur 15 set $blur enable @@ -29,8 +28,11 @@ set $blur_passes 3 # Set browser set $browser librewolf -# Autostart apps -exec $HOME/.config/sway/scripts.d/auto.sh +# System configs +include /etc/sway/config.d/* # Local configs include $HOME/.config/sway/config.d/* + +# Autostart apps +exec $HOME/.config/sway/scripts.d/auto.sh diff --git a/.config/sway/config.d/idle b/.config/sway/config.d/idle index fb13083..2b239fe 100644 --- a/.config/sway/config.d/idle +++ b/.config/sway/config.d/idle @@ -1,5 +1,5 @@ # Turn off display after tiemout exec swayidle -w \ - timeout 300 'swaylock -f -c 14171d' \ + timeout 300 'swaylock' \ timeout 300 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ - before-sleep 'swaylock -f -c 14171d' + before-sleep 'swaylock' diff --git a/.config/sway/config.d/keybinds b/.config/sway/config.d/keybinds index ba2609e..214be98 100644 --- a/.config/sway/config.d/keybinds +++ b/.config/sway/config.d/keybinds @@ -13,13 +13,10 @@ bindsym $mod+d exec $menu bindsym $mod+w exec $browser # Lock screen -bindsym $mod+Shift+l exec $lock +bindsym $mod+l exec $lock # Exit sway -bindsym Ctrl+Alt+Delete exec killall sway - -# Power menu -bindsym $mod+L exec killall wlogout || wlogout --css ~/.config/desktop-common/logout.d/power/style.css -l ~/.config/desktop-common/logout.d/power/layout +bindsym $mod+Shift+l exit # Drag floating windows by holding down $mod and left mouse button. # Resize them with right mouse button + $mod. @@ -49,12 +46,12 @@ bindsym XF86AudioNext exec playerctl next bindsym XF86AudioPrev exec playerctl previous # Screenshot -bindsym $mod+Shift+s exec grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Sway" "Screenshot copied to clipboard" +bindsym $mod+Shift+s exec grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Sway" "Screenshot copied to clipboard" bindsym Print exec grim - | wl-copy -t iamge/png && notify-send -t 3000 "Sway" "Full screen copied to clipboard" bindsym Shift+Print exec slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy # Michelsoft Binbows bindsym Ctrl+$mod+Shift+L exec $browser "https://linkedin.com" bindsym Ctrl+$mod+Shift+S exec $term -e sl -bindsym Ctrl+$mod+Shift+T exec electron25 "https://twitter.com" -bindsym Ctrl+$mod+Shift+M exec electron25 "https://www.tumblr.com" +bindsym Ctrl+$mod+Shift+T exec electron28 "https://twitter.com" +bindsym Ctrl+$mod+Shift+M exec electron28 "https://www.tumblr.com" diff --git a/.config/sway/config.d/scratch b/.config/sway/config.d/scratch index 0337319..bdafcf6 100644 --- a/.config/sway/config.d/scratch +++ b/.config/sway/config.d/scratch @@ -7,8 +7,12 @@ bindsym $mod+Shift+minus move scratchpad # If there are multiple scratchpad windows, this command cycles through them. bindsym $mod+minus scratchpad show +exec ~/.config/sway/scripts.d/scratchpads.sh + for_window [app_id="scratch_term"] move scratchpad, resize set 960 640 for_window [app_id="scratch_htop"] move scratchpad, resize set 960 640 +for_window [app_id="scratch_calc"] move scratchpad, resize set 960 640 bindsym $mod+y exec ~/.config/sway/scripts.d/scratchpads.sh scratch_term zsh bindsym $mod+h exec ~/.config/sway/scripts.d/scratchpads.sh scratch_htop htop +bindsym $mod+c exec ~/.config/sway/scripts.d/scratchpads.sh scratch_calc matrix diff --git a/.config/sway/scripts.d/auto.sh b/.config/sway/scripts.d/auto.sh index 4a4ebb7..4b2334e 100755 --- a/.config/sway/scripts.d/auto.sh +++ b/.config/sway/scripts.d/auto.sh @@ -5,3 +5,4 @@ autotiling & discord & element-desktop & thunderbird & +dino & diff --git a/.config/swaylock/config b/.config/swaylock/config new file mode 100644 index 0000000..9dd0202 --- /dev/null +++ b/.config/swaylock/config @@ -0,0 +1,41 @@ +screenshots +effect-blur=7x5 +indicator +clock +timestr=%H:%M +datestr=%Y-%m-%d +font=monospace +font-size=40 + +indicator-radius=75 +indicator-thickness=7 + +inside-color=14171dd8 +inside-clear-color=ada0a8d8 +inside-caps-lock-color=14171dd8 +inside-ver-color=97bd5ed8 +inside-wrong-color=cc5c5cd8 + +line-color=14171dff +line-clear-color=14171dff +line-caps-lock-color=14171dff +line-ver-color=14171dff +line-wrong-color=14171dff +separator-color=14171dff + +ring-color=4d4754d8 +ring-clear-color=4d4754d8 +ring-caps-lock-color=4d4754d8 +ring-ver-color=4d4754d8 +ring-wrong-color=4d4754d8 + +key-hl-color=82bfb3d8 +bs-hl-color=f0c767d8 +caps-lock-key-hl-color=82bfb3d8 +caps-lock-bs-hl-color=a97fb3d8 + +text-color=c7c6c3ff +text-clear-color=14171dff +text-caps-lock-color=14171dff +text-ver-color=14171dff +text-wrong-color=14171dff diff --git a/.config/waybar/config.hypr b/.config/waybar/config.hypr new file mode 100644 index 0000000..7d9cabb --- /dev/null +++ b/.config/waybar/config.hypr @@ -0,0 +1,82 @@ +{ + "height": 24, + "position": "top", + "layer": "top", + "spacing": 4, + "modules-left": [ + "hyprland/workspaces", + "hyprland/window" + ], + "modules-center": [], + "modules-right": [ + "cpu", + "memory", + "temperature", + "battery", + "backlight", + "wireplumber", + "network", + "clock", + "tray" + ], + "hyprland/workspaces": { + "disable-scroll": true, + "all-outputs": true, + "format": "{name}" + }, + "tray": { + "spacing": 10 + }, + "clock": { + "interval": 1, + "format": "{:%Y-%m-%d %a %H:%M:%S}" + }, + "cpu": { + "interval": 1, + "format": " {usage}%", + "tooltip": false + }, + "memory": { + "interval": 1, + "format": " {}%", + "tooltip": false + }, + "temperature": { + "interval": 1, + "thermal-zone": 0, + "critical-threshold": 80, + "format": " {temperatureC}°" + }, + "battery": { + "interval": 1, + "states": { + "warning": 30, + "critical": 15 + }, + "format": " {capacity}%", + "format-charging": " {capacity}%", + "format-plugged": " {capacity}%", + "format-full": " {capacity}%", + "format-warning": " {capacity}%", + "format-critical": " {capacity}%" + }, + "backlight": { + "format": " {percent}%" + }, + "wireplumber": { + "format": " {volume}%", + "format-bluetooth": " {volume}%", + "format-muted": " muted", + "scroll-step": 1, + "on-click": "pavucontrol", + "ignored-sinks": ["Easy Effects Sink"] + }, + "network": { + "format": " disconnected", + "format-wifi": " {essid}", + "format-ethernet": " {ipaddr}/{cidr}", + "format-disconnected": " disconnected", + "max-length": 50, + "on-click": "nm-connection-editor", + } +} diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 6deb5d7..0e61f84 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -31,9 +31,12 @@ button { border-radius: 0; } +.modules-left { + margin-left: -4px; +} + #workspaces button { all: initial; - margin: 1px 0px; padding: 0px 8px; color: #c7c6c3; background-color: rgba(0, 0, 0, 0); @@ -44,7 +47,8 @@ button { text-shadow: inherit; } -#workspaces button.focused { +#workspaces button.focused, +#workspaces button.active { background-color: #789ebf; color: #14171d; box-shadow: inherit; diff --git a/.local/bin/dotfiles b/.local/bin/dotfiles index d170056..c5c2ceb 100755 --- a/.local/bin/dotfiles +++ b/.local/bin/dotfiles @@ -11,6 +11,7 @@ $config add "$XDG_CONFIG_HOME/hypr" $config add "$XDG_CONFIG_HOME/mako" $config add "$XDG_CONFIG_HOME/nvim" $config add "$XDG_CONFIG_HOME/sway" +$config add "$XDG_CONFIG_HOME/swaylock" $config add "$XDG_CONFIG_HOME/waybar" $config add "$XDG_CONFIG_HOME/wofi" $config add "$XDG_CONFIG_HOME/desktop-common" diff --git a/.ssh/config b/.ssh/config index 5745621..8720845 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,15 +1,15 @@ -Match host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye" +Match Host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye" -host garchomp - hostname garchomp.freya.cat +Host garchomp + HostName garchomp.freya.cat user freya -host jolteon - hostname jolteon.freya.cat +Host jolteon + HostName jolteon.freya.cat user freya Host yveltal - HostName yveltal.freya.cat + HostName 10.2.0.8 User root Port 1111 @@ -19,27 +19,37 @@ Host yveltal.local Port 1111 Host yveltal.ospf - Hostname 10.1.1.1 + HostName 10.1.1.1 User root Port 22 Host yveltal.router - Hostname 10.1.3.1 + HostName 10.1.3.1 User root Port 22 Host yveltal.services - Hostname 10.1.3.129 + HostName 10.1.3.129 User root Port 22 Host yveltal.plex - Hostname 10.1.3.73 + HostName 10.1.3.73 User root Port 22 Host yveltal.minecraft - Hostname 10.1.3.13 + HostName 10.1.3.13 + User root + Port 22 + +Host tangela + HostName 10.1.4.200 + User root + Port 22 + +Host tangela.router + HostName 10.1.4.1 User root Port 22 @@ -48,8 +58,12 @@ Host stationery User freya Host redcom - Hostname fmurphy-dev.redcom.com + HostName fmurphy-dev.redcom.com User fmurphy +Host g.freya.cat + HostkeyAlgorithms +ssh-rsa + PubkeyAcceptedKeyTypes +ssh-rsa + Host * KexAlgorithms -sntrup761x25519-sha512@openssh.com @@ -11,14 +11,19 @@ export MOZ_ENABLE_WAYLAND=1 export MOZ_USE_XINPUT2=1 # xdg +export XDG_CURRENT_DESKTOP=sway export XDG_CONFIG_HOME=$HOME/.config export XDG_DATA_HOME=$HOME/.local/share +export XDG_DATA_DIRS=/usr/local/share:/usr/share +export XDG_DATA_DIRS=$XDG_DATA_DIRS:/var/lib/flatpak/exports/share +export XDG_DATA_DIRS=$XDG_DATA_DIRS:$HOME/.local/share/flatpak/exports/share +export PATH=$PATH:/home/freya/.cargo/bin +export PATH=$PATH:/var/lib/flatpak/exports/bin # ricing export GTK_THEME=Lavanda-Sea-Dark - -# Set terminal -export TERMINAL=alacritty +export TERMINAL=kitty +export MATRIX_HISTORY="/home/freya/.matrix_hist" if [ -n "$TMUX" ]; then return @@ -35,20 +40,22 @@ while true; do choice=$(dd bs=1 count=1 2> /dev/null) stty -raw echo case "$choice" in - "s") echo "Launching sway..." - exec sway &> $HOME/.log/sway + exec dbus-run-session sway &> $HOME/.log/sway ;; "h") echo "Launching Hyprland..." exec Hyprland &> $HOME/.log/Hyprland ;; "t") - exec cage -s kitty -- -o font_size=14 + exec cage -s kitty -- -o font_size=14 &> $HOME/.log/kitty ;; "e") exit ;; + "d") + break + ;; esac done @@ -16,6 +16,8 @@ fi PATH=$PATH:$HOME/.cargo/bin PATH=$PATH:$HOME/.local/bin +PATH=$PATH:$HOME/.symfony5/bin +PATH=$PATH:$HOME/.local/share/yabridge # vim mode >:) # no ryan i am not copying you @@ -36,6 +38,7 @@ alias diff="diff --color=auto" alias ccat="highlight --out-format=ansi" alias vim="nvim" alias show="kitten icat --align=left" +alias ssh="kitten ssh" # Have manpages use colors export LESS_TERMCAP_md=$'\e[1;36m' @@ -55,13 +58,7 @@ export GROFF_NO_SGR=1 ZSH_AUTOSUGGEST_STRATEGY=(completion history) } -ssh() { - if [ "$1" = "redcom" ]; then - /usr/bin/ssh $1 - else - TERM=alacritty /usr/bin/ssh $1 - fi -} +.reload # Enable zsh keybinds for home, end, and other movement keybinds bindkey "\e[1;5D" backward-word @@ -73,7 +70,7 @@ bindkey "\e[H" beginning-of-line bindkey "\e[F" end-of-line bindkey "\e\d" undo -.ranger() { +.ranger() { ranger --choosedir=$HOME/.rangerdir < $TTY LASTDIR=$(cat $HOME/.rangerdir) cd "$LASTDIR" @@ -91,4 +88,8 @@ export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) # ricing export PF_CUSTOM_LOGOS="/home/freya/.config/pfetch_logos" + +export WINEARCH=win32 +export WINEPREFIX=/home/freya/.wine + pfetch @@ -1,18 +1,25 @@ +android-sdk-platform-tools +android-studio autotiling +bento4 cider -cydia-impactor +gconf i686-elf-gcc +insomnia-bin librewolf-bin -lkrg-dkms +linphone-desktop-appimage mkinitcpio-firmware +pandoc-bin paru -pesterchum-git pfetch-rs prismlauncher-qt5-bin +psi-plus +python-eyed3 swayfx +swaylock-effects teams ttf-twemoji-color units unofficial-homestuck-collection-bin -vulkan-nouveau-git -wlogout +uwuify +vencord-installer-cli-bin @@ -1,83 +1,88 @@ acpi -alacritty alsa-tools alsa-utils amd-ucode +android-tools +ardour +atomicparsley base base-devel -bemenu bind blueberry bluez-utils brightnessctl btrfs-progs +caddy cage chromium +chrony clang cmake +composer cups cups-pdf discord -dmenu -dmidecode dnsmasq docker docker-compose -doxygen +dosfstools easyeffects efibootmgr element-desktop -evtest +enchant +farstream ffmpegthumbnailer figlet -firejail -fontforge +flatpak freealut -fuse2 +gajim gdb +gdu gimp git -glfw-x11 -glm gnome-keyring gnome-themes-extra gnu-netcat gradle -graphviz +greetd grim grub +gsound +gst-libav +gst-plugins-bad +gst-plugins-ugly highlight +hping htop hyprland +hyprlock hyprpaper imv -intellij-idea-community-edition -iwd +inetutils +jami-daemon +jami-qt jdk8-openjdk +jose jq kitty -krita less -lib32-libva-mesa-driver -lib32-mesa-vdpau +lib32-gst-plugins-base +lib32-gst-plugins-base-libs +lib32-gst-plugins-good lib32-vulkan-radeon -libhandy -libreoffice-fresh -libva-mesa-driver libvirt linux linux-firmware linux-headers -lutris +linux-lts +lvm2 lynx -macchanger mako man-db man-pages -mangohud maven -mesa-vdpau meson +moreutils mpv mtools nasm @@ -86,49 +91,49 @@ neovim network-manager-applet networkmanager networkmanager-openvpn +nftables +nmap nodejs noto-fonts-cjk npm -obs-studio octave openal opendoas openldap p7zip pacman-contrib -pandoc-cli pavucontrol -paxtest -perl-image-exiftool +php-fpm +picard pipewire-alsa pipewire-pulse polkit-gnome python-pip -python-pygments python-pynvim +python-yaml qbittorrent qemu-full qt5-wayland -racket ranger +reaper ripgrep rlwrap ruby rustup -sassc +samba sbctl sbsigntools sl slurp sof-firmware +sshfs starship -stb steam strace swaybg swayidle -swaylock -swi-prolog +syncthing +tcl tcpdump texlive-basic texlive-bibtexextra @@ -152,7 +157,6 @@ texlive-plaingeneric texlive-pstricks texlive-publishers texlive-xetex -thunar thunderbird tlp tmux @@ -164,29 +168,28 @@ ttf-fira-code ufw unzip valgrind -vim virt-manager -virt-viewer vulkan-radeon vulkan-tools vulkan-validation-layers waybar -waylock +weechat wget +whois wine-staging winetricks wireguard-tools wl-clipboard wl-mirror wofi -xdelta3 xdg-desktop-portal +xdg-desktop-portal-gtk xdg-desktop-portal-wlr -xf86-video-amdgpu xorg-xwayland -xwaylandvideobridge +yasm yt-dlp zathura zathura-pdf-mupdf +zip zsh zsh-syntax-highlighting |