new configs for new system

10 files changed, 34 insertions, 41 deletions

diff --git a/.bash_aliases b/.bash_aliases
index a430e1a..46e9dcd 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -9,11 +9,13 @@
 # Miscellaneous # 
 #################
 
+alias reboot='sudo reboot'
+alias poweroff='sudo poweroff'
 alias refresh='source ~/.bashrc'
 alias fuck='sudo $(history -p !!)'
 alias open='xdg-open'
 alias rsync='rsync -avh --progress'
-alias cwp='xwallpaper --maximize "$(/usr/bin/ls -1 -d /hdd/Pictures/wallpaper/* | shuf -n1)"'
+alias cwp='xwallpaper --maximize "$(/usr/bin/ls -1 -d /hdd/pics/wallpaper/* | shuf -n1)"'
 alias fd='fdfind'
 
 # Control Audio
@@ -29,9 +31,7 @@ alias setrmon-lowres='xrandr --auto --output DisplayPort-2 --mode 640x480 --left
 alias setrmon-midres='xrandr --auto --output DisplayPort-2 --mode 800x600 --left-of HDMI-A-0'
 alias setrmon-default='xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0'
 
-# Set Neofetch ASCII
-alias neofetch='neofetch --source ~/docs/ascii-art/lain-ascii.txt'
-alias cn='clear;neofetch'
+alias cn='clear;macchina'
 
 # Colorize grep output
 alias grep='grep --color=auto -i'
@@ -70,7 +70,7 @@ record() {
         -filter_complex amix=inputs=2 \
         -vcodec libx265 -s 1920x1080 \
         -acodec libvorbis -ab 128k \
-        $(xdg-user-dir VIDEOS)/$1.mkv
+        ~/vids/$1.mkv
 }
 
 #######
@@ -104,16 +104,14 @@ alias listin='apt list --installed'
 # yt-dlp #
 ##########
 
-alias ytvid='yt-dlp -o "/hdd/Videos/Archives/random/%(title)s.%(ext)s" --remux-video "mkv"'
-alias ytarchive='yt-dlp --write-description --write-info-json --write-thumbnail --write-sub \
-    -o "/hdd/Videos/Archives/%(uploader)s/%(upload_date)s - %(title)s/%(title)s.%(ext)s" --remux-video "mkv"'
+alias ytvid='yt-dlp -o "/hdd/vids/random/%(title)s.%(ext)s" --remux-video "mkv"'
+alias ytarchive='yt-dlp -o "/hdd/vids/archives/%(uploader)s/%(upload_date)s - %(title)s/%(title)s.%(ext)s" --remux-video "mkv"'
 
 # Function to specify filename, so I can avoid total chaos in my library
 ytmp3() {
     read -p "Enter filename: " name;
-    read -p "Enter link: " link;
-    yt-dlp -x --audio-format mp3 --download-archive "/hdd/Music/Archive_goodMusic.txt" \
-        --embed-metadata -o "/hdd/Music/Youtube Downloads/$name.%(ext)s" $link
+    yt-dlp -x --audio-format mp3 --download-archive "/hdd/music/Archive_goodMusic.txt" \
+        --embed-metadata -o "/hdd/music/Youtube Downloads/$name.%(ext)s" $1
 }
 
 ###########
@@ -127,4 +125,4 @@ alias flush-dns='sudo /etc/init.d/dns-clean start'
 #############
 
 alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine'
-alias emacs='emacsclient -c -a "emacs"'
+alias emacs='emacsclient -c --socket-name=/tmp/emacs1000/server'
diff --git a/.bash_profile b/.bash_profile
index 204fc3a..e65e24b 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -6,9 +6,9 @@ export PATH=$PATH:$ANDROID_HOME/tools/bin
 export PATH=$PATH:$ANDROID_HOME/platform-tools
 
 # Add various paths
-export PATH="$PATH:$HOME/.fzf/bin:$HOME/.rvm/bin"
+export PATH="$PATH:$HOME/.fzf/bin:$HOME/.cargo/bin"
 export _JAVA_AWT_WM_NONREPARENTING=1
 
 [[ -s "$HOME/.profile" ]] && source "$HOME/.profile" # Load the default .profile
 
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
+umask 0077
diff --git a/.bashrc b/.bashrc
index 41a4f9f..7da912f 100644
--- a/.bashrc
+++ b/.bashrc
@@ -100,7 +100,7 @@ export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 # NNN
 [ -f ~/.config/nnn/nnn.bash ] && source ~/.config/nnn/nnn.bash
 
-neofetch
+macchina
 
 export NVM_DIR=$HOME/.nvm
 
diff --git a/.config/compton/compton.conf b/.config/compton/compton.conf
deleted file mode 100644
index 77b6cb3..0000000
--- a/.config/compton/compton.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Opacity
-opacity-rule = [
-    "80:class_g = 'kitty' && focused",
-    "80:class_g = 'kitty' && !focused",
-    "80:class_g = 'st-256color' && focused",
-    "80:class_g = 'st-256color' && !focused"
-];
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index 60a12e6..60a12e6 100644..100755
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf
index 7207cc9..3a6a57d 100755
--- a/.config/mpd/mpd.conf
+++ b/.config/mpd/mpd.conf
@@ -1,7 +1,7 @@
 bind_to_address		"127.0.0.1"
 #bind_to_address "/run/mpd/socket"
 
-music_directory		"/hdd/Music"
+music_directory		"/hdd/music"
 playlist_directory	"~/.config/mpd/playlists"
 db_file			"~/.config/mpd/database"
 log_file		"~/.config/mpd/log"
@@ -10,9 +10,14 @@ state_file		"~/.config/mpd/mpdstate"
 
 audio_output {
 	type		"pulse"
-	name		"MPD"
-        device          "pulse"
-        mixer_type      "hardware"
+	name		"Headphone"
+	sink		"alsa_output.pci-0000_29_00.0.analog-stereo"
+}
+
+audio_output {
+	type		"pulse"
+	name		"Speakers"
+	sink		"alsa_output.pci-0000_31_00.4.analog-stereo"
 }
 
 audio_output {
diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf
index 1094ad7..e467c61 100644
--- a/.config/mpv/mpv.conf
+++ b/.config/mpv/mpv.conf
@@ -1,6 +1,6 @@
 profile=gpu-hq
-scale=ewa_lanczossharp
-cscale=ewa_lanczossharp
+#scale=ewa_lanczossharp
+#cscale=ewa_lanczossharp
 
 vo=gpu
 
diff --git a/.emacs.d/dracula-custom-theme.el b/.emacs.d/dracula-custom-theme.el
index 6f1d11b..ee96b4c 100644
--- a/.emacs.d/dracula-custom-theme.el
+++ b/.emacs.d/dracula-custom-theme.el
@@ -3,7 +3,6 @@
 
 (custom-theme-set-faces
  'dracula-custom
- '(default ((t (:family "Hack Nerd Font" :foundry "SRC" :width normal :height 113 :weight normal :slant normal :underline nil :overline nil :extend nil :strike-through nil :box nil :inverse-video nil :foreground "#F8F8F2" :background "#262626" :stipple nil :inherit nil))))
  '(cursor ((t (:background "#ccccc7"))))
  '(fixed-pitch ((t (:family "Monospace"))))
  '(variable-pitch ((((type w32)) (:foundry "outline" :family "Arial")) (t (:family "Sans Serif"))))
@@ -47,6 +46,7 @@
  '(lazy-highlight ((t (:foreground "#e2e2dc" :background "#373844"))))
  '(match ((t (:foreground "#282a36" :background "#f1fa8c"))))
  '(next-error ((t (:inherit (region)))))
- '(query-replace ((t (:inherit (isearch))))))
+ '(query-replace ((t (:inherit (isearch)))))
+ '(default ((t (:family "Hack Nerd Font" :foundry "SRC" :width normal :height 113 :weight normal :slant normal :underline nil :overline nil :extend nil :strike-through nil :box nil :inverse-video nil :foreground "#F8F8F2" :background "#262626" :stipple nil :inherit nil)))))
 
 (provide-theme 'dracula-custom)
diff --git a/.ncmpcpp/config b/.ncmpcpp/config
index 20def9f..763ee0a 100644
--- a/.ncmpcpp/config
+++ b/.ncmpcpp/config
@@ -4,7 +4,7 @@ lyrics_directory = ~/.ncmpcpp/lyrics
 
 mpd_host = localhost
 mpd_port = 6600
-mpd_music_dir = /hdd/Music
+mpd_music_dir = /hdd/music
 mpd_connection_timeout = 5
 
 # Playlist
diff --git a/.xinitrc b/.xinitrc
index 95e4222..7065cfb 100755..100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -11,18 +11,15 @@ if [ -f $HOME/.local/bin/statusbar ]; then
   . $HOME/.local/bin/statusbar
 fi
 
-export GTK_IM_MODULE='ibus'
-export QT_IM_MODULE='ibus'
-export XMODIFIERS='@im=ibus'
+# exec ck-launch-session dbus-launch --exit-with-session /usr/local/bin/dwm
 
-dbus-update-activation-environment \
-    --systemd DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY
-
-export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus
+# export GTK_IM_MODULE='ibus'
+# export QT_IM_MODULE='ibus'
+# export XMODIFIERS='@im=ibus'
 
 rfkill block all
 
-ibus-daemon -dxrR
+# ibus-daemon -dxrR
 
 xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary
 xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0
@@ -31,9 +28,9 @@ xset s off -dpms
 
 setxkbmap -option "ctrl:nocaps"
 
-xwallpaper --maximize "$(/usr/bin/ls -d -1 /hdd/Pictures/wallpaper/* | shuf -n1)" &
+xwallpaper --maximize "$(/usr/bin/ls -d -1 /hdd/pics/wallpaper/* | shuf -n1)" &
 
-compton --config $HOME/.config/compton/compton.conf -b
+picom --config $HOME/.config/picom/picom.conf -b
 
 exec dwm