some changes

40 files changed, 64 insertions, 28 deletions

diff --git a/.config/.bashrc b/.config/.bashrc
index 5125b22..1105efe 100644
--- a/.config/.bashrc
+++ b/.config/.bashrc
@@ -11,6 +11,7 @@ EDITOR='vim'
 LOGDIR='~/log'
 
 alias log="${EDITOR} ${LOGDIR}/`date +%d_%m_%Y`"
+alias ls="ls --color"
 
 if command -v startx >/dev/null 2>&1 ; then
 	if [[ -z $DISPLAY ]] && [[ $(tty) = "/dev/tty1" ]]; then
diff --git a/.config/.runit/sv/mpd/log/supervise/lock b/.config/.runit/sv/mpd/log/supervise/lock
deleted file mode 100644
index e69de29..0000000
--- a/.config/.runit/sv/mpd/log/supervise/lock
+++ /dev/null
diff --git a/.config/.runit/sv/mpd/log/supervise/pid b/.config/.runit/sv/mpd/log/supervise/pid
deleted file mode 100644
index 3b2be15..0000000
--- a/.config/.runit/sv/mpd/log/supervise/pid
+++ /dev/null
@@ -1 +0,0 @@
-941
diff --git a/.config/.runit/sv/mpd/log/supervise/stat b/.config/.runit/sv/mpd/log/supervise/stat
deleted file mode 100644
index f5bdd21..0000000
--- a/.config/.runit/sv/mpd/log/supervise/stat
+++ /dev/null
@@ -1 +0,0 @@
-run
diff --git a/.config/.runit/sv/mpd/log/supervise/status b/.config/.runit/sv/mpd/log/supervise/status
deleted file mode 100644
index 0413d38..0000000
--- a/.config/.runit/sv/mpd/log/supervise/status
+++ /dev/null
diff --git a/.config/.runit/sv/mpd/supervise/lock b/.config/.runit/sv/mpd/supervise/lock
deleted file mode 100644
index e69de29..0000000
--- a/.config/.runit/sv/mpd/supervise/lock
+++ /dev/null
diff --git a/.config/.runit/sv/mpd/supervise/pid b/.config/.runit/sv/mpd/supervise/pid
deleted file mode 100644
index 34666ff..0000000
--- a/.config/.runit/sv/mpd/supervise/pid
+++ /dev/null
@@ -1 +0,0 @@
-942
diff --git a/.config/.runit/sv/mpd/supervise/stat b/.config/.runit/sv/mpd/supervise/stat
deleted file mode 100644
index f5bdd21..0000000
--- a/.config/.runit/sv/mpd/supervise/stat
+++ /dev/null
@@ -1 +0,0 @@
-run
diff --git a/.config/.runit/sv/mpd/supervise/status b/.config/.runit/sv/mpd/supervise/status
deleted file mode 100644
index c3e5969..0000000
--- a/.config/.runit/sv/mpd/supervise/status
+++ /dev/null
diff --git a/.config/.runit/sv/pipewire-pulse/log/supervise/lock b/.config/.runit/sv/pipewire-pulse/log/supervise/lock
deleted file mode 100644
index e69de29..0000000
--- a/.config/.runit/sv/pipewire-pulse/log/supervise/lock
+++ /dev/null
diff --git a/.config/.runit/sv/pipewire-pulse/log/supervise/pid b/.config/.runit/sv/pipewire-pulse/log/supervise/pid
deleted file mode 100644
index 6600080..0000000
--- a/.config/.runit/sv/pipewire-pulse/log/supervise/pid
+++ /dev/null
@@ -1 +0,0 @@
-934
diff --git a/.config/.runit/sv/pipewire-pulse/log/supervise/stat b/.config/.runit/sv/pipewire-pulse/log/supervise/stat
deleted file mode 100644
index f5bdd21..0000000
--- a/.config/.runit/sv/pipewire-pulse/log/supervise/stat
+++ /dev/null
@@ -1 +0,0 @@
-run
diff --git a/.config/.runit/sv/pipewire-pulse/log/supervise/status b/.config/.runit/sv/pipewire-pulse/log/supervise/status
deleted file mode 100644
index 3c0fefe..0000000
--- a/.config/.runit/sv/pipewire-pulse/log/supervise/status
+++ /dev/null
diff --git a/.config/.runit/sv/pipewire-pulse/supervise/lock b/.config/.runit/sv/pipewire-pulse/supervise/lock
deleted file mode 100644
index e69de29..0000000
--- a/.config/.runit/sv/pipewire-pulse/supervise/lock
+++ /dev/null
diff --git a/.config/.runit/sv/pipewire-pulse/supervise/pid b/.config/.runit/sv/pipewire-pulse/supervise/pid
deleted file mode 100644
index 10c7f0b..0000000
--- a/.config/.runit/sv/pipewire-pulse/supervise/pid
+++ /dev/null
@@ -1 +0,0 @@
-936
diff --git a/.config/.runit/sv/pipewire-pulse/supervise/stat b/.config/.runit/sv/pipewire-pulse/supervise/stat
deleted file mode 100644
index f5bdd21..0000000
--- a/.config/.runit/sv/pipewire-pulse/supervise/stat
+++ /dev/null
@@ -1 +0,0 @@
-run
diff --git a/.config/.runit/sv/pipewire-pulse/supervise/status b/.config/.runit/sv/pipewire-pulse/supervise/status
deleted file mode 100644
index 21a6451..0000000
--- a/.config/.runit/sv/pipewire-pulse/supervise/status
+++ /dev/null
diff --git a/.config/.runit/sv/pipewire/log/supervise/lock b/.config/.runit/sv/pipewire/log/supervise/lock
deleted file mode 100644
index e69de29..0000000
--- a/.config/.runit/sv/pipewire/log/supervise/lock
+++ /dev/null
diff --git a/.config/.runit/sv/pipewire/log/supervise/pid b/.config/.runit/sv/pipewire/log/supervise/pid
deleted file mode 100644
index a5356d9..0000000
--- a/.config/.runit/sv/pipewire/log/supervise/pid
+++ /dev/null
@@ -1 +0,0 @@
-935
diff --git a/.config/.runit/sv/pipewire/log/supervise/stat b/.config/.runit/sv/pipewire/log/supervise/stat
deleted file mode 100644
index f5bdd21..0000000
--- a/.config/.runit/sv/pipewire/log/supervise/stat
+++ /dev/null
@@ -1 +0,0 @@
-run
diff --git a/.config/.runit/sv/pipewire/log/supervise/status b/.config/.runit/sv/pipewire/log/supervise/status
deleted file mode 100644
index 7c58cab..0000000
--- a/.config/.runit/sv/pipewire/log/supervise/status
+++ /dev/null
diff --git a/.config/.runit/sv/pipewire/supervise/lock b/.config/.runit/sv/pipewire/supervise/lock
deleted file mode 100644
index e69de29..0000000
--- a/.config/.runit/sv/pipewire/supervise/lock
+++ /dev/null
diff --git a/.config/.runit/sv/pipewire/supervise/pid b/.config/.runit/sv/pipewire/supervise/pid
deleted file mode 100644
index df43bf4..0000000
--- a/.config/.runit/sv/pipewire/supervise/pid
+++ /dev/null
@@ -1 +0,0 @@
-937
diff --git a/.config/.runit/sv/pipewire/supervise/stat b/.config/.runit/sv/pipewire/supervise/stat
deleted file mode 100644
index f5bdd21..0000000
--- a/.config/.runit/sv/pipewire/supervise/stat
+++ /dev/null
@@ -1 +0,0 @@
-run
diff --git a/.config/.runit/sv/pipewire/supervise/status b/.config/.runit/sv/pipewire/supervise/status
deleted file mode 100644
index f3e5979..0000000
--- a/.config/.runit/sv/pipewire/supervise/status
+++ /dev/null
diff --git a/.config/.runit/sv/wireplumber/log/supervise/lock b/.config/.runit/sv/wireplumber/log/supervise/lock
deleted file mode 100644
index e69de29..0000000
--- a/.config/.runit/sv/wireplumber/log/supervise/lock
+++ /dev/null
diff --git a/.config/.runit/sv/wireplumber/log/supervise/pid b/.config/.runit/sv/wireplumber/log/supervise/pid
deleted file mode 100644
index b4f7160..0000000
--- a/.config/.runit/sv/wireplumber/log/supervise/pid
+++ /dev/null
@@ -1 +0,0 @@
-938
diff --git a/.config/.runit/sv/wireplumber/log/supervise/stat b/.config/.runit/sv/wireplumber/log/supervise/stat
deleted file mode 100644
index f5bdd21..0000000
--- a/.config/.runit/sv/wireplumber/log/supervise/stat
+++ /dev/null
@@ -1 +0,0 @@
-run
diff --git a/.config/.runit/sv/wireplumber/log/supervise/status b/.config/.runit/sv/wireplumber/log/supervise/status
deleted file mode 100644
index 1db6b52..0000000
--- a/.config/.runit/sv/wireplumber/log/supervise/status
+++ /dev/null
diff --git a/.config/.runit/sv/wireplumber/supervise/lock b/.config/.runit/sv/wireplumber/supervise/lock
deleted file mode 100644
index e69de29..0000000
--- a/.config/.runit/sv/wireplumber/supervise/lock
+++ /dev/null
diff --git a/.config/.runit/sv/wireplumber/supervise/pid b/.config/.runit/sv/wireplumber/supervise/pid
deleted file mode 100644
index 791a8be..0000000
--- a/.config/.runit/sv/wireplumber/supervise/pid
+++ /dev/null
@@ -1 +0,0 @@
-939
diff --git a/.config/.runit/sv/wireplumber/supervise/stat b/.config/.runit/sv/wireplumber/supervise/stat
deleted file mode 100644
index f5bdd21..0000000
--- a/.config/.runit/sv/wireplumber/supervise/stat
+++ /dev/null
@@ -1 +0,0 @@
-run
diff --git a/.config/.runit/sv/wireplumber/supervise/status b/.config/.runit/sv/wireplumber/supervise/status
deleted file mode 100644
index b24ee22..0000000
--- a/.config/.runit/sv/wireplumber/supervise/status
+++ /dev/null
diff --git a/.config/.vimrc b/.config/.vimrc
index a04badd..4914f6f 100644
--- a/.config/.vimrc
+++ b/.config/.vimrc
@@ -10,20 +10,32 @@ hi character    guifg=#dcade6
 hi number       guifg=#dcade6
 hi boolean      guifg=#dcade6
 hi float        guifg=#dcade6
+hi identifier   guifg=#5ac3fd
+hi statement    guifg=#3eade6
+hi type         guifg=#88cdf4 
+hi special      guifg=#5ac3fd
+hi preproc	guifg=#3eade6
 hi visual       guifg=#dcade6 guibg=#242829
 hi incsearch    guifg=#dcade6 guibg=#242829
-hi MatchParen   guifg=#dcade6 guibg=#242829
+hi matchparen   guifg=#dcade6 guibg=#242829
+hi quickfixline guifg=#242829 guibg=#3eade6
 
 "formatting
 set nowrap
-autocmd BufRead,BufNewFile *.c {
+autocmd BufRead,BufNewFile *.c,*.cpp {
 	set cindent
 	set cinoptions=:0,l1,t0,g0,(0
 }
 
+"autocmd BufRead,BufNewFile *.cpp {
+"	set tabstop=4
+"    set shiftwidth=4
+"	set expandtab
+"}
+
 "functional
 set clipboard+=unnamedplus
-set hlsearch
+set nohlsearch
 set incsearch
 
 "bindings
@@ -35,8 +47,7 @@ map <leader>s	:Sex<cr>
 map <leader>q	:q<cr>
 
 set makeprg=./build.sh
-map <leader>m	:make!<cr>:cope<cr>
+map <leader>m	:make!<cr>
+":cope<cr>
 map <leader>n	:cnext<cr>
-map <leader>f	:cfirst<cr>
-map <leader>o	:copen<cr>
 map <leader>g	:grep!<space>-rn<space><space>.<left><left>''<left>
diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml
new file mode 100644
index 0000000..bafbb7e
--- /dev/null
+++ b/.config/alacritty/alacritty.toml
@@ -0,0 +1,30 @@
+[window]
+padding = { x = 2, y = 2 }
+
+[font]
+normal = { family = "FantasqueSansM Nerd Font" }
+size = 11.0
+
+[colors.primary]
+background = '#242829'
+foreground = '#dcd7d7'
+
+[colors.normal]
+black   = '#282828'
+red     = '#cc241d'
+green   = '#98971a'
+yellow  = '#d79921'
+blue    = '#458588'
+magenta = '#b16286'
+cyan    = '#689d6a'
+white   = '#a89984'
+
+[colors.bright]
+black   = '#928374'
+red     = '#fb4934'
+green   = '#b8bb26'
+yellow  = '#fabd2f'
+blue    = '#83a598'
+magenta = '#d3869b'
+cyan    = '#8ec07c'
+white   = '#ebdbb2'
diff --git a/.config/mpd.conf b/.config/mpd.conf
index 073ab9d..ee1c90b 100644
--- a/.config/mpd.conf
+++ b/.config/mpd.conf
@@ -8,6 +8,6 @@ restore_paused		"yes"
 max_output_buffer_size	"16384"
 
 audio_output {
-	type	"pulse"
-	name	"Pulse device"
+	type	"pipewire"
+	name	"PipeWire Sound Server"
 }
diff --git a/scripts/mklinks b/scripts/mklinks
new file mode 100755
index 0000000..983614a
--- /dev/null
+++ b/scripts/mklinks
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+configdir='~/clone/dotfiles/.config'
+targets="alacritty .config"
+       	"from to"
+
+for target in $targets ; do
+	echo "ln -s $configdir/$target ~/.config"
+done
diff --git a/scripts/startdwmvoid b/scripts/startdwmvoid
index 3998f8e..de8f56c 100755
--- a/scripts/startdwmvoid
+++ b/scripts/startdwmvoid
@@ -1,7 +1,7 @@
 #!/bin/sh
 feh --bg-scale $HOME/pictures/wallpapers/vocaloid.png
-# pkill tmux
-# tmuxprojects
+pkill tmux
+tmuxprojects
 # xsreensaver &
 dwmbar &
 runsvdir ~/.runit/runsvdir &
diff --git a/scripts/tmuxprojects b/scripts/tmuxprojects
index 16f4815..f8c975c 100755
--- a/scripts/tmuxprojects
+++ b/scripts/tmuxprojects
@@ -4,6 +4,7 @@ dirs="
 $HOME
 $HOME/projects/dotfiles
 $HOME/projects/projecteuler
+$HOME/clone/opengl_learning
 "
 
 for dir in $dirs ; do
diff --git a/web b/web
index 42fd2c8..a7ec974 100644
--- a/web
+++ b/web
@@ -3,6 +3,6 @@ uneex.org
 simplevibe.ru
 projecteuler.net
 lainchan.org
-https://www.susanjfowler.com/blog/2016/8/13/so-you-want-to-learn-physics
 badplace.eu
-https://gutenberg.org/
+gutenberg.org
+cat-v.org