diff --git a/modules/sway/config/config b/modules/sway/config/config index 2360c062..752a96c5 100644 --- a/modules/sway/config/config +++ b/modules/sway/config/config @@ -125,7 +125,7 @@ output * bg ~/.config/wallpaper.jpg fill bindsym $mod+Shift+9 move container to workspace 9; workspace $ws9 # Note: workspaces can have any name you want, not just numbers. # We just use 1-10 as the default. - + #navigate workspaces next / previous bindsym $mod+Ctrl+Right workspace next bindsym $mod+Ctrl+Left workspace prev @@ -141,13 +141,13 @@ output * bg ~/.config/wallpaper.jpg fill # Configure border style default_border pixel 1 default_floating_border normal - + # Hide borders hide_edge_borders none # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. - font xft:Hack 16 + font xft:Hack 16 # You can "split" the current object of your focus with # $mod+b or $mod+v, for horizontal and vertical splits diff --git a/modules/sway/config/config.d/gaps.conf b/modules/sway/config/config.d/gaps.conf index f0a17661..0dcc5087 100644 --- a/modules/sway/config/config.d/gaps.conf +++ b/modules/sway/config/config.d/gaps.conf @@ -10,7 +10,7 @@ gaps outer -5 # Smart gaps (gaps used if only more than one container on the workspace) smart_gaps on -# Smart borders (draw borders around container only if it is not the only container on this workspace) +# Smart borders (draw borders around container only if it is not the only container on this workspace) # on|no_gaps (on=always activate and no_gaps=only activate if the gap size to the edge of the screen is 0) smart_borders on diff --git a/modules/sway/config/config.d/systemd.conf b/modules/sway/config/config.d/systemd.conf index ceb273f8..3fecd355 100644 --- a/modules/sway/config/config.d/systemd.conf +++ b/modules/sway/config/config.d/systemd.conf @@ -1,5 +1,5 @@ # Note that the systemctl commands must be run synchronously and can't be split into -# three exec statements, since otherwise the session target may be started before +# three exec statements, since otherwise the session target may be started before # systemctl import-environment is complete, and services that require certain variables # will fail to run. # https://github.com/swaywm/sway/wiki/Systemd-integration diff --git a/modules/terminal-life/zsh/p10k.zsh b/modules/terminal-life/zsh/p10k.zsh index 64503895..be207b58 100644 --- a/modules/terminal-life/zsh/p10k.zsh +++ b/modules/terminal-life/zsh/p10k.zsh @@ -596,7 +596,7 @@ typeset -g POWERLEVEL9K_ASDF_HASKELL_FOREGROUND=172 # typeset -g POWERLEVEL9K_ASDF_HASKELL_VISUAL_IDENTIFIER_EXPANSION='⭐' # typeset -g POWERLEVEL9K_ASDF_HASKELL_SHOW_ON_UPGLOB='*.foo|*.bar' - + ###########[ nix_shell ]########### # # Nix shell color. typeset -g POWERLEVEL9K_NIX_SHELL_FOREGROUND=74 diff --git a/profiles/base-user/.config/dircolors b/profiles/base-user/.config/dircolors index 89c085da..16b9bb1b 100644 --- a/profiles/base-user/.config/dircolors +++ b/profiles/base-user/.config/dircolors @@ -116,7 +116,7 @@ EXEC 01;32 #.sh 01;32 #.csh 01;32 - # archives or compressed (bright red) +# archives or compressed (bright red) .tar 01;31 .tgz 01;31 .arc 01;31 diff --git a/profiles/base-user/.config/mutt/mailcap b/profiles/base-user/.config/mutt/mailcap index f6cb96a1..86035375 100644 --- a/profiles/base-user/.config/mutt/mailcap +++ b/profiles/base-user/.config/mutt/mailcap @@ -1 +1 @@ -text/html; w3m -I %{charset} -T text/html; copiousoutput; +text/html; w3m -I %{charset} -T text/html; copiousoutput; diff --git a/profiles/base-user/.config/user-dirs.dirs b/profiles/base-user/.config/user-dirs.dirs index 5a833b8f..a1bf8b4d 100644 --- a/profiles/base-user/.config/user-dirs.dirs +++ b/profiles/base-user/.config/user-dirs.dirs @@ -4,7 +4,7 @@ # Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an # absolute path. No other format is supported. -# + XDG_DESKTOP_DIR="$HOME/" XDG_DOWNLOAD_DIR="$HOME/Downloads" XDG_TEMPLATES_DIR="$HOME/Templates" diff --git a/profiles/base-user/.config/user-dirs.locale b/profiles/base-user/.config/user-dirs.locale index 3e0b4191..7741b83a 100644 --- a/profiles/base-user/.config/user-dirs.locale +++ b/profiles/base-user/.config/user-dirs.locale @@ -1 +1 @@ -en_US \ No newline at end of file +en_US diff --git a/profiles/base-user/.config/vifm/vifmrc b/profiles/base-user/.config/vifm/vifmrc index 3a10e173..400aea0d 100644 --- a/profiles/base-user/.config/vifm/vifmrc +++ b/profiles/base-user/.config/vifm/vifmrc @@ -195,26 +195,26 @@ filextype *.djvu " Audio filetype *.wav,*.mp3,*.flac,*.m4a,*.wma,*.ape,*.ac3,*.og[agx],*.spx,*.opus - \ {Play using vlc} - \ vlc %c, - \ {Play using ffplay} - \ ffplay -nodisp -autoexit %c, + \ {Play using vlc} + \ vlc %c, + \ {Play using ffplay} + \ ffplay -nodisp -autoexit %c, fileviewer *.mp3 mp3info fileviewer *.flac soxi " Video filextype *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob, - \*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx, - \*.as[fx] + \*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx, + \*.as[fx] \ {View using vlc} \ vlc %f, \ {View using ffplay} \ ffplay -fs -autoexit %f, fileviewer *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob, - \*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx, - \*.as[fx] - \ vifmimg videopreview %px %py %pw %ph %c - \ %pc + \*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx, + \*.as[fx] + \ vifmimg videopreview %px %py %pw %ph %c + \ %pc \ vifmimg clear " \ ffprobe -pretty %c 2>&1 @@ -242,7 +242,7 @@ fileviewer *.bmp,*.jpg,*.jpeg,*.png,*.xpm \ %pc \ vifmimg clear " Get w3m image previews inside vifm - " \ imgt %px %py %pw %ph %c + " \ imgt %px %py %pw %ph %c " \ %pc " \ imgc %px %py %pw %ph NOT NEEDED IN XTERM fileviewer *.gif @@ -262,28 +262,28 @@ filextype *.vym " MD5 filetype *.md5 - \ {Check MD5 hash sum} - \ md5sum -c %f %S, + \ {Check MD5 hash sum} + \ md5sum -c %f %S, " SHA1 filetype *.sha1 - \ {Check SHA1 hash sum} - \ sha1sum -c %f %S, + \ {Check SHA1 hash sum} + \ sha1sum -c %f %S, " SHA256 filetype *.sha256 - \ {Check SHA256 hash sum} - \ sha256sum -c %f %S, + \ {Check SHA256 hash sum} + \ sha256sum -c %f %S, " SHA512 filetype *.sha512 - \ {Check SHA512 hash sum} - \ sha512sum -c %f %S, + \ {Check SHA512 hash sum} + \ sha512sum -c %f %S, " GPG signature filetype *.asc - \ {Check signature} - \ !!gpg --verify %c, + \ {Check signature} + \ !!gpg --verify %c, " Torrent filetype *.torrent ktorrent %f & @@ -291,18 +291,18 @@ fileviewer *.torrent dumptorrent -v %c " FuseZipMount filetype *.zip,*.jar,*.war,*.ear,*.oxt,*.apkg - \ {Mount with fuse-zip} - \ FUSE_MOUNT|fuse-zip %SOURCE_FILE %DESTINATION_DIR, - \ {View contents} - \ zip -sf %c | less, - \ {Extract here} - \ tar -xf %c, + \ {Mount with fuse-zip} + \ FUSE_MOUNT|fuse-zip %SOURCE_FILE %DESTINATION_DIR, + \ {View contents} + \ zip -sf %c | less, + \ {Extract here} + \ tar -xf %c, fileviewer *.zip,*.jar,*.war,*.ear,*.oxt zip -sf %c " ArchiveMount filetype *.tar,*.tar.bz2,*.tbz2,*.tgz,*.tar.gz,*.tar.xz,*.txz - \ {Mount with archivemount} - \ FUSE_MOUNT|archivemount %SOURCE_FILE %DESTINATION_DIR, + \ {Mount with archivemount} + \ FUSE_MOUNT|archivemount %SOURCE_FILE %DESTINATION_DIR, fileviewer *.tgz,*.tar.gz tar -tzf %c fileviewer *.tar.bz2,*.tbz2 tar -tjf %c fileviewer *.tar.txz,*.txz xz --list %c @@ -310,29 +310,29 @@ fileviewer *.tar tar -tf %c " Rar2FsMount and rar archives filetype *.rar - \ {Mount with rar2fs} - \ FUSE_MOUNT|rar2fs %SOURCE_FILE %DESTINATION_DIR, + \ {Mount with rar2fs} + \ FUSE_MOUNT|rar2fs %SOURCE_FILE %DESTINATION_DIR, fileviewer *.rar unrar v %c " IsoMount filetype *.iso - \ {Mount with fuseiso} - \ FUSE_MOUNT|fuseiso %SOURCE_FILE %DESTINATION_DIR, + \ {Mount with fuseiso} + \ FUSE_MOUNT|fuseiso %SOURCE_FILE %DESTINATION_DIR, " SshMount filetype *.ssh - \ {Mount with sshfs} - \ FUSE_MOUNT2|sshfs %PARAM %DESTINATION_DIR %FOREGROUND, + \ {Mount with sshfs} + \ FUSE_MOUNT2|sshfs %PARAM %DESTINATION_DIR %FOREGROUND, " FtpMount filetype *.ftp - \ {Mount with curlftpfs} - \ FUSE_MOUNT2|curlftpfs -o ftp_port=-,,disable_eprt %PARAM %DESTINATION_DIR %FOREGROUND, + \ {Mount with curlftpfs} + \ FUSE_MOUNT2|curlftpfs -o ftp_port=-,,disable_eprt %PARAM %DESTINATION_DIR %FOREGROUND, " Fuse7z and 7z archives filetype *.7z - \ {Mount with fuse-7z} - \ FUSE_MOUNT|fuse-7z %SOURCE_FILE %DESTINATION_DIR, + \ {Mount with fuse-7z} + \ FUSE_MOUNT|fuse-7z %SOURCE_FILE %DESTINATION_DIR, fileviewer *.7z 7z l %c " Office files @@ -348,8 +348,8 @@ filextype *.pro qtcreator %f & " All others filetype *.ts,*.js,*.css,*.sass,*.scss,*.go,*.rs,*.py,*.html,*.xhtml,*.json,*.jsx,*.tsx,*.vue,*.svelte,*.sql - \ {Open in editor} - \ nvim %c, + \ {Open in editor} + \ nvim %c, fileviewer *.ts,*.js,*.css,*.sass,*.scss,*.go,*.rs,*.py,*.html,*.xhtml,*.json,*.jsx,*.tsx,*.vue,*.svelte,*.sql bat %c " Directories diff --git a/profiles/base-user/.config/waybar/config b/profiles/base-user/.config/waybar/config index b2231671..3ac2f37a 100644 --- a/profiles/base-user/.config/waybar/config +++ b/profiles/base-user/.config/waybar/config @@ -1,102 +1,102 @@ { - "layer": "top", // Waybar at top layer - // "position": "bottom", // Waybar position (top|bottom|left|right) + "layer": "top", // Waybar at top layer + // "position": "bottom", // Waybar position (top|bottom|left|right) - "height": 26, // Waybar height - "modules-left": ["sway/workspaces", "sway/mode"], - "modules-center": ["mpd"], - "modules-right": ["sway/language", "pulseaudio", "network", "idle_inhibitor", "battery", "clock", "tray"], - "sway/workspaces": { - "disable-scroll": true - }, - "sway/mode": { - "tooltip": false, - "format": "{}" - }, - "sway/window": { - "tooltip": false, - "max-length": 96 - }, - "sway/language": { + "height": 26, // Waybar height + "modules-left": ["sway/workspaces", "sway/mode"], + "modules-center": ["mpd"], + "modules-right": ["sway/language", "pulseaudio", "network", "idle_inhibitor", "battery", "clock", "tray"], + "sway/workspaces": { + "disable-scroll": true + }, + "sway/mode": { + "tooltip": false, + "format": "{}" + }, + "sway/window": { + "tooltip": false, + "max-length": 96 + }, + "sway/language": { "format": "{}", "max-length": 50 - }, - "tray": { - "icon-size": 21, - "spacing": 10 - }, - "clock": { - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%a %d. %h %H:%M}" - }, - "backlight": { - // "device": "acpi_video1", - "tooltip": true, - "tooltip-format": "Brightness: {percent}%", - "format": "{icon}", - "format-icons": ["", ""] + }, + "tray": { + "icon-size": 21, + "spacing": 10 + }, + "clock": { + "tooltip-format": "{:%Y %B}\n{calendar}", + "format-alt": "{:%a %d. %h %H:%M}" + }, + "backlight": { + // "device": "acpi_video1", + "tooltip": true, + "tooltip-format": "Brightness: {percent}%", + "format": "{icon}", + "format-icons": ["", ""] + }, + "cpu": { + "format": "{}% " + }, + "memory": { + "format": "{}% " + }, + "idle_inhibitor": { + "format": "{icon} ", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "battery": { + "tooltip": false, + "states": { + "critical": 25 }, - "cpu": { - "format": "{}% " - }, - "memory": { - "format": "{}% " - }, - "idle_inhibitor": { - "format": "{icon} ", - "format-icons": { - "activated": "", - "deactivated": "" - } + "full-at": 84, + "format": "{icon} {capacity}%", + "format-full": "{icon}", + "format-icons": ["", "", "", "", ""], + }, + "network": { + "interval": 3, + "tooltip": true, + //"interface": "wlp4s0", // (Optional) To force the use of this interface   \uF2E7, + "format-wifi": " \uf062 {bandwidthUpBits} | \uf063 {bandwidthDownBits}", + "format-ethernet": " \uf062 {bandwidthUpBits} | \uf063 {bandwidthDownBits}", + "format-disconnected": "", + "tooltip-format-wifi": "{essid} ({signalStrength}%)  {ipaddr}", + "tooltip-format-ethernet": "{ifname}  {ipaddr}" + }, + //\ue04f{volume}% + "pulseaudio": { + "tooltip": false, + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% {icon}", + "format-muted": "", + "on-click": "pavucontrol", + "format-alt": "{volume}% {icon}", + "format-icons": { + "headphones": "", + "handsfree": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["","", ""] + } + }, + "mpd": { + "format": "{artist} - {title} [{elapsedTime:%M:%S} / {totalTime:%M:%S}]", + "format-disconnected": "", + "format-stopped": "", + "interval": 1, + "state-icons": { + "paused": "", + "playing": "" }, - "battery": { - "tooltip": false, - "states": { - "critical": 25 - }, - "full-at": 84, - "format": "{icon} {capacity}%", - "format-full": "{icon}", - "format-icons": ["", "", "", "", ""], - }, - "network": { - "interval": 3, - "tooltip": true, - //"interface": "wlp4s0", // (Optional) To force the use of this interface   \uF2E7, - "format-wifi": " \uf062 {bandwidthUpBits} | \uf063 {bandwidthDownBits}", - "format-ethernet": " \uf062 {bandwidthUpBits} | \uf063 {bandwidthDownBits}", - "format-disconnected": "", - "tooltip-format-wifi": "{essid} ({signalStrength}%)  {ipaddr}", - "tooltip-format-ethernet": "{ifname}  {ipaddr}" - }, - //\ue04f{volume}% - "pulseaudio": { - "tooltip": false, - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon}", - "format-muted": "", - "on-click": "pavucontrol", - "format-alt": "{volume}% {icon}", - "format-icons": { - "headphones": "", - "handsfree": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["","", ""] - } - }, - "mpd": { - "format": "{artist} - {title} [{elapsedTime:%M:%S} / {totalTime:%M:%S}]", - "format-disconnected": "", - "format-stopped": "", - "interval": 1, - "state-icons": { - "paused": "", - "playing": "" - }, - "tooltip-format": "MPD (connected)", - "tooltip-format-disconnected": "MPD (disconnected)" - } + "tooltip-format": "MPD (connected)", + "tooltip-format-disconnected": "MPD (disconnected)" + } } diff --git a/profiles/base-user/.config/waybar/style.css b/profiles/base-user/.config/waybar/style.css index f4e07cce..ef85a95a 100644 --- a/profiles/base-user/.config/waybar/style.css +++ b/profiles/base-user/.config/waybar/style.css @@ -51,7 +51,7 @@ window#waybar { } #battery.critical { - color: @base07; + color: @base07; } #battery.charging { color: @base0B; diff --git a/profiles/base-user/.xinitrc b/profiles/base-user/.xinitrc index 3c317bfb..d961f66c 100644 --- a/profiles/base-user/.xinitrc +++ b/profiles/base-user/.xinitrc @@ -46,28 +46,28 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then fi get_session(){ - local dbus_args=(--sh-syntax --exit-with-session) - case $1 in - awesome) dbus_args+=(awesome) ;; - bspwm) dbus_args+=(bspwm-session) ;; - budgie) dbus_args+=(budgie-desktop) ;; - cinnamon) dbus_args+=(cinnamon-session) ;; - deepin) dbus_args+=(startdde) ;; - enlightenment) dbus_args+=(enlightenment_start) ;; - fluxbox) dbus_args+=(startfluxbox) ;; - gnome) dbus_args+=(gnome-session) ;; - i3|i3wm) dbus_args+=(i3 --shmlog-size 0) ;; - jwm) dbus_args+=(jwm) ;; - kde) dbus_args+=(startkde) ;; - lxde) dbus_args+=(startlxde) ;; - lxqt) dbus_args+=(lxqt-session) ;; - mate) dbus_args+=(mate-session) ;; - xfce) dbus_args+=(xfce4-session) ;; - openbox) dbus_args+=(openbox-session) ;; - *) dbus_args+=($DEFAULT_SESSION) ;; - esac + local dbus_args=(--sh-syntax --exit-with-session) + case $1 in + awesome) dbus_args+=(awesome) ;; + bspwm) dbus_args+=(bspwm-session) ;; + budgie) dbus_args+=(budgie-desktop) ;; + cinnamon) dbus_args+=(cinnamon-session) ;; + deepin) dbus_args+=(startdde) ;; + enlightenment) dbus_args+=(enlightenment_start) ;; + fluxbox) dbus_args+=(startfluxbox) ;; + gnome) dbus_args+=(gnome-session) ;; + i3|i3wm) dbus_args+=(i3 --shmlog-size 0) ;; + jwm) dbus_args+=(jwm) ;; + kde) dbus_args+=(startkde) ;; + lxde) dbus_args+=(startlxde) ;; + lxqt) dbus_args+=(lxqt-session) ;; + mate) dbus_args+=(mate-session) ;; + xfce) dbus_args+=(xfce4-session) ;; + openbox) dbus_args+=(openbox-session) ;; + *) dbus_args+=($DEFAULT_SESSION) ;; + esac - echo "dbus-launch ${dbus_args[*]}" + echo "dbus-launch ${dbus_args[*]}" } exec $(get_session)