summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bash_aliases6
-rw-r--r--config/mpd/pid2
-rw-r--r--config/mpv/input.conf2
-rw-r--r--config/ncmpcpp/error.log1
-rw-r--r--config/picom/picom.conf2
-rw-r--r--config/rofi/config.rasi3
-rw-r--r--config/sxhkd/sxhkdrc9
-rw-r--r--config/vim/vimrc2
-rw-r--r--fonts/noto-cjk/NotoSansCJK-Regular.ttcbin19981104 -> 19484784 bytes
-rwxr-xr-xscripts/fzf_menu.sh3
-rwxr-xr-xscripts/start-mpd1
-rwxr-xr-xscripts/tablet9
-rw-r--r--xinitrc2
13 files changed, 30 insertions, 12 deletions
diff --git a/bash_aliases b/bash_aliases
index f13b239..50960ca 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -14,11 +14,10 @@ alias settabletscale="tablet 18 155 2 4:3"
alias gosumemory-default="sudo /home/david/.local/share/gosumemory/gosumemory -path /home/david/.local/share/osu-wine/OSU/Songs"
-alias yta="youtube-dl --no-mtime --add-metadata --write-thumbnail --no-check-certificate -x -f bestaudio/best"
+alias yta="youtube-dl --no-mtime --add-metadata --no-check-certificate -x -f bestaudio/best"
alias suspend="i3lock-fancy -p -t ''; systemctl suspend"
-alias nano="nvim"
alias vim="nvim"
#alias tablet2='tablet 18 156 2.4'
@@ -46,3 +45,6 @@ bitrate () {
mediainfo Aphrodite_-_Superman_\(dnb\).mp3 | grep 'Bit rate '
}
+
+alias syncdir="sudo rsync -rv --no-perms --no-owner --no-group --delete"
+alias chromium-tor="chromium --incognito --proxy-server=socks5://localhost:9050 --user-data-dir=/tmp"
diff --git a/config/mpd/pid b/config/mpd/pid
index c3a7dd3..75864bc 100644
--- a/config/mpd/pid
+++ b/config/mpd/pid
@@ -1 +1 @@
-2110694
+1086
diff --git a/config/mpv/input.conf b/config/mpv/input.conf
new file mode 100644
index 0000000..70c59f1
--- /dev/null
+++ b/config/mpv/input.conf
@@ -0,0 +1,2 @@
+r cycle_values video-rotate 90 180 270 0
+
diff --git a/config/ncmpcpp/error.log b/config/ncmpcpp/error.log
index 8df121b..95dca3f 100644
--- a/config/ncmpcpp/error.log
+++ b/config/ncmpcpp/error.log
@@ -43,3 +43,4 @@ TagLib: Could not open file /hd1/Music/Hardcore/HARDCORE SYNDROME 15/01. Srav3R
TagLib: Could not open file /hd1/Music/Hardcore/HARDCORE SYNDROME 15/12. USAO - Punish.mp3
TagLib: Could not open file /hd1/Music/Hardcore/HARDCORE SYNDROME 15/12. USAO - Punish.mp3
TagLib: Could not open file /hd1/Music/Hardcore/HARDCORE SYNDROME 15/12. USAO - Punish.mp3
+regexSearch: bad_expression: Unmatched [ or [^ in character class declaration. The error occurred while parsing the regular expression: '[B>>>HERE>>>'.
diff --git a/config/picom/picom.conf b/config/picom/picom.conf
index ec5392b..f2cfbca 100644
--- a/config/picom/picom.conf
+++ b/config/picom/picom.conf
@@ -253,7 +253,7 @@ opacity-rule = [
blur: {
# requires: https://github.com/ibhagwan/picom
- method = "kawase";
+ method = "none";
#method = "kernel";
strength = 0;
# deviation = 1.0;
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
index ddca6aa..315524e 100644
--- a/config/rofi/config.rasi
+++ b/config/rofi/config.rasi
@@ -55,7 +55,6 @@ configuration {
/* window-format: "{w} {c} {t}";*/
/* click-to-exit: true;*/
/* show-match: true;*/
- theme: "colors-rofi-dark";
/* color-normal: ;*/
/* color-urgent: ;*/
/* color-active: ;*/
@@ -150,3 +149,5 @@ configuration {
/* me-accept-entry: "MouseDPrimary";*/
/* me-accept-custom: "Control+MouseDPrimary";*/
}
+@theme "colors-rofi-dark"
+
diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc
index c88faab..ead4d16 100644
--- a/config/sxhkd/sxhkdrc
+++ b/config/sxhkd/sxhkdrc
@@ -75,8 +75,9 @@ super + shift + s
$HOME/.scripts/screenshot_fs
super + ctrl + s
$HOME/.scripts/screenshot_floating
+
# lock screen
-super + alt + l
+super + ctrl + l
$HOME/.scripts/lock
# power menu
@@ -144,9 +145,11 @@ super + alt + s
super + period
.scripts/calculator
-# web search
+# file search and open
super + slash
- ~/.scripts/websearch
+ bspc rule -a \* -o state=floating && $TERMINAL -e ~/.scripts/fzf_menu.sh
+shift + super + slash
+ bspc rule -a \* -o state=floating && $TERMINAL -e ~/.scripts/fzf_menu.sh
# Calendar
super + c
diff --git a/config/vim/vimrc b/config/vim/vimrc
index a684a96..a80b019 100644
--- a/config/vim/vimrc
+++ b/config/vim/vimrc
@@ -32,3 +32,5 @@ nnoremap <C-J> <C-W><C-J>
nnoremap <C-K> <C-W><C-K>
nnoremap <C-L> <C-W><C-L>
nnoremap <C-H> <C-W><C-H>
+
+nnoremap <F9> :w<Enter>:!"%:p"<Enter>
diff --git a/fonts/noto-cjk/NotoSansCJK-Regular.ttc b/fonts/noto-cjk/NotoSansCJK-Regular.ttc
index 31f1915..a2033d0 100644
--- a/fonts/noto-cjk/NotoSansCJK-Regular.ttc
+++ b/fonts/noto-cjk/NotoSansCJK-Regular.ttc
Binary files differ
diff --git a/scripts/fzf_menu.sh b/scripts/fzf_menu.sh
new file mode 100755
index 0000000..8f6238f
--- /dev/null
+++ b/scripts/fzf_menu.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+file=$(fzf $@)
+xdg-open $file &
diff --git a/scripts/start-mpd b/scripts/start-mpd
index 29e2791..aef21c2 100755
--- a/scripts/start-mpd
+++ b/scripts/start-mpd
@@ -1,3 +1,4 @@
#!/bin/sh
[ ! -s ~/.config/mpd/pid ] && mpd .config/mpd/mpd.conf
+[ -s ~/.config/mpd/pid ] && mpdscribble --conf .config/mpdscribble/mpdscribble.conf
[ -s ~/.config/mpd/pid ] && mpd-rpc --no-idle --fork
diff --git a/scripts/tablet b/scripts/tablet
index 6702ace..3b49064 100755
--- a/scripts/tablet
+++ b/scripts/tablet
@@ -9,9 +9,10 @@ tablet_ratio = (lambda s: float(s[0]) / float(s[1]))(sys.argv[4].split(":")) if
#Layout of screens: (x, y, w, h)
screens = [
- (0,0, 1080, 1920),
- (1080, 0, 2560, 1440),
- (3640, 208, 1280, 1024),
+ (3840, 0, 1080, 1920),
+ (1280, 0, 2560, 1440),
+ (4920, 0, 1080, 1920),
+ (0, 0, 1280, 1024),
]
#TODO find this with xrandr
@@ -24,7 +25,7 @@ offsety = target[1]
#Size of the full screen areas
sh = 1920
-sw = 1280 + 2560 + 1080
+sw = 1280 + 2560 + 1080 + 1080
#TODO calculate using list of screens
#Aspect ratio of the tablet, to avoid weird scaling problems
diff --git a/xinitrc b/xinitrc
index acf3072..0d5e974 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,3 +1,5 @@
xrdb ~/.Xdefaults
+eval $(gnome-keyring-daemon --start)
+export SSH_AUTH_SOCK
exec bspwm