diff --git a/README.md b/README.md index 3f6b6b1..f9a129d 100644 --- a/README.md +++ b/README.md @@ -111,5 +111,4 @@ i liked how primagen did his dev environment and deploying of scripts. so im mak ## todo - [ ] make symlink. where if -s. do symlink instead of env -- [ ] seperate installs into more scripts to have different steps in requirements. probably wont do this - [ ] make fully portable version, all pulled and compiled version bins for just devtools. diff --git a/env/.config/.profile b/env/.config/.profile index 1888597..ae08e42 100755 --- a/env/.config/.profile +++ b/env/.config/.profile @@ -65,7 +65,6 @@ alias fman="bash -c 'compgen -c' | fzf | xargs man" alias LC="fukn loadkeys ~/.config/swapscape.map" -alias music="nohup vlc ~/stuff/media/music > /dev/null 2> /dev/null < /dev/null & disown && cd ~/stuff/media/music && lfk" alias ibuss="ibus-daemon -rxRd" alias ygg="fukn bash -c 'mkdir /var/run/yggdrasil; yggdrasil -useconf < /etc/yggdrasil.conf'" alias obss="obs && obs --enable-media-stream & disown" diff --git a/env/.config/i3/config b/env/.config/i3/config new file mode 100644 index 0000000..f97affc --- /dev/null +++ b/env/.config/i3/config @@ -0,0 +1,209 @@ +# i3 config file (v4) +# +# Please see https://i3wm.org/docs/userguide.html for a complete reference! +# +# This config file uses keycodes (bindsym) and was written for the QWERTY +# layout. +# +# To get a config file with the same key positions, but for your current +# layout, use the i3-config-wizard +# + +# Font for window titles. Will also be used by the bar unless a different font +# is used in the bar {} block below. +font b612:monospace 8 + +# This font is widely installed, provides lots of unicode glyphs, right-to-left +# text rendering and scalability on retina/hidpi displays (thanks to pango). +#font pango:DejaVu Sans Mono 8 + +# Start XDG autostart .desktop files using dex. See also +# https://wiki.archlinux.org/index.php/XDG_Autostart +# exec --no-startup-id dex --autostart --environment i3 + +# The combination of xss-lock, nm-applet and pactl is a popular choice, so +# they are included here as an example. Modify as you see fit. + +# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the +# screen before suspend. Use loginctl lock-session to lock your screen. +# exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork + +# NetworkManager is the most popular way to manage wireless networks on Linux, +# and nm-applet is a desktop environment-independent system tray GUI for it. +# exec --no-startup-id nm-applet + +# Use pactl to adjust volume in PulseAudio. +set $refresh_i3status killall -SIGUSR1 i3status +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status +bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status +bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status + +# swap caps lock and escape +exec_always --no-startup-id xmodmap -e "clear lock" +exec_always --no-startup-id xmodmap -e "keycode 9 = Caps_Lock NoSymbol Caps_Lock" +exec_always --no-startup-id xmodmap -e "keycode 66 = Escape NoSymbol Escape" + +# use these keys for focus, movement, and resize directions when reaching for +# the arrows is not convenient +set $up k +set $down j +set $left h +set $right l + +set $mod Mod4 + +# use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod + +# move tiling windows via drag & drop by left-clicking into the title bar, +# or left-clicking anywhere into the window while holding the floating modifier. +tiling_drag modifier titlebar + +# start a terminal +bindsym $mod+Return exec wezterm + +# kill focused window +bindsym $mod+q kill + +# start dmenu (a program launcher) +bindsym $mod+d exec --no-startup-id "rofi -x11 -show drun" +# A more modern dmenu replacement is rofi: +# bindsym $mod+d exec "rofi -modi drun,run -show drun" +# There also is i3-dmenu-desktop which only displays applications shipping a +# .desktop file. It is a wrapper around dmenu, so you need that installed. +# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop + +# change focus +bindsym $mod+$left focus left +bindsym $mod+$down focus down +bindsym $mod+$up focus up +bindsym $mod+$right focus right + +# alternatively, you can use the cursor keys: +bindsym $mod+Left focus left +bindsym $mod+Down focus down +bindsym $mod+Up focus up +bindsym $mod+Right focus right + +# move focused window +bindsym $mod+Shift+$left move left +bindsym $mod+Shift+$down move down +bindsym $mod+Shift+$up move up +bindsym $mod+Shift+$right move right + +# alternatively, you can use the cursor keys: +bindsym $mod+Shift+Left move left +bindsym $mod+Shift+Down move down +bindsym $mod+Shift+Up move up +bindsym $mod+Shift+Right move right + +# split in horizontal orientation +bindsym $mod+Control+l split h + +# split in vertical orientation +bindsym $mod+Control+j split v + +# enter fullscreen mode for the focused container +bindsym $mod+f fullscreen toggle + +# change container layout (stacked, tabbed, toggle split) +bindsym $mod+s layout stacking +bindsym $mod+w layout tabbed +bindsym $mod+e layout toggle split + +# toggle tiling / floating +bindsym $mod+Shift+space floating toggle + +# change focus between tiling / floating windows +bindsym $mod+space focus mode_toggle + +# focus the parent container +bindsym $mod+a focus parent + +# focus the child container +#bindsym $mod+d focus child + +# move the currently focused window to the scratchpad +bindsym $mod+Shift+minus move scratchpad + +# Show the next scratchpad window or hide the focused scratchpad window. +# If there are multiple scratchpad windows, this command cycles through them. +bindsym $mod+minus scratchpad show + +# Define names for default workspaces for which we configure key bindings later on. +# We use variables to avoid repeating the names in multiple places. +set $ws1 "1" +set $ws2 "2" +set $ws3 "3" +set $ws4 "4" +set $ws5 "5" +set $ws6 "6" +set $ws7 "7" +set $ws8 "8" +set $ws9 "9" +set $ws10 "10" + +# switch to workspace +bindsym $mod+1 workspace number $ws1 +bindsym $mod+2 workspace number $ws2 +bindsym $mod+3 workspace number $ws3 +bindsym $mod+4 workspace number $ws4 +bindsym $mod+5 workspace number $ws5 +bindsym $mod+6 workspace number $ws6 +bindsym $mod+7 workspace number $ws7 +bindsym $mod+8 workspace number $ws8 +bindsym $mod+9 workspace number $ws9 +bindsym $mod+0 workspace number $ws10 + +# move focused container to workspace +bindsym $mod+Shift+1 move container to workspace number $ws1 +bindsym $mod+Shift+2 move container to workspace number $ws2 +bindsym $mod+Shift+3 move container to workspace number $ws3 +bindsym $mod+Shift+4 move container to workspace number $ws4 +bindsym $mod+Shift+5 move container to workspace number $ws5 +bindsym $mod+Shift+6 move container to workspace number $ws6 +bindsym $mod+Shift+7 move container to workspace number $ws7 +bindsym $mod+Shift+8 move container to workspace number $ws8 +bindsym $mod+Shift+9 move container to workspace number $ws9 +bindsym $mod+Shift+0 move container to workspace number $ws10 + +# reload the configuration file +bindsym $mod+Shift+c reload +# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) +bindsym $mod+Shift+r restart +# exit i3 (logs you out of your X session) +bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" + +# resize window (you can also use the mouse for that) +mode "resize" { + # These bindings trigger as soon as you enter the resize mode + + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + bindsym $left resize shrink width 10 px or 10 ppt + bindsym $down resize grow height 10 px or 10 ppt + bindsym $up resize shrink height 10 px or 10 ppt + bindsym $right resize grow width 10 px or 10 ppt + + # same bindings, but for the arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + + # back to normal: Enter or Escape or $mod+r + bindsym Return mode "default" + bindsym Escape mode "default" + bindsym $mod+r mode "default" +} + +bindsym $mod+r mode "resize" + +# Start i3bar to display a workspace bar (plus the system information i3status +# finds out, if available) +bar { + status_command i3status +} diff --git a/env/.config/nvim/after/plugin/telescope.lua b/env/.config/nvim/after/plugin/telescope.lua index 7a9d196..9d4488f 100755 --- a/env/.config/nvim/after/plugin/telescope.lua +++ b/env/.config/nvim/after/plugin/telescope.lua @@ -44,7 +44,16 @@ if ok then vim.keymap.set('n', 'ph', builtin.help_tags, {}) vim.keymap.set('n', 'pr', builtin.registers, {}) vim.keymap.set('n', 'ps', function() - builtin.grep_string({ search = vim.fn.input("Grep > ") }); + builtin.grep_string({ + search = vim.fn.input("Grep > "), + additional_args = function() + return { + "--hidden", + "--no-ignore", + "--glob", "!**/.git/*" + } + end + }) end) vim.keymap.set('n', 'pws', function() local word = vim.fn.expand("") diff --git a/env/.config/sway/config b/env/.config/sway/config index ab4329f..ab3f18b 100644 --- a/env/.config/sway/config +++ b/env/.config/sway/config @@ -192,6 +192,7 @@ mode "resize" { # Return to default mode bindsym Return mode "default" bindsym Escape mode "default" + bindsym $mod+r mode "default" } bindsym $mod+r mode "resize" # @@ -214,35 +215,23 @@ gaps inner 8 # Gajim for_window [title="Gajim"] \ - floating enable, \ border pixel, \ - move to workspace 11, \ - resize set 1200 800, \ - move position 700 0 + move to workspace 11 # Vesktop for_window [class="vesktop"] \ - floating enable, \ border none, \ - move to workspace 11, \ - resize set 1800 1000, \ - move position 0 0 + move to workspace 11 # discord for_window [app_id="discord"] \ - floating enable, \ border none, \ - move to workspace 11, \ - resize set 1500 900, \ - move position 0 0 + move to workspace 11 # Mumble for_window [title="Mumble"] \ - floating enable, \ border pixel, \ - move to workspace 11, \ - resize set 1000 800, \ - move position 900 230 + move to workspace 11 # Steam Friends List #for_window [title="Friends List"] \ diff --git a/env/.local/bin/scripts/backup/backup-tol2 b/env/.local/bin/scripts/backup/backup-tol2 index a3d044f..5727028 100755 --- a/env/.local/bin/scripts/backup/backup-tol2 +++ b/env/.local/bin/scripts/backup/backup-tol2 @@ -15,7 +15,7 @@ fsyncb () { fi } -syncfile=".surf/styles .urlview .local/bin/lf-gadgets .local/share/applications/custom .config/newsboat .config/zsh .keepass .config/Pinta .config/cmus stuff/notes stuff/openvpn-cons stuff/media/ICE stuff/scripts/iceys-linux-stuffs" +syncfile=".surf/styles .urlview .local/bin/lf-gadgets .local/share/applications/custom .config/newsboat .config/zsh .keepass .config/Pinta .config/cmus stuff/notes stuff/openvpn-cons stuff/media/ICE stuff/scripts/iceys-linux-stuffs .config/swapscape.map" # stuff/scripts .gnupg diff --git a/env/.local/bin/scripts/fzf-thumb b/env/.local/bin/scripts/fzf-thumb index a779b21..57f4025 100755 --- a/env/.local/bin/scripts/fzf-thumb +++ b/env/.local/bin/scripts/fzf-thumb @@ -18,7 +18,7 @@ cd "$view_dir" while :; do open_file=$(fzf --preview "$Preview_file {} $FZF_PREVIEW_LINES $FZF_PREVIEW_COLUMN") if [ "$open_file" ]; then - vlc "$open_file" & disown + mpv "$open_file" & disown else break fi diff --git a/env/.zshrc b/env/.zshrc index af978ae..bb3bc43 100755 --- a/env/.zshrc +++ b/env/.zshrc @@ -17,7 +17,7 @@ HISTSIZE=1000 SAVEHIST=1000 # End of lines configured by zsh-newuser-install -PS1='%B%F{white}[%B%F{magenta}%n%B%F{yellow}@%B%F{magenta}%M %B%F{cyan}%1~%B%F{white}]%B%F{default}$ ' +PS1='%B%F{white}[%B%F{magenta}%n%B%F{yellow}@%B%F{magenta}%M %B%F{cyan}%1~%B%F{white}]%B%F{default}∮ ' #PS1='%B%F{white}[%B%F{red}Z%B%F{magenta}ARCH %B%F{cyan}%1~%B%F{white}]%B%F{default}$ ' diff --git a/runs-all/get-reqs-arch/fun.sh b/runs-all/get-reqs-arch/fun.sh index fec9793..009992b 100755 --- a/runs-all/get-reqs-arch/fun.sh +++ b/runs-all/get-reqs-arch/fun.sh @@ -1 +1 @@ -$sudo pacman -S --noconfirm fastfetch cmus vlc cowsay openrgb steam +$sudo pacman -S --noconfirm fastfetch cmus vlc cowsay openrgb steam mpv mpv-mpris