Compare commits
1
Commits
main
..
c1dd9aed26
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c1dd9aed26 |
No files matched your search
+9
-12
@@ -16,7 +16,7 @@ export HISTFILESIZE=${history_size}
|
||||
# configure pagers
|
||||
export PAGER='less --use-color -R'
|
||||
|
||||
if $(command -v nvim &>/dev/null); then
|
||||
if $(which nvim &>/dev/null); then
|
||||
export MANPAGER='nvim +Man!'
|
||||
alias vim='nvim'
|
||||
fi
|
||||
@@ -31,16 +31,13 @@ fi
|
||||
#bind -r "\C-l"
|
||||
|
||||
# define aliases
|
||||
if ! $(command -v navigate &>/dev/null); then
|
||||
if ! $(which navigate &>/dev/null); then
|
||||
alias push='pushd'
|
||||
alias pop='popd'
|
||||
alias stack='dirs -v'
|
||||
fi
|
||||
|
||||
if $(command -v scan &>/dev/null); then
|
||||
alias list='scan -Alg --sort ext --permissions octal --time modified'
|
||||
alias tree='scan -Alg --sort ext --permissions octal --time modified -t'
|
||||
elif $(command -v eza &>/dev/null); then
|
||||
if $(which eza &>/dev/null); then
|
||||
alias list='eza -lao --no-permissions --group-directories-first \
|
||||
-s=ext --color=always --time-style long-iso'
|
||||
alias tree='eza -laoT --no-permissions --group-directories-first \
|
||||
@@ -50,7 +47,7 @@ else
|
||||
fi
|
||||
|
||||
# aliases related to `grep`
|
||||
if $(command -v ug &>/dev/null); then
|
||||
if $(which ug &>/dev/null); then
|
||||
alias ugi='ug -j'
|
||||
fi
|
||||
alias grep='grep --color=always'
|
||||
@@ -59,14 +56,14 @@ alias bdiff='diff -uw --color=always'
|
||||
|
||||
alias sbash='source ~/.bashrc'
|
||||
|
||||
if $(command -v ip &>/dev/null); then
|
||||
if $(which ip &>/dev/null); then
|
||||
alias ip='ip -c'
|
||||
fi
|
||||
|
||||
# because `libreWolf` is ambiguous for tab completion
|
||||
if $(command -v librewolf &>/dev/null); then
|
||||
if $(which librewolf &>/dev/null); then
|
||||
alias firefox='librewolf'
|
||||
elif $(command -v librewolf.appimage &>/dev/null); then
|
||||
elif $(which librewolf.appimage &>/dev/null); then
|
||||
alias firefox='librewolf.appimage'
|
||||
fi
|
||||
|
||||
@@ -74,7 +71,7 @@ fi
|
||||
## run script to setup default tmux session and then attach the session
|
||||
## attaching the session needs to be done from the calling shell, otherwise
|
||||
## the setup script will only terminate after detaching or killing the session
|
||||
if $(command -v tmux &>/dev/null); then
|
||||
if $(which tmux &>/dev/null); then
|
||||
alias dmux='bash default-tmux-session.sh && tmux attach'
|
||||
|
||||
alias tks='tmux kill-session'
|
||||
@@ -94,7 +91,7 @@ PS1='[\u@\h \W]\$ '
|
||||
export TERM="xterm-256color"
|
||||
|
||||
# setup `starship`
|
||||
if $(command -v starship &>/dev/null); then
|
||||
if $(which starship &>/dev/null); then
|
||||
eval "$(starship init bash)"
|
||||
fi
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[Desktop Entry]
|
||||
Name=firefox
|
||||
Comment=launch zegonix's browser of choice
|
||||
Exec=librewolf.appimage
|
||||
Comment=launch zegonix browser of choice
|
||||
Exec=bash start-browser.sh
|
||||
Type=Application
|
||||
Categories=Network;WebBrowser;
|
||||
@@ -16,7 +16,7 @@ background-opacity = 1.0
|
||||
selection-invert-fg-bg = true
|
||||
|
||||
window-decoration = server
|
||||
mouse-scroll-multiplier = precision:1.0,discrete:1
|
||||
mouse-scroll-multiplier = 0.8
|
||||
|
||||
app-notifications = no-clipboard-copy
|
||||
copy-on-select = false
|
||||
|
||||
@@ -22,4 +22,4 @@
|
||||
|
||||
oneline = log \
|
||||
-n 20 \
|
||||
--pretty='tformat:%C(yellow)%h %C(brightblue)%<(8,trunc)%an %C(blue)%as%C(auto)%d %C(reset)%s'
|
||||
--pretty='tformat:%C(yellow)%h %C(blue)%as%C(auto)%d %C(reset)%s'
|
||||
+30
-41
@@ -1,25 +1,20 @@
|
||||
# i3 configuration
|
||||
# This file has been auto-generated by i3-config-wizard(1).
|
||||
# It will not be overwritten, so edit it as you like.
|
||||
#
|
||||
# Should you change your keyboard layout some time, delete
|
||||
# this file and re-run i3-config-wizard(1).
|
||||
#
|
||||
|
||||
## [note]
|
||||
##
|
||||
## this configuration relies on Xresources for the monitor setup
|
||||
## edit '~/.Xresources' and add the following lines:
|
||||
##
|
||||
## ```
|
||||
## i3wm.main_display: <output>
|
||||
## i3wm.aux_display: <output>
|
||||
## # example:
|
||||
## # i3wm.main_display: DP-1
|
||||
## ```
|
||||
##
|
||||
## then execute `xrdb -merge ~/.Xresources`
|
||||
# i3 config file (v4)
|
||||
#
|
||||
# Please see https://i3wm.org/docs/userguide.html for a complete reference!
|
||||
|
||||
|
||||
set $alt Mod1
|
||||
set $super Mod4
|
||||
set $Alt Mod1
|
||||
set $Super Mod4
|
||||
set $mod Mod4
|
||||
|
||||
# variable definitions for workspaces
|
||||
# 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"
|
||||
@@ -31,7 +26,7 @@ set $ws8 "8"
|
||||
set $ws9 "9"
|
||||
set $ws10 "10"
|
||||
|
||||
# use modifier to manipulate floating windows with the mouse
|
||||
# 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,
|
||||
@@ -117,7 +112,7 @@ bindsym $mod+n split h
|
||||
bindsym $mod+v split v
|
||||
|
||||
# toggle window between tiling/floating
|
||||
bindsym $mod+$alt+Shift+f floating toggle
|
||||
bindsym $mod+$Alt+Shift+f floating toggle
|
||||
|
||||
# enter fullscreen mode for the focused container
|
||||
bindsym $mod+f fullscreen toggle
|
||||
@@ -149,22 +144,22 @@ bindsym $mod+Shift+0 move container to workspace number $ws10
|
||||
bindsym $mod+Shift+z move scratchpad
|
||||
|
||||
# move focused container and switch to workspace
|
||||
bindsym $mod+$alt+1 move container to workspace number $ws1; workspace number $ws1
|
||||
bindsym $mod+$alt+2 move container to workspace number $ws2; workspace number $ws2
|
||||
bindsym $mod+$alt+3 move container to workspace number $ws3; workspace number $ws3
|
||||
bindsym $mod+$alt+4 move container to workspace number $ws4; workspace number $ws4
|
||||
bindsym $mod+$alt+5 move container to workspace number $ws5; workspace number $ws5
|
||||
bindsym $mod+$alt+6 move container to workspace number $ws6; workspace number $ws6
|
||||
bindsym $mod+$alt+7 move container to workspace number $ws7; workspace number $ws7
|
||||
bindsym $mod+$alt+8 move container to workspace number $ws8; workspace number $ws8
|
||||
bindsym $mod+$alt+9 move container to workspace number $ws9; workspace number $ws9
|
||||
bindsym $mod+$alt+0 move container to workspace number $ws10; workspace number $ws10
|
||||
bindsym $mod+$Alt+1 move container to workspace number $ws1; workspace number $ws1
|
||||
bindsym $mod+$Alt+2 move container to workspace number $ws2; workspace number $ws2
|
||||
bindsym $mod+$Alt+3 move container to workspace number $ws3; workspace number $ws3
|
||||
bindsym $mod+$Alt+4 move container to workspace number $ws4; workspace number $ws4
|
||||
bindsym $mod+$Alt+5 move container to workspace number $ws5; workspace number $ws5
|
||||
bindsym $mod+$Alt+6 move container to workspace number $ws6; workspace number $ws6
|
||||
bindsym $mod+$Alt+7 move container to workspace number $ws7; workspace number $ws7
|
||||
bindsym $mod+$Alt+8 move container to workspace number $ws8; workspace number $ws8
|
||||
bindsym $mod+$Alt+9 move container to workspace number $ws9; workspace number $ws9
|
||||
bindsym $mod+$Alt+0 move container to workspace number $ws10; workspace number $ws10
|
||||
|
||||
# switch workspace
|
||||
bindsym $mod+Shift+Tab workspace prev
|
||||
bindsym $alt+Shift+Tab workspace prev
|
||||
bindsym $Alt+Shift+Tab workspace prev
|
||||
bindsym $mod+Tab workspace next
|
||||
bindsym $alt+Tab workspace next
|
||||
bindsym $Alt+Tab workspace next
|
||||
|
||||
# move focused workspace to output
|
||||
bindsym $mod+u move workspace to output left
|
||||
@@ -236,15 +231,9 @@ client.urgent $transp $background $text_focus $transp $transp
|
||||
client.placeholder $transp $background $text_focus $transp $transp
|
||||
client.background $background
|
||||
|
||||
exec i3-msg workspace number $ws1
|
||||
|
||||
|
||||
# window rules
|
||||
for_window [title="Slay.*" class="steam.*"] floating enable
|
||||
|
||||
# display workspace 1 on the main display at start
|
||||
set_from_resource $main_display i3wm.main_display DP-1
|
||||
set_from_resource $aux_display i3wm.aux_display DP-2
|
||||
|
||||
workspace $ws1 output $main_display
|
||||
workspace $ws2 output $aux_display
|
||||
|
||||
# select workspace 1 at startup
|
||||
exec i3-msg workspace number $ws1
|
||||
@@ -1,10 +0,0 @@
|
||||
|
||||
[Default Applications]
|
||||
text/html=firefox.desktop
|
||||
x-scheme-handler/http=firefox.desktop
|
||||
x-scheme-handler/https=firefox.desktop
|
||||
x-scheme-handler/about=firefox.desktop
|
||||
x-scheme-handler/unknown=firefox.desktop
|
||||
image/png=firefox.desktop
|
||||
image/jpeg=firefox.desktop
|
||||
image/gif=firefox.desktop
|
||||
@@ -1,6 +1,7 @@
|
||||
return {
|
||||
"nvim-telescope/telescope.nvim",
|
||||
event = "VimEnter",
|
||||
branch = "0.1.x",
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
{ -- If encountering errors, see telescope-fzf-native README for installation instructions
|
||||
|
||||
@@ -48,8 +48,8 @@ vim.keymap.set("n", "<leader>+", "<C-a>", opts) -- increment
|
||||
vim.keymap.set("n", "<leader>-", "<C-x>", opts) -- decrement
|
||||
|
||||
-- Window management
|
||||
vim.keymap.set("n", "<leader>h", "<C-w>v", opts) -- split window vertically
|
||||
vim.keymap.set("n", "<leader>v", "<C-w>s", opts) -- split window horizontally
|
||||
vim.keymap.set("n", "<leader>v", "<C-w>v", opts) -- split window vertically
|
||||
vim.keymap.set("n", "<leader>h", "<C-w>s", opts) -- split window horizontally
|
||||
vim.keymap.set("n", "<leader>se", "<C-w>=", opts) -- make split windows equal width & height
|
||||
|
||||
-- Navigate between splits
|
||||
|
||||
@@ -56,7 +56,7 @@ separator-foreground = ${colors.background}
|
||||
font-0 = "Jet Brains Mono Nerd Font:size=14:weight=Bold;2"
|
||||
|
||||
modules-left = xworkspaces xwindow
|
||||
modules-right = xkeyboard pulseaudio eth date
|
||||
modules-right = xkeyboard pulseaudio cpu eth date
|
||||
|
||||
cursor-click = pointer
|
||||
cursor-scroll = ns-resize
|
||||
@@ -162,6 +162,13 @@ format-prefix = "RAM "
|
||||
format-prefix-foreground = ${colors.primary}
|
||||
label = %percentage_used:2%%
|
||||
|
||||
[module/cpu]
|
||||
type = internal/cpu
|
||||
interval = 2
|
||||
format-prefix = " "
|
||||
format-prefix-foreground = ${colors.primary}
|
||||
label = %percentage:2%%
|
||||
|
||||
[network-base]
|
||||
type = internal/network
|
||||
interval = 5
|
||||
|
||||
Executable
+9
@@ -0,0 +1,9 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
if $(which librewolf &>/dev/null); then
|
||||
librewolf
|
||||
elif $(which librewolf.appimage); then
|
||||
librewolf.appimage
|
||||
else
|
||||
notify-send "[ERROR]" "Failed to start browser"
|
||||
fi
|
||||
Regular → Executable
File mode changed.
@@ -48,14 +48,14 @@ bind-key v split-pane -v -c "#{pane_current_path}"
|
||||
bind-key h split-pane -h -c "#{pane_current_path}"
|
||||
bind-key b break-pane
|
||||
unbind t
|
||||
bind-key t command-prompt -p "move pane to window:" "join-pane -t :'%%'"
|
||||
bind-key t command-prompt -p "move pane to window:" "join-pane -t '%%'"
|
||||
|
||||
bind-key -n M-1 select-layout even-horizontal
|
||||
bind-key -n M-2 select-layout even-vertical
|
||||
bind-key -n M-3 select-layout tiled
|
||||
|
||||
unbind x
|
||||
bind-key x kill-pane
|
||||
bind-key x kill-pane -t +0
|
||||
|
||||
# detach current session and close terminal
|
||||
bind-key k run "tmux detach -P"
|
||||
|
||||
@@ -22,7 +22,7 @@ set-option -g renumber-windows on
|
||||
set -g status-interval 5
|
||||
|
||||
# buffer size
|
||||
set-option -g history-limit 50000
|
||||
set-option -g history-limit 10000
|
||||
|
||||
# source keymaps
|
||||
source $HOME/.config/tmux/keymaps.conf
|
||||
|
||||
Reference in new issue
Block a user