6 Commits 5a34b7564e ... 3f04d19f0c

Author SHA1 Message Date
  Marius Schwarz 3f04d19f0c deleted old and unused scripts 1 year ago
  Marius Schwarz db10315be5 updated i3blocks scripts 1 year ago
  Marius Schwarz 2e7a3284fc Updated font/font-size for i3 and i3blocks 1 year ago
  Marius Schwarz 476f6a8334 Added quotes around 'cpwd' command 1 year ago
  Marius Schwarz 75665b564a Added new font in installation routine 1 year ago
  Marius Schwarz 157b64d3c4 Updated dots [zathurarc, kitty, vim] 1 year ago

+ 1 - 1
.bash_aliases

@@ -89,7 +89,7 @@ alias cdt='cd $HOME/documents/tools'
 alias cdv='cd $HOME/documents/vms/vagrant-vms'
 
 # copy the current path to clipboard
-alias cpwd='xclip -selection clipboard -i <(pwd | tr -d "\n")'
+alias cpwd='xclip -selection clipboard -i <(pwd | tr -d "\n" | sed "s/^/\"/;s/$/\"/")'
 
 # copy the last command issued to the clipboard
 alias clc='fc -ln -1 | tr -d "\n" | sed "s/^\s*//g" | xclip -selection clipboard -i'

+ 2 - 3
.config/i3/config

@@ -110,7 +110,7 @@ bindsym $mod+i exec rofimoji
 bindsym $mod+y exec $HOME/.scripts/tools/yt-viewer.sh
 
 # Locking the screen
-bindsym $win+l exec $HOME/.scripts/i3/lock.sh
+bindsym $win+l exec blurlock
 
 
 # Use Mouse+$mod to drag floating windows to their wanted position
@@ -273,8 +273,7 @@ bar {
         # default status string
         #i3bar_command i3bar
         status_command i3blocks -c ~/.config/i3blocks/i3blocks.conf
-        #status_command i3status -c $HOME/.config/i3status/i3status.conf
-        font pango:NotoSansMono Nerd Font 8
+        font pango:JetBrainsMono Nerd Font Mono 10
         modifier None
 	position top
         tray_output primary

+ 2 - 26
.config/i3blocks/i3blocks.conf

@@ -3,31 +3,13 @@ command=/usr/lib/i3blocks/$BLOCK_NAME
 separator_block_width=15
 markup=pango
 
-# Volume indicator
-#
-# The first parameter sets the step (and units to display)
-# The second parameter overrides the mixer selection
-# See the script for details.
-
 # Guess the weather hourly
-
-[vpn-2]
-label=# of Devices:
-command=echo -n " " & tailscale status --active | wc -l
-interval=60
-
-
 [weather]
 command=curl -Ss 'https://wttr.in/munich?0&T&Q' | cut -c 16- | head -2 | xargs echo
 interval=3600
 
-[pacman]
-label=📦
-command=$HOME/.scripts/i3/i3blocks/pacman-upgradable.sh
-interval=60
-
 [volume]
-label=🎵
+label=vol
 command=$HOME/.scripts/i3/i3blocks/i3volume.sh
 interval=2
 
@@ -44,15 +26,9 @@ label=cpu
 interval=5
 command=$HOME/.scripts/i3/i3blocks/i3cpu.sh
 
-[vpn]
-label=VPN:
-#color=#ff5733
-command=$HOME/.scripts/i3/i3blocks/tailscale.sh
-interval=60
-#
 # Network interface monitoring
 [ip]
-label=IP:
+label=ip
 color=#19c682
 interval=30
 separator=true

+ 53 - 0
.config/kitty/current-theme.conf

@@ -0,0 +1,53 @@
+## name: Rosé Pine Moon
+## author: mvllow
+## license: MIT
+## upstream: https://github.com/rose-pine/kitty/blob/main/dist/rose-pine-moon.conf
+## blurb: All natural pine, faux fur and a bit of soho vibes for the classy minimalist
+
+foreground               #e0def4
+background               #232136
+selection_foreground     #e0def4
+selection_background     #44415a
+
+cursor                   #56526e
+cursor_text_color        #e0def4
+
+url_color                #c4a7e7
+
+active_tab_foreground    #e0def4
+active_tab_background    #393552
+inactive_tab_foreground  #6e6a86
+inactive_tab_background  #232136
+
+# black
+color0   #393552
+color8   #6e6a86
+
+# red
+color1   #eb6f92
+color9   #eb6f92
+
+# green
+color2   #3e8fb0
+color10  #3e8fb0
+
+# yellow
+color3   #f6c177
+color11  #f6c177
+
+# blue
+color4   #9ccfd8
+color12  #9ccfd8
+
+# magenta
+color5   #c4a7e7
+color13  #c4a7e7
+
+# cyan
+color6   #ea9a97
+color14  #ea9a97
+
+# white
+color7   #e0def4
+color15  #e0def4
+

+ 10 - 0
.config/kitty/kitty.conf

@@ -0,0 +1,10 @@
+font_size 14.0
+font_family      JetBrainsMono Nerd Font Mono
+bold_font        JetBrainsMono Nerd Font Mono Extra Bold
+bold_italic_font JetBrainsMono Nerd Font Mono Extra Bold Italic
+
+
+# BEGIN_KITTY_THEME
+# Rosé Pine Moon
+include current-theme.conf
+# END_KITTY_THEME

+ 7 - 0
.config/kitty/kitty.conf.bak

@@ -0,0 +1,7 @@
+font_size 14.0
+
+
+# BEGIN_KITTY_THEME
+# Rosé Pine Dawn
+include current-theme.conf
+# END_KITTY_THEME

+ 2 - 1
.config/nvim/after/plugin/colors.lua

@@ -1,5 +1,6 @@
 function MuchoColores(color)
-	color = color or "rose-pine"
+	--color = color or "rose-pine"
+	color = color or "pywal"
 	vim.cmd.colorscheme(color)
 end
 

+ 6 - 4
.config/nvim/lua/msc/packer.lua

@@ -14,12 +14,14 @@ return require('packer').startup(function(use)
 
 	use({
 		'rose-pine/neovim',
-		as = 'rose-pine',
-		config = function()
-			vim.cmd('colorscheme rose-pine')
-		end
+		as = 'rose-pine'
 	})
 
+    use({ 
+        'AlphaTechnolog/pywal.nvim',
+        as = 'pywal'
+    })
+
 	-- Much better syntax and shit
 	use('nvim-treesitter/nvim-treesitter', {run= ':TSUpdate'})
 

+ 8 - 0
.config/zathura/zathurarc

@@ -0,0 +1,8 @@
+set selection-clipboard clipboard
+
+set font "JetBrainsMono Nerd Font Mono"
+
+set adjust-open "width"
+
+#set guioptions none
+set window-title-basename "true"

+ 0 - 13
.scripts/i3/battbar2.0

@@ -1,13 +0,0 @@
-bat=$(acpi battery | awk '{print $4}' | sed "s/%//")
-
-
-if [ $bat -gt 0 ] && [ $bat -lt 25 ]; then
-    echo 'yeah'
-elif [ $bat -gt 25 ] && [ $bat -lt 50 ]; then
-
-elif [ $bat -gt 50 ] && [ $bat -lt 75 ]; then
-
-elif [ $bat -gt 75 ] && [ $bat -lt 100 ]; then
-
-fi
-

+ 2 - 2
.scripts/i3/i3blocks/i3bat.sh

@@ -7,8 +7,8 @@ battery_count=${#output[@]}
 for line in "${output[@]}";
 do
     percentages+=($(echo "$line" | grep -o -m1 '[0-9]\{1,3\}%' | tr -d '%'))
-    statuses+=($(echo "$line" | egrep -o -m1 'Discharging|Charging|AC|Full|Unknown'))
-    remaining=$(echo "$line" | egrep -o -m1 '[0-9][0-9]:[0-9][0-9]')
+    statuses+=($(echo "$line" | grep -E -o -m1 'Discharging|Charging|AC|Full|Unknown'))
+    remaining=$(echo "$line" | grep -E -o -m1 '[0-9][0-9]:[0-9][0-9]')
     if [[ -n $remaining ]]; then
         remainings+=(" ($remaining)")
     else

+ 1 - 1
.scripts/i3/i3blocks/i3volume.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 case $BLOCK_BUTTON in
-    1) amixer -D pulse sset Master toggle; ;;
+    1) nohup pavucontrol & ;;
     2) ;;
 esac
 

+ 0 - 18
.scripts/i3/i3blocks/i3vpn.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-status=$(pvpn --status)
-
-public_ip=$(pvpn --status | awk -F: '/Public/ {print $2}')
-conn_status=$(pvpn --status | awk -F: '/ProtonVPN Status/ {print $2}')
-#server=$(pvpn --status | awk -F: '/Server Name/ {print $2}')
-
-if [ "$conn_status" = " Not Running" ] ; then
-    connected="<span color='#586E75'>{not connected}</span>"
-elif [ "$conn_status" = " Running" ] ; then
-    connected="<span color='#19c682'>{connected}</span> [$public_ip ]"
-else
-    connected="~"
-fi
-
-#printf "$connected\n"
-printf "$connected\n"

+ 0 - 10
.scripts/i3/i3blocks/tailscale.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if tailscale status | grep -q "stopped"
-then
-    echo "<span foreground='#ff5733'> stopped</span>"
-else
-    ip=$(tailscale ip -4)
-    echo "<span foreground='#19c682'> $ip</span>"
-fi
-

+ 0 - 3
.scripts/i3/i3blocks/todo.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-cat ~/projects/internal/notes/todo.md | grep '^* \[ \]' | cut -c 7-

BIN
.scripts/i3/lock.png


+ 0 - 4
.scripts/i3/lock.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-path=$HOME/.cache/wal/colors.hs
-color=`cat $path | grep background | grep -o "#......" | sed 's/#//g'`
-i3lock -c $color

+ 0 - 49
.scripts/tools/mkscreenshot.sh

@@ -1,49 +0,0 @@
-#!/bin/sh
-
-sspath="$HOME/pictures/screenshots"
-tmpss="/tmp/tmp_mkscreenshot.png"
-
-choice=$(printf "Select\nFull Screen\nActive Window" | dmenu -i)
-
-
-save_screenshot () {
-    # copy screenshot as image to clipboard (pasting in Telegram, ...)
-    xclip -t image/png -selection clipboard -i < "$tmpss"
-
-    name=$(echo '' | dmenu -p "Enter Name:")
-
-    if [ "$name" = "" ]; then
-        echo '[-] Aborting...'
-        exit 0
-    fi
-
-    mv "$tmpss" "$sspath/$name.png"
-    notify-send "screenshot has been saved in ~/pictures/screenshots"
-
-}
-
-# Choice between Full Screen, Active Window and Selection
-if [ "$choice" = "Select" ]
-then
-    notify-send "select an area for the screenshot"
-    scrot -s $tmpss
-    if [ $? -eq 0 ]; then
-        save_screenshot
-    fi
-elif [ "$choice" = "Full Screen" ]
-then
-    sleep 0.2s
-    scrot $tmpss
-    if [ $? -eq 0 ]; then
-        save_screenshot
-    fi
-elif [ "$choice" = "Active Window" ]
-then
-    scrot -u $tmpss
-    if [ $? -eq 0 ]; then
-        save_screenshot
-    fi
-fi
-
-
-

+ 2 - 2
.scripts/tools/theme-changer.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-WALLS=$HOME/pictures/wallpaper
+WALLS=$HOME/wallpaper
 
-theme=$(/usr/bin/ls $WALLS *.jpg | rofi -dmenu)
+theme=$(/usr/bin/ls $WALLS/.png | rofi -dmenu)
 
 wal -l -i $WALLS/$theme

+ 1 - 1
install.sh

@@ -7,7 +7,7 @@ read yesno
 if [[ "$yesno" == "y" ]]; then
     echo "[*] Installing most popular tools"
     # most important tools that are _always_ needed
-    sudo pacman -Sy fzf fd neovim ripgrep nmap hexyl ctags git podman ueberzug duf exa i3blocks udiskie alacritty rofi firefox python-pip vifm zathura zathura-pdf-mupdf sxiv feh xclip flameshot manjaro-pipewire pavucontrol rofimoji noto-fonts noto-fonts-emoji noto-fonts-extra light redshift zip unzip kitty
+    sudo pacman -Sy fzf fd neovim ripgrep nmap hexyl ctags git podman ueberzug duf exa i3blocks udiskie alacritty rofi firefox python-pip vifm zathura zathura-pdf-mupdf sxiv feh xclip flameshot manjaro-pipewire pavucontrol rofimoji noto-fonts noto-fonts-emoji noto-fonts-extra light redshift zip unzip kitty ttf-jetbrains-mono-nerd
 fi