summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.bashrc9
-rw-r--r--.config/i3/config45
-rw-r--r--.config/nvim/init.vim6
-rwxr-xr-x.screenlayout/doublemonitor.layout.sh2
-rw-r--r--.screenlayout/xorg.conf27
-rw-r--r--.vimrc2
6 files changed, 83 insertions, 8 deletions
diff --git a/.bashrc b/.bashrc
index dc298f0..22178df 100644
--- a/.bashrc
+++ b/.bashrc
@@ -6,6 +6,15 @@ alias psiphon="psiphon-console-client"
alias cppreference="microsoft-edge-dev /usr/share/doc/cppreference/en/cpp.html"
alias nv=nvim
alias whatsapp=whatsie
+alias lan="bash zerotierconnect.sh"
+
+export c="/mnt/C"
+export d="/mnt/D"
+
+function swap() { mv "$1" "$1._tmp" && mv "$2" "$1" && mv "$1._tmp" "$2"; }
+
+function kboff() { xinput float 22; }
+function kbon() { xinput reattach 22 3; }
# dotfiles
alias config='/usr/bin/git --git-dir=$HOME/.cfg --work-tree=$HOME'
diff --git a/.config/i3/config b/.config/i3/config
index 453177b..1b65d9f 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -20,8 +20,9 @@ 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
+#set $refresh_i3status killall -SIGUSR1 xmobar
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +1% && $refresh_i3status
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -1% && $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
@@ -116,6 +117,9 @@ set $ws8 "8"
set $ws9 "9: code assisting"
set $ws10 "10: code editors"
+set $monitor_primary "eDP1"
+set $monitor_secondary "HDMI-1-0"
+
# switch to workspace
bindsym $mod+1 workspace number $ws1
bindsym $mod+2 workspace number $ws2
@@ -150,9 +154,25 @@ assign [class="QtCreator"] workspace $ws10
assign [class="tm"] workspace $ws5
assign [class="pr"] workspace $ws5
assign [class="pm"] workspace $ws5
-
#assign [class="GigaQt"] workspace $ws9
+
+#monitors
+workspace $ws1 output $monitor_primary
+workspace $ws2 output $monitor_secondary
+workspace $ws3 output $monitor_primary
+# workspace $ws4 output $monitor_primary
+workspace $ws5 output $monitor_primary
+workspace $ws6 output $monitor_secondary
+workspace $ws7 output $monitor_secondary
+workspace $ws8 output $monitor_secondary
+workspace $ws9 output $monitor_secondary
+workspace $ws10 output $monitor_primary
+
+# move workspaces
+bindsym $mod+Shift+less move workspace to output $monitor_secondary
+bindsym $mod+Shift+greater move workspace to output $monitor_primary
+
# reload the configuration file
bindsym $mod+Shift+c reload
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
@@ -188,8 +208,7 @@ mode "resize" {
bindsym $mod+r mode "default"
}
-set $ModeName "exit: [e]xit [Enter], [r]eboot, [s]hutdown, shudown [n]ow"
-# , restar[t]-i3"
+set $ModeName "[e]xit [Enter] | [r]eboot | [s]hutdown | shudown [n]ow | [h]ibernate"
mode $ModeName{
bindsym Return exec i3-msg exit
@@ -199,6 +218,7 @@ mode $ModeName{
bindsym n exec shutdown +0
# bindsym t exec "i3-msg exit && startx"
bindsym Escape mode "default"
+ bindsym h exec systemctl hibernate
}
# modes
@@ -209,6 +229,7 @@ bindsym $mod+Shift+e mode $ModeName
#Start i3bar to display a workspace bar (plus the system information i3status finds out, if available)
bar {
status_command i3status
+# status_command xmobar
position bottom
font pango:DejaVu Sans Mono 11
}
@@ -216,14 +237,24 @@ bar {
default_border pixel 3
# started upon launching
+
+# monito settings
+exec xrandr --setprovideroutputsource NVIDIA-G0 Intel
+exec ~/.screenlayout/doublemonitor.layout.sh
+
+#disable integrated keyboard input
+exec kboff
+#switch keyboard colors
+exec openrgb --color "00FFFF"
+
exec $terminal
exec $terminal
exec microsoft-edge-dev
#exec telegram-desktop
#exec discord
-exec qtcreator
+#exec qtcreator
#exec doublecmd
-exec_always feh --bg-fill ~/wallpaper/1f1e33.jpg
+exec_always feh --bg-fill ~/wallpaper/october2023.png
exec_always setxkbmap -layout us,ru -option grp:alt_shift_toggle
exec_always ~/.screenlayout/fullscreen.sh
exec_always xset r rate 333 25
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index cca2f5f..58fa1d6 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -17,10 +17,14 @@ Plug 'https://github.com/tpope/vim-commentary' " comment and uncomment
Plug 'https://github.com/rafi/awesome-vim-colorschemes' " themes, basically
Plug 'https://github.com/ryanoasis/vim-devicons' " icons for some plugins?????
Plug 'https://github.com/terryma/vim-multiple-cursors' " this is gonna be tough to learn...
-Plug 'ycm-core/YouCompleteMe' " autocompletion (REQUIRES PYTHON3 VENV)
+" Plug 'ycm-core/YouCompleteMe' " autocompletion (REQUIRES PYTHON3 VENV)
+Plug 'neoclide/coc.nvim', {'branch': 'release'} " Language-server
+
+cmap w!! w !sudo tee % > /dev/null
nnoremap <C-f> :NERDTreeFocus<CR>
+
call plug#end()
:colo evening
diff --git a/.screenlayout/doublemonitor.layout.sh b/.screenlayout/doublemonitor.layout.sh
new file mode 100755
index 0000000..371cba6
--- /dev/null
+++ b/.screenlayout/doublemonitor.layout.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+xrandr --output eDP1 --primary --mode 1920x1080 --pos 1360x0 --rotate normal --output DP1 --off --output DP2 --off --output HDMI1 --off --output HDMI2 --off --output VIRTUAL1 --off --output HDMI-1-0 --mode 1360x768 --pos 0x0 --rotate normal
diff --git a/.screenlayout/xorg.conf b/.screenlayout/xorg.conf
new file mode 100644
index 0000000..1ab5a8c
--- /dev/null
+++ b/.screenlayout/xorg.conf
@@ -0,0 +1,27 @@
+Section "ServerLayout"
+ Identifier "layout"
+ Screen 0 "intel"
+ Inactive "nvidia"
+EndSection
+
+Section "Device"
+ Identifier "nvidia"
+ Driver "nvidia"
+ BusID "PCI:1:0:0" # Sample: "PCI:1:0:0"
+EndSection
+
+Section "Screen"
+ Identifier "nvidia"
+ Device "nvidia"
+EndSection
+
+Section "Device"
+ Identifier "intel"
+ Driver "intel"
+ BusID "PCI:0:2:0" # Sample: "PCI:0:2:0"
+EndSection
+
+Section "Screen"
+ Identifier "intel"
+ Device "intel"
+EndSection
diff --git a/.vimrc b/.vimrc
new file mode 100644
index 0000000..a872499
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,2 @@
+" to write as sudo
+cmap w!! w !sudo tee % > /dev/null