Merge branch 'main' of https://github.com/ivabus/ivabus-dotfiles

README.md

@@ -1,4 +1,4 @@
-# ivabus-dotfiles
+# My dotfiles
 
 Features:
 
@@ -25,10 +25,13 @@ curl iva.bz/d | sh
 
 Just run `upgrade_dotfiles` in your shell. Script will `git pull`, then relink old dotfiles, link new if needed and upgrade oh-my-zsh.
 
-# screenshot
+### Home-manager example
-#![screenshot-2022-12-08_18-08-29](https://user-images.githubusercontent.com/71599788/206481983-5dac2d62-5aea-4ccf-990a-b9ee6d53422f.png)
 
-[Repo Packages](https://ivabus.dev/pkgs), [AUR packages](https://ivabus.dev/aur).
+See [ivabus/nixos/common/dotfiles.nix](https://github.com/ivabus/nixos/blob/master/common/dotfiles.nix) for example
+
+# screenshot
+
+![screenshot-2024-01-06_10-36-35](https://github.com/ivabus/dotfiles/assets/71599788/07d6864e-6982-4137-b51e-e126235c0710)
 
 ## Environment
 

configs/.profile

@@ -7,4 +7,3 @@ export MOZ_DBUS_REMOTE=1
 export QT_QPA_PLATFORMTHEME=qt5ct
 export XDG_CURRENT_DESKTOP=Unity
 export HOMEBREW_NO_ENV_HINTS=false
-. "$HOME/.cargo/env"

configs/.zshrc

@@ -7,7 +7,7 @@ function reset_broken_terminal () {
     printf '%b' '\e[0m\e(B\e)0\017\e[?5l\e7\e[0;0r\e8'
 }
 
-export ZSH="$HOME/.dotfiles/zsh"
+export ZSH="$HOME/.config/zsh"
 
 # Setup history
 
@@ -52,9 +52,10 @@ alias ltcp="cp ~/.dotfiles/latex_template/{macros,preamble,template,letterfonts}
 alias jekyll_export="jekyll b -d ./_archive && cd _archive && tar cf ../site.tar ./ && cd .. && gzip -9 -f site.tar && rm -rf _archive"
 alias rebuild="sudo nixos-rebuild switch --flake path:/etc/nixos --impure"
 alias drebuild="darwin-rebuild switch --flake path:$HOME/my/nixos"
-alias activate_brew_x86_64="eval \"$(/usr/local/bin/brew shellenv)\""
 alias flushdnsx="sudo killall -HUP mDNSResponder"
-alias rsync_music="rsync Music/Music/Media.localized/Music server.local:~/Music/Media.localized/ -av"
+alias restart_audio="systemctl --user restart pipewire.service pipewire-pulse.service wireplumber.service"
+# 2340x2340 - max res for iPhone 13 mini
+alias start_airplay="uxplay -p -vs waylandsink -n $(hostname) -nh -fps 60 -s 2340x2340@60"
 
 # ffmpeg section
 

configs/alacritty/alacritty.toml

@@ -0,0 +1,105 @@
+[[colors.indexed_colors]]
+color = "#F5A97F"
+index = 16
+
+[[colors.indexed_colors]]
+color = "#F4DBD6"
+index = 17
+
+[colors.bright]
+black = "#5B6078"
+blue = "#8AADF4"
+cyan = "#8BD5CA"
+green = "#A6DA95"
+magenta = "#F5BDE6"
+red = "#ED8796"
+white = "#A5ADCB"
+yellow = "#EED49F"
+
+[colors.cursor]
+cursor = "#F4DBD6"
+text = "#24273A"
+
+[colors.dim]
+black = "#494D64"
+blue = "#8AADF4"
+cyan = "#8BD5CA"
+green = "#A6DA95"
+magenta = "#F5BDE6"
+red = "#ED8796"
+white = "#B8C0E0"
+yellow = "#EED49F"
+
+[colors.hints.end]
+background = "#A5ADCB"
+foreground = "#24273A"
+
+[colors.hints.start]
+background = "#EED49F"
+foreground = "#24273A"
+
+[colors.normal]
+black = "#494D64"
+blue = "#8AADF4"
+cyan = "#8BD5CA"
+green = "#A6DA95"
+magenta = "#F5BDE6"
+red = "#ED8796"
+white = "#B8C0E0"
+yellow = "#EED49F"
+
+[colors.primary]
+background = "#24273A"
+bright_foreground = "#CAD3F5"
+dim_foreground = "#CAD3F5"
+foreground = "#CAD3F5"
+
+[colors.search.focused_match]
+background = "#A6DA95"
+foreground = "#24273A"
+
+[colors.search.matches]
+background = "#A5ADCB"
+foreground = "#24273A"
+
+[colors.selection]
+background = "#F4DBD6"
+text = "#24273A"
+
+[colors.vi_mode_cursor]
+cursor = "#B7BDF8"
+text = "#24273A"
+
+[cursor]
+blinking = "on"
+shape = "Block"
+
+[font]
+size = 9.0
+
+[font.bold]
+family = "JetBrains Mono NL"
+style = "ExtraBold"
+
+[font.italic]
+family = "JetBrains Mono NL"
+style = "Italic"
+
+[font.normal]
+family = "JetBrains Mono NL"
+style = "SemiBold"
+
+[scrolling]
+history = 100000
+multiplier = 3
+
+[window]
+opacity = 1
+
+[window.dimensions]
+columns = 80
+lines = 25
+
+[window.padding]
+x = 5
+y = 5

configs/alacritty/alacritty.yml

@@ -1,110 +0,0 @@
-window:
-  dimensions:
-    columns: 80
-    lines: 25
-  padding:
-    x: 5
-    y: 5
-  opacity: 1
-scrolling:
-  history: 100000
-  multiplier: 3
-
-font:
-  normal:
-    family: JetBrains Mono NL
-    style: SemiBold
-
-  bold:
-    family: JetBrains Mono NL
-    style: ExtraBold
-
-  italic:
-    family: JetBrains Mono NL
-    style: Italic
-  size: 9.0
-
-cursor:
-  shape: Block
-  blinking: on
-
-colors:
-    # Default colors
-    primary:
-        background: "#24273A" # base
-        foreground: "#CAD3F5" # text
-        # Bright and dim foreground colors
-        dim_foreground: "#CAD3F5" # text
-        bright_foreground: "#CAD3F5" # text
-
-    # Cursor colors
-    cursor:
-        text: "#24273A" # base
-        cursor: "#F4DBD6" # rosewater
-    vi_mode_cursor:
-        text: "#24273A" # base
-        cursor: "#B7BDF8" # lavender
-
-    # Search colors
-    search:
-        matches:
-            foreground: "#24273A" # base
-            background: "#A5ADCB" # subtext0
-        focused_match:
-            foreground: "#24273A" # base
-            background: "#A6DA95" # green
-        footer_bar:
-            foreground: "#24273A" # base
-            background: "#A5ADCB" # subtext0
-
-    # Keyboard regex hints
-    hints:
-        start:
-            foreground: "#24273A" # base
-            background: "#EED49F" # yellow
-        end:
-            foreground: "#24273A" # base
-            background: "#A5ADCB" # subtext0
-
-    # Selection colors
-    selection:
-        text: "#24273A" # base
-        background: "#F4DBD6" # rosewater
-
-    # Normal colors
-    normal:
-        black: "#494D64" # surface1
-        red: "#ED8796" # red
-        green: "#A6DA95" # green
-        yellow: "#EED49F" # yellow
-        blue: "#8AADF4" # blue
-        magenta: "#F5BDE6" # pink
-        cyan: "#8BD5CA" # teal
-        white: "#B8C0E0" # subtext1
-
-    # Bright colors
-    bright:
-        black: "#5B6078" # surface2
-        red: "#ED8796" # red
-        green: "#A6DA95" # green
-        yellow: "#EED49F" # yellow
-        blue: "#8AADF4" # blue
-        magenta: "#F5BDE6" # pink
-        cyan: "#8BD5CA" # teal
-        white: "#A5ADCB" # subtext0
-
-    # Dim colors
-    dim:
-        black: "#494D64" # surface1
-        red: "#ED8796" # red
-        green: "#A6DA95" # green
-        yellow: "#EED49F" # yellow
-        blue: "#8AADF4" # blue
-        magenta: "#F5BDE6" # pink
-        cyan: "#8BD5CA" # teal
-        white: "#B8C0E0" # subtext1
-
-    indexed_colors:
-        - { index: 16, color: "#F5A97F" }
-        - { index: 17, color: "#F4DBD6" }
-

configs/sway/.profile

@@ -1,13 +0,0 @@
-. "$HOME/.cargo/env"
-export QT_QPA_PLATFORMTHEME=qt5ct
-export GPG_TTY=$(tty)
-
-export XDG_CURRENT_DESKTOP=sway
-export BROWSER=firefox
-export QT_QPA_PLATFORMTHEME=qt5ct
-export ECORE_EVAS_ENGINE="wayland_egl"
-export ELM_ACCEL="gl"
-export MOZ_ENABLE_WAYLAND=1
-export MOZ_DBUS_REMOTE=1
-export GTK_CSD=0
-

configs/sway/config

@@ -17,13 +17,15 @@ input type:keyboard {
 }
 
 input type:touchpad {
-    tap enabled
+    tap disabled
     dwt disabled
     natural_scroll enabled
 }
 
 input "1452:849:Apple_MTP_multi-touch" {
     scroll_factor 0.25
+    accel_profile adaptive
+    pointer_accel 0.1
 }
 
 exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
@@ -32,9 +34,9 @@ xwayland enable
 
 default_border pixel 1
 gaps inner 8
-font "JetBrains Mono" 9
+font "JetBrains Mono" 11
 
-#output * scale 2
+output * scale 1.666
 
 include ~/.config/sway/themes/catppuccin-macchiato
 
@@ -60,12 +62,12 @@ bindsym $mod+Shift+BackSpace exec killall -s SIGINT wf-recorder
 
 # Symbols bind
 bindsym $mod+Return exec $term
-bindsym $mod+Shift+f exec $filemgr
+bindsym $mod+Shift+e exec $filemgr
 bindsym $mod+Shift+q kill
 bindsym $mod+d exec $menu
 floating_modifier $mod normal
 bindsym $mod+Shift+c reload
-bindsym $mod+Shift+e exec swaynag -f 'JetBrains Mono 9' -e bottom -t warning -m "What would you like to do?" -B 'Exit sway' 'swaymsg exit' -B 'Power off' 'systemctl poweroff' -B 'Reboot' 'systemctl reboot' -B 'Lock screen' '$HOME/.config/sway/lock.sh'
+bindsym $mod+Shift+Escape exec swaynag -f 'JetBrains Mono 9' -e bottom -t warning -m "What would you like to do?" -B 'Exit sway' 'swaymsg exit' -B 'Power off' 'systemctl poweroff' -B 'Reboot' 'systemctl reboot' -B 'Lock screen' '$HOME/.config/sway/lock.sh'
 bindsym $mod+$left focus left
 bindsym $mod+$down focus down
 bindsym $mod+$up focus up
@@ -110,7 +112,7 @@ bindsym $mod+s layout stacking
 bindsym $mod+w layout tabbed
 bindsym $mod+e layout toggle split
 bindsym $mod+f fullscreen
-bindsym $mod+Shift+space floating toggle
+bindsym $mod+Shift+f floating toggle
 bindsym $mod+space focus mode_toggle
 bindsym $mod+a focus parent
 bindsym $mod+Shift+minus move scratchpad
@@ -164,8 +166,6 @@ for_window [app_id="pavucontrol"] floating enable, resize 600 300, move absolute
 for_window [app_id="nm-connection-editor"] floating enable, resize 300 150, move absolute position 25ppt 25ppt
 
 # Autostart
-exec alacritty --class bottom -e btm
+exec alacritty --class btop -e btop
-for_window [app_id="bottom"] move container to workspace number 10
+for_window [app_id="btop"] move container to workspace number 10
-exec keepassxc
-for_window [class="KeePassXC"] move container to workspace 9
 

configs/sway/lock.sh

@@ -1,10 +1,12 @@
 #!/bin/sh
 # Times the screen off and puts it to background
+grim /tmp/lockscreen.png && convert -filter Gaussian -resize 20% -blur 0x2.5 -resize 500% /tmp/lockscreen.png /tmp/lockscreen.png
 swayidle \
     timeout 10 'swaymsg "output * dpms off" && brightnessctl -d kbd_backlight set 0%' \
     resume 'swaymsg "output * dpms on"' \
-    before-sleep 'swaylock -c 181924 --font JetBrains\ Mono' &
+    before-sleep 'swaylock -i /tmp/lockscreen --font JetBrains\ Mono' &
 # Locks the screen immediately
-swaylock -c 181924 -s stretch --font JetBrains\ Mono
+swaylock -i /tmp/lockscreen.png -s stretch --font JetBrains\ Mono
 # Kills last background task so idle timer doesn't keep running
 kill %%
+rm /tmp/lockscreen.png

configs/sway/themes/catppuccin-macchiato

@@ -2,7 +2,7 @@ seat seat0 xcursor_theme "Catppuccin-Macchiato-Dark-Cursors"
 
 set $gnome-schema org.gnome.desktop.interface
 exec_always {
-    gsettings set $gnome-schema gtk-theme 'Catppuccin-Macchiato-Standard-Blue-dark'
+    gsettings set $gnome-schema gtk-theme 'Catppuccin-Macchiato-Standard-Blue-Dark'
     gsettings set $gnome-schema icon-theme 'Mint-Y-Blue'
     gsettings set $gnome-schema cursor-theme 'Catppuccin-Macchiato-Dark-Cursors'
     gsettings set $gnome-schema font-name 'Ubuntu 9'

configs/waybar/config

@@ -1,9 +1,9 @@
 {
-    "height": 32,
+    "height": 38,
     "position": "top",
-    "modules-left": ["sway/workspaces", "sway/mode"],
+    "modules-left": ["sway/workspaces", "tray","sway/mode"],
     "modules-center": [],
-    "modules-right": ["tray", "idle_inhibitor", "cpu", "memory", "wireplumber", "battery", "sway/language", "clock"],
+    "modules-right": ["idle_inhibitor", "cpu", "memory", "wireplumber", "battery", "sway/language", "clock"],
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
@@ -58,9 +58,9 @@
         "interval": 1
     },
     "battery": {
-        "format": "Battery: {capacity}%",
+        "format": "Bat: {capacity}%",
-        "format-charging": "Battery: {capacity}% (charging)",
+        "format-charging": "Bat: {capacity}% (charging)",
-        "format-plugged": "Battery: {capacity}% (plugged)",
+        "format-plugged": "Bat: {capacity}% (plugged)",
         "interval": 10
     },
     "network": {

configs/waybar/style.css

@@ -1,7 +1,7 @@
 @import "macchiato.css";
 * {
-    font-family: "JetBrains Mono", "Noto Sans";
+    font-family: "Ubuntu", "Noto Sans";
-    font-size: 7pt;
+    font-size: 9pt;
     border: none;
     font-weight: 400;
     padding: 1px 1px;
@@ -10,7 +10,7 @@
 window#waybar {
     color: transparent;
     background: @base;
-    opacity: 0.75;
+    opacity: 0.90;
     padding-top: 0;
     padding-bottom: 0;
     margin-top: 8px;
@@ -39,7 +39,7 @@ button:hover {
 }
 
 .modules-left {
-    padding-left: 4px;
+    padding-left: 8px;
     border-radius: 8px;
     color: @text;
 }
@@ -47,7 +47,7 @@ button:hover {
     transition: none;
     background: @base;
     color: @text;
-    padding-right: 4px;
+    padding-right: 8px;
 }
 
 #workspaces {
@@ -58,7 +58,7 @@ button:hover {
 }
 
 #language, #clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #tray, #mode, #idle_inhibitor, #mpd, #custom-loadavg, #custom-uptime, #wireplumber {
-    padding: 0 4px;
+    padding: 0 8px;
     margin: 2 1px;
     background-color: @mantle;
     border-radius: 8px;
@@ -82,5 +82,5 @@ label:focus {
 
 #language {
     padding: 0 4px;
-    min-width: 16px;
+    min-width: 24px;
 }

tools/install.sh

@@ -15,11 +15,11 @@ then
     echo "Aborting."
     exit 255
 fi
-mkdir -p $HOME/.dotfiles/zsh/{plugins,themes}
+mkdir -p $HOME/.config/zsh/{plugins,themes}
-ZSH="$HOME/.dotfiles/zsh"
+ZSH="$HOME/.config/zsh"
 echo "Installing zsh theme and plugins"
-curl -fsSL https://raw.githubusercontent.com/ivabus/ivabus-zsh-theme/master/ivabus.zsh-theme -o $HOME/.dotfiles/zsh/themes/ivabus.zsh-theme > /dev/null 2>&1
+curl -fsSL https://raw.githubusercontent.com/ivabus/ivabus-zsh-theme/master/ivabus.zsh-theme -o $HOME/.config/zsh/themes/ivabus.zsh-theme > /dev/null 2>&1
-git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.dotfiles/zsh/plugins/zsh-syntax-highlighting > /dev/null 2>&1
+git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.config/zsh/plugins/zsh-syntax-highlighting > /dev/null 2>&1
 
 # installing vimplug
 curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim

tools/install_nix.sh

@@ -6,8 +6,8 @@ if [ ! -d $HOME/.config ]; then
 fi
 chmod +x $HOME/.dotfiles/tools/*
 $HOME/.dotfiles/tools/relink.sh
-mkdir -p $HOME/.dotfiles/zsh/{plugins,themes}
+mkdir -p $HOME/.config/zsh/{plugins,themes}
-curl -fsSL https://raw.githubusercontent.com/ivabus/ivabus-zsh-theme/master/ivabus.zsh-theme -o $HOME/.dotfiles/zsh/themes/ivabus.zsh-theme
+curl -fsSL https://raw.githubusercontent.com/ivabus/ivabus-zsh-theme/master/ivabus.zsh-theme -o $HOME/.config/zsh/themes/ivabus.zsh-theme
-git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.dotfiles/zsh/plugins/zsh-syntax-highlighting
+git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.config/zsh/plugins/zsh-syntax-highlighting
 curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 nvim -c :PlugInstall -c :q -c :q