From f0d8b522607f0b4c264d7b1387b16935c064ed05 Mon Sep 17 00:00:00 2001 From: Amazingca Date: Sun, 27 Sep 2026 01:31:27 -0600 Subject: [PATCH] Update to newest modifications :3 --- backup.nu | 7 ++--- config/alacritty/alacritty.toml | 9 ++++-- config/fish/config.fish | 17 +++++++---- config/i3status-rust/config.toml | 16 +++++------ config/nushell/config.nu | 48 -------------------------------- config/sway/config | 39 +++++++++++++++++--------- 6 files changed, 55 insertions(+), 81 deletions(-) delete mode 100644 config/nushell/config.nu diff --git a/backup.nu b/backup.nu index 05b60e3..cb3326b 100644 --- a/backup.nu +++ b/backup.nu @@ -1,10 +1,10 @@ cp -ur ~/.config/alacritty config cp -ur ~/.config/ashell config +cp -ur ~/.config/fish config cp -ur ~/.config/helix config cp -ur ~/.config/hypr config cp -ur ~/.config/i3status-rust config cp -ur ~/.config/ironbar config -cp -r ~/.config/nushell config cp -ur ~/.config/sway config cp -ur ~/.config/vicinae config cp -ur ~/.config/waybar config @@ -12,6 +12,5 @@ cp -ur ~/.config/waybar config cp -ur ~/.local/share/vicinae/themes local # Modify nushell files post-copy -open config/nushell/config.nu | str replace -r "\\$env.VPN_GATEWAY = \".*\"" "$$env.VPN_GATEWAY = \"\"" | save config/nushell/config.nu -f -rm config/nushell/env.nu -rm config/nushell/history.txt +open config/fish/config.fish | str replace -r "set VPN_GATEWAY .*" "set VPN_GATEWAY" | save config/fish/config.fish -f +rm config/fish/fish_variables diff --git a/config/alacritty/alacritty.toml b/config/alacritty/alacritty.toml index 844ee89..51adc72 100644 --- a/config/alacritty/alacritty.toml +++ b/config/alacritty/alacritty.toml @@ -2,5 +2,10 @@ normal = { family = "Maple Mono" } [window] -padding = { y = 10 } -dynamic_padding = true +# padding = { y = 10 } +# dynamic_padding = true + +[[keyboard.bindings]] +key = "Return" +mods = "Shift" +chars = "\u001B\r" diff --git a/config/fish/config.fish b/config/fish/config.fish index 9955dce..706cada 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -60,7 +60,7 @@ set --global fish_pager_color_progress brwhite --bold --background=cyan set --global fish_pager_color_selected_background --reverse function fish_greeting - printf "%s%s %s%s %s%s%s\n" (set_color purple) Hello (set_color green) (random choice "cutie" "sophont" "floret" "terran") (set_color purple) :3 (set_color --reset) + printf "%s%s %s%s %s%s%s\n" (set_color green) (random choice "Hello" "Good" "Hi there") (set_color purple) (random choice "cutie" "petal" "sophont" "floret" "terran") (set_color green) :3 (set_color --reset) end function fish_prompt --description 'Informative prompt' @@ -72,7 +72,13 @@ function fish_prompt --description 'Informative prompt' set -l statusb_color (set_color --bold $fish_color_status) set -l pipestatus_string (__fish_print_pipestatus "[" "]" "|" "$status_color" "$statusb_color" $last_pipestatus) - printf "%s%s@%s %s%s%s > " (set_color brmagenta) $USER (prompt_hostname) (set_color $fish_color_cwd) (prompt_pwd) (set_color --reset) + set -l vcs_string " " + + if test fish_vcs_prompt != "" + set vcs_string (printf " %s " (fish_vcs_prompt)) + end + + printf "%s%s@%s %s%s%s%s> " (set_color brmagenta) $USER (prompt_hostname) (set_color $fish_color_cwd) (prompt_pwd) (set_color --reset) (fish_vcs_prompt) end function fish_right_prompt @@ -84,12 +90,11 @@ set -gx EDITOR helix set -gx GPG_TTY (tty) set -gx WGPU_BACKEND vulkan +set -gx WLR_NO_HARDWARE_CURSORS 1 -set -gx LANG en_CA.UTF-8 - -fish_add_path ~/.cargo/bin ~/go/bin /opt/cuda/bin +fish_add_path ~/.cargo/bin ~/.local/bin ~/go/bin /opt/cuda/bin -set VPN_GATEWAY gateway.colostate.edu +set VPN_GATEWAY alias gp="sudo gpclient --fix-openssl connect $VPN_GATEWAY" alias virt="sudo /usr/bin/modprobe v4l2loopback exclusive_caps=1 card_label=OBS Virtual Camera" diff --git a/config/i3status-rust/config.toml b/config/i3status-rust/config.toml index 5f68ee8..7c95583 100644 --- a/config/i3status-rust/config.toml +++ b/config/i3status-rust/config.toml @@ -45,14 +45,14 @@ format_alt = " $icon $mem_total_used / $mem_total " [[block]] block = "temperature" -[[block]] -block = "battery" -info = 100 -warning = 20 -critical = 10 -[block.theme_overrides] -good_bg = "#664466" -good_fg = "#ffeeff" +# [[block]] +# block = "battery" +# info = 100 +# warning = 20 +# critical = 10 +# [block.theme_overrides] +# good_bg = "#664466" +# good_fg = "#ffeeff" [[block]] block = "time" diff --git a/config/nushell/config.nu b/config/nushell/config.nu deleted file mode 100644 index b4e10f6..0000000 --- a/config/nushell/config.nu +++ /dev/null @@ -1,48 +0,0 @@ -# config.nu -# -# Installed by: -# version = "0.110.0" -# -# This file is used to override default Nushell settings, define -# (or import) custom commands, or run any other startup tasks. -# See https://www.nushell.sh/book/configuration.html -# -# Nushell sets "sensible defaults" for most configuration settings, -# so your `config.nu` only needs to override these defaults if desired. -# -# You can open this file in your default editor using: -# config nu -# -# You can also pretty-print and page through the documentation for configuration -# options using: -# config nu --doc | nu-highlight | less -R -dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=cosmic - -$env.EDITOR = "helix" -$env.config.buffer_editor = $env.EDITOR - -$env.GPG_TTY = (tty) - -$env.WGPU_BACKEND = "gl" - -$env.LANG = "en_CA.UTF-8" - -$env.config.show_banner = false - -$env.path ++= ["~/.cargo/bin", "~/go/bin", "/opt/cuda/bin"] - -$env.PROMPT_INDICATOR = "$ " - -$env.PROMPT_COMMAND = { $"[(pwd | path basename)@(sys host | get hostname)]" } - -$env.config.table.mode = "psql" - -$env.VPN_GATEWAY = "" - -def gp [] { sudo gpclient --fix-openssl connect $env.VPN_GATEWAY } -def virt [] { sudo /usr/bin/modprobe v4l2loopback exclusive_caps=1 card_label=OBS Virtual Camera } -def c [] { cosmic-session } -def g [] { gnome-shell --wayland } -def h [] { dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=hyprland; start-hyprland } -def s [] { sway --unsupported-gpu } -def x [] { startxfce4 } diff --git a/config/sway/config b/config/sway/config index c14629b..b0dd510 100644 --- a/config/sway/config +++ b/config/sway/config @@ -11,9 +11,11 @@ set $mod Mod4 # Your preferred terminal emulator set $term alacritty # Your preferred application launcher -set $menu vicinae toggle +set $menu wofi --show drun -exec vicinae server +# Startup applications +# exec vicinae server +exec mako ### Output configuration # @@ -138,17 +140,28 @@ output * bg ~/.config/hypr/wallpapers/orion_nebula_nasa_heic0601a.jpg fill bindsym $mod+8 workspace number 8 bindsym $mod+9 workspace number 9 bindsym $mod+0 workspace number 10 - # Move focused container to workspace - bindsym $mod+Shift+1 move container to workspace number 1 - bindsym $mod+Shift+2 move container to workspace number 2 - bindsym $mod+Shift+3 move container to workspace number 3 - bindsym $mod+Shift+4 move container to workspace number 4 - bindsym $mod+Shift+5 move container to workspace number 5 - bindsym $mod+Shift+6 move container to workspace number 6 - bindsym $mod+Shift+7 move container to workspace number 7 - bindsym $mod+Shift+8 move container to workspace number 8 - bindsym $mod+Shift+9 move container to workspace number 9 - bindsym $mod+Shift+0 move container to workspace number 10 + # Move focused container to workspace and move to that workspace + bindsym Alt+Shift+1 move container to workspace number 1 + bindsym Alt+Shift+2 move container to workspace number 2 + bindsym Alt+Shift+3 move container to workspace number 3 + bindsym Alt+Shift+4 move container to workspace number 4 + bindsym Alt+Shift+5 move container to workspace number 5 + bindsym Alt+Shift+6 move container to workspace number 6 + bindsym Alt+Shift+7 move container to workspace number 7 + bindsym Alt+Shift+8 move container to workspace number 8 + bindsym Alt+Shift+9 move container to workspace number 9 + bindsym Alt+Shift+0 move container to workspace number 10 + # Move focused container to workspace and move to that workspace + bindsym $mod+Shift+1 move container to workspace number 1, workspace number 1 + bindsym $mod+Shift+2 move container to workspace number 2, workspace number 2 + bindsym $mod+Shift+3 move container to workspace number 3, workspace number 3 + bindsym $mod+Shift+4 move container to workspace number 4, workspace number 4 + bindsym $mod+Shift+5 move container to workspace number 5, workspace number 5 + bindsym $mod+Shift+6 move container to workspace number 6, workspace number 6 + bindsym $mod+Shift+7 move container to workspace number 7, workspace number 7 + bindsym $mod+Shift+8 move container to workspace number 8, workspace number 8 + bindsym $mod+Shift+9 move container to workspace number 9, workspace number 9 + bindsym $mod+Shift+0 move container to workspace number 10, workspace number 10 # Note: workspaces can have any name you want, not just numbers. # We just use 1-10 as the default. # -- 2.54.0