axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'devos/core' into core

Browse source
This commit is contained in:
teutat3s 2021-08-23 23:22:55 +02:00
parent 91270ead3a 5bd943f97d
commit 5aea1e8089
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1
12 changed files with 168 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/sway/config/config
View file

@ -125,7 +125,7 @@ output * bg ~/.config/wallpaper.jpg fill
bindsym $mod+Shift+9 move container to workspace 9; workspace $ws9 bindsym $mod+Shift+9 move container to workspace 9; workspace $ws9
# Note: workspaces can have any name you want, not just numbers. # Note: workspaces can have any name you want, not just numbers.
# We just use 1-10 as the default. # We just use 1-10 as the default.
#navigate workspaces next / previous #navigate workspaces next / previous
bindsym $mod+Ctrl+Right workspace next bindsym $mod+Ctrl+Right workspace next
bindsym $mod+Ctrl+Left workspace prev bindsym $mod+Ctrl+Left workspace prev
@ -141,13 +141,13 @@ output * bg ~/.config/wallpaper.jpg fill
# Configure border style <normal|1pixel|pixel xx|none|pixel> # Configure border style <normal|1pixel|pixel xx|none|pixel>
default_border pixel 1 default_border pixel 1
default_floating_border normal default_floating_border normal
# Hide borders # Hide borders
hide_edge_borders none hide_edge_borders none
# Font for window titles. Will also be used by the bar unless a different font # Font for window titles. Will also be used by the bar unless a different font
# is used in the bar {} block below. # 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 # You can "split" the current object of your focus with
# $mod+b or $mod+v, for horizontal and vertical splits # $mod+b or $mod+v, for horizontal and vertical splits

2
modules/sway/config/config.d/gaps.conf
View file

@ -10,7 +10,7 @@ gaps outer -5
# Smart gaps (gaps used if only more than one container on the workspace) # Smart gaps (gaps used if only more than one container on the workspace)
smart_gaps on 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) # 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 smart_borders on

2
modules/sway/config/config.d/systemd.conf
View file

@ -1,5 +1,5 @@
# Note that the systemctl commands must be run synchronously and can't be split into # 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 # systemctl import-environment is complete, and services that require certain variables
# will fail to run. # will fail to run.
# https://github.com/swaywm/sway/wiki/Systemd-integration # https://github.com/swaywm/sway/wiki/Systemd-integration

2
modules/terminal-life/zsh/p10k.zsh
View file

@ -596,7 +596,7 @@
typeset -g POWERLEVEL9K_ASDF_HASKELL_FOREGROUND=172 typeset -g POWERLEVEL9K_ASDF_HASKELL_FOREGROUND=172
# typeset -g POWERLEVEL9K_ASDF_HASKELL_VISUAL_IDENTIFIER_EXPANSION='⭐' # typeset -g POWERLEVEL9K_ASDF_HASKELL_VISUAL_IDENTIFIER_EXPANSION='⭐'
# typeset -g POWERLEVEL9K_ASDF_HASKELL_SHOW_ON_UPGLOB='*.foo|*.bar' # typeset -g POWERLEVEL9K_ASDF_HASKELL_SHOW_ON_UPGLOB='*.foo|*.bar'
###########[ nix_shell ]########### ###########[ nix_shell ]###########
# # Nix shell color. # # Nix shell color.
typeset -g POWERLEVEL9K_NIX_SHELL_FOREGROUND=74 typeset -g POWERLEVEL9K_NIX_SHELL_FOREGROUND=74

2
profiles/base-user/.config/dircolors
View file

@ -116,7 +116,7 @@ EXEC 01;32
#.sh 01;32 #.sh 01;32
#.csh 01;32 #.csh 01;32
# archives or compressed (bright red) # archives or compressed (bright red)
.tar 01;31 .tar 01;31
.tgz 01;31 .tgz 01;31
.arc 01;31 .arc 01;31

2
profiles/base-user/.config/mutt/mailcap
View file

@ -1 +1 @@
text/html; w3m -I %{charset} -T text/html; copiousoutput; text/html; w3m -I %{charset} -T text/html; copiousoutput;

2
profiles/base-user/.config/user-dirs.dirs
View file

@ -4,7 +4,7 @@
# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped # 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 # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
# absolute path. No other format is supported. # absolute path. No other format is supported.
#
XDG_DESKTOP_DIR="$HOME/" XDG_DESKTOP_DIR="$HOME/"
XDG_DOWNLOAD_DIR="$HOME/Downloads" XDG_DOWNLOAD_DIR="$HOME/Downloads"
XDG_TEMPLATES_DIR="$HOME/Templates" XDG_TEMPLATES_DIR="$HOME/Templates"

2
profiles/base-user/.config/user-dirs.locale
View file

@ -1 +1 @@
en_US en_US

82
profiles/base-user/.config/vifm/vifmrc
View file

@ -195,26 +195,26 @@ filextype *.djvu
" Audio " Audio
filetype *.wav,*.mp3,*.flac,*.m4a,*.wma,*.ape,*.ac3,*.og[agx],*.spx,*.opus filetype *.wav,*.mp3,*.flac,*.m4a,*.wma,*.ape,*.ac3,*.og[agx],*.spx,*.opus
\ {Play using vlc} \ {Play using vlc}
\ vlc %c, \ vlc %c,
\ {Play using ffplay} \ {Play using ffplay}
\ ffplay -nodisp -autoexit %c, \ ffplay -nodisp -autoexit %c,
fileviewer *.mp3 mp3info fileviewer *.mp3 mp3info
fileviewer *.flac soxi fileviewer *.flac soxi
" Video " Video
filextype *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob, filextype *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob,
\*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx, \*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx,
\*.as[fx] \*.as[fx]
\ {View using vlc} \ {View using vlc}
\ vlc %f, \ vlc %f,
\ {View using ffplay} \ {View using ffplay}
\ ffplay -fs -autoexit %f, \ ffplay -fs -autoexit %f,
fileviewer *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob, fileviewer *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob,
\*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx, \*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx,
\*.as[fx] \*.as[fx]
\ vifmimg videopreview %px %py %pw %ph %c \ vifmimg videopreview %px %py %pw %ph %c
\ %pc \ %pc
\ vifmimg clear \ vifmimg clear
" \ ffprobe -pretty %c 2>&1 " \ ffprobe -pretty %c 2>&1
@ -242,7 +242,7 @@ fileviewer *.bmp,*.jpg,*.jpeg,*.png,*.xpm
\ %pc \ %pc
\ vifmimg clear \ vifmimg clear
" Get w3m image previews inside vifm " Get w3m image previews inside vifm
" \ imgt %px %py %pw %ph %c " \ imgt %px %py %pw %ph %c
" \ %pc " \ %pc
" \ imgc %px %py %pw %ph NOT NEEDED IN XTERM " \ imgc %px %py %pw %ph NOT NEEDED IN XTERM
fileviewer *.gif fileviewer *.gif
@ -262,28 +262,28 @@ filextype *.vym
" MD5 " MD5
filetype *.md5 filetype *.md5
\ {Check MD5 hash sum} \ {Check MD5 hash sum}
\ md5sum -c %f %S, \ md5sum -c %f %S,
" SHA1 " SHA1
filetype *.sha1 filetype *.sha1
\ {Check SHA1 hash sum} \ {Check SHA1 hash sum}
\ sha1sum -c %f %S, \ sha1sum -c %f %S,
" SHA256 " SHA256
filetype *.sha256 filetype *.sha256
\ {Check SHA256 hash sum} \ {Check SHA256 hash sum}
\ sha256sum -c %f %S, \ sha256sum -c %f %S,
" SHA512 " SHA512
filetype *.sha512 filetype *.sha512
\ {Check SHA512 hash sum} \ {Check SHA512 hash sum}
\ sha512sum -c %f %S, \ sha512sum -c %f %S,
" GPG signature " GPG signature
filetype *.asc filetype *.asc
\ {Check signature} \ {Check signature}
\ !!gpg --verify %c, \ !!gpg --verify %c,
" Torrent " Torrent
filetype *.torrent ktorrent %f & filetype *.torrent ktorrent %f &
@ -291,18 +291,18 @@ fileviewer *.torrent dumptorrent -v %c
" FuseZipMount " FuseZipMount
filetype *.zip,*.jar,*.war,*.ear,*.oxt,*.apkg filetype *.zip,*.jar,*.war,*.ear,*.oxt,*.apkg
\ {Mount with fuse-zip} \ {Mount with fuse-zip}
\ FUSE_MOUNT|fuse-zip %SOURCE_FILE %DESTINATION_DIR, \ FUSE_MOUNT|fuse-zip %SOURCE_FILE %DESTINATION_DIR,
\ {View contents} \ {View contents}
\ zip -sf %c | less, \ zip -sf %c | less,
\ {Extract here} \ {Extract here}
\ tar -xf %c, \ tar -xf %c,
fileviewer *.zip,*.jar,*.war,*.ear,*.oxt zip -sf %c fileviewer *.zip,*.jar,*.war,*.ear,*.oxt zip -sf %c
" ArchiveMount " ArchiveMount
filetype *.tar,*.tar.bz2,*.tbz2,*.tgz,*.tar.gz,*.tar.xz,*.txz filetype *.tar,*.tar.bz2,*.tbz2,*.tgz,*.tar.gz,*.tar.xz,*.txz
\ {Mount with archivemount} \ {Mount with archivemount}
\ FUSE_MOUNT|archivemount %SOURCE_FILE %DESTINATION_DIR, \ FUSE_MOUNT|archivemount %SOURCE_FILE %DESTINATION_DIR,
fileviewer *.tgz,*.tar.gz tar -tzf %c fileviewer *.tgz,*.tar.gz tar -tzf %c
fileviewer *.tar.bz2,*.tbz2 tar -tjf %c fileviewer *.tar.bz2,*.tbz2 tar -tjf %c
fileviewer *.tar.txz,*.txz xz --list %c fileviewer *.tar.txz,*.txz xz --list %c
@ -310,29 +310,29 @@ fileviewer *.tar tar -tf %c
" Rar2FsMount and rar archives " Rar2FsMount and rar archives
filetype *.rar filetype *.rar
\ {Mount with rar2fs} \ {Mount with rar2fs}
\ FUSE_MOUNT|rar2fs %SOURCE_FILE %DESTINATION_DIR, \ FUSE_MOUNT|rar2fs %SOURCE_FILE %DESTINATION_DIR,
fileviewer *.rar unrar v %c fileviewer *.rar unrar v %c
" IsoMount " IsoMount
filetype *.iso filetype *.iso
\ {Mount with fuseiso} \ {Mount with fuseiso}
\ FUSE_MOUNT|fuseiso %SOURCE_FILE %DESTINATION_DIR, \ FUSE_MOUNT|fuseiso %SOURCE_FILE %DESTINATION_DIR,
" SshMount " SshMount
filetype *.ssh filetype *.ssh
\ {Mount with sshfs} \ {Mount with sshfs}
\ FUSE_MOUNT2|sshfs %PARAM %DESTINATION_DIR %FOREGROUND, \ FUSE_MOUNT2|sshfs %PARAM %DESTINATION_DIR %FOREGROUND,
" FtpMount " FtpMount
filetype *.ftp filetype *.ftp
\ {Mount with curlftpfs} \ {Mount with curlftpfs}
\ FUSE_MOUNT2|curlftpfs -o ftp_port=-,,disable_eprt %PARAM %DESTINATION_DIR %FOREGROUND, \ FUSE_MOUNT2|curlftpfs -o ftp_port=-,,disable_eprt %PARAM %DESTINATION_DIR %FOREGROUND,
" Fuse7z and 7z archives " Fuse7z and 7z archives
filetype *.7z filetype *.7z
\ {Mount with fuse-7z} \ {Mount with fuse-7z}
\ FUSE_MOUNT|fuse-7z %SOURCE_FILE %DESTINATION_DIR, \ FUSE_MOUNT|fuse-7z %SOURCE_FILE %DESTINATION_DIR,
fileviewer *.7z 7z l %c fileviewer *.7z 7z l %c
" Office files " Office files
@ -348,8 +348,8 @@ filextype *.pro qtcreator %f &
" All others " All others
filetype *.ts,*.js,*.css,*.sass,*.scss,*.go,*.rs,*.py,*.html,*.xhtml,*.json,*.jsx,*.tsx,*.vue,*.svelte,*.sql filetype *.ts,*.js,*.css,*.sass,*.scss,*.go,*.rs,*.py,*.html,*.xhtml,*.json,*.jsx,*.tsx,*.vue,*.svelte,*.sql
\ {Open in editor} \ {Open in editor}
\ nvim %c, \ nvim %c,
fileviewer *.ts,*.js,*.css,*.sass,*.scss,*.go,*.rs,*.py,*.html,*.xhtml,*.json,*.jsx,*.tsx,*.vue,*.svelte,*.sql bat %c fileviewer *.ts,*.js,*.css,*.sass,*.scss,*.go,*.rs,*.py,*.html,*.xhtml,*.json,*.jsx,*.tsx,*.vue,*.svelte,*.sql bat %c
" Directories " Directories

190
profiles/base-user/.config/waybar/config
View file

@ -1,102 +1,102 @@
{ {
"layer": "top", // Waybar at top layer "layer": "top", // Waybar at top layer
// "position": "bottom", // Waybar position (top|bottom|left|right) // "position": "bottom", // Waybar position (top|bottom|left|right)
"height": 26, // Waybar height "height": 26, // Waybar height
"modules-left": ["sway/workspaces", "sway/mode"], "modules-left": ["sway/workspaces", "sway/mode"],
"modules-center": ["mpd"], "modules-center": ["mpd"],
"modules-right": ["sway/language", "pulseaudio", "network", "idle_inhibitor", "battery", "clock", "tray"], "modules-right": ["sway/language", "pulseaudio", "network", "idle_inhibitor", "battery", "clock", "tray"],
"sway/workspaces": { "sway/workspaces": {
"disable-scroll": true "disable-scroll": true
}, },
"sway/mode": { "sway/mode": {
"tooltip": false, "tooltip": false,
"format": "{}" "format": "{}"
}, },
"sway/window": { "sway/window": {
"tooltip": false, "tooltip": false,
"max-length": 96 "max-length": 96
}, },
"sway/language": { "sway/language": {
"format": "{}", "format": "{}",
"max-length": 50 "max-length": 50
}, },
"tray": { "tray": {
"icon-size": 21, "icon-size": 21,
"spacing": 10 "spacing": 10
}, },
"clock": { "clock": {
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format-alt": "{:%a %d. %h %H:%M}" "format-alt": "{:%a %d. %h %H:%M}"
}, },
"backlight": { "backlight": {
// "device": "acpi_video1", // "device": "acpi_video1",
"tooltip": true, "tooltip": true,
"tooltip-format": "Brightness: <big>{percent}%</big>", "tooltip-format": "Brightness: <big>{percent}%</big>",
"format": "<span font='10'>{icon}</span>", "format": "<span font='10'>{icon}</span>",
"format-icons": ["", ""] "format-icons": ["", ""]
},
"cpu": {
"format": "{}% "
},
"memory": {
"format": "{}% "
},
"idle_inhibitor": {
"format": "<span font='10'>{icon} </span>",
"format-icons": {
"activated": "",
"deactivated": ""
}
},
"battery": {
"tooltip": false,
"states": {
"critical": 25
}, },
"cpu": { "full-at": 84,
"format": "{}% " "format": "<span font='10'>{icon}</span> {capacity}%",
}, "format-full": "<span font='10'>{icon}</span>",
"memory": { "format-icons": ["", "", "", "", ""],
"format": "{}% " },
}, "network": {
"idle_inhibitor": { "interval": 3,
"format": "<span font='10'>{icon} </span>", "tooltip": true,
"format-icons": { //"interface": "wlp4s0", // (Optional) To force the use of this interface   \uF2E7,
"activated": "", "format-wifi": "<span font='10'></span> \uf062 {bandwidthUpBits} | \uf063 {bandwidthDownBits}",
"deactivated": "" "format-ethernet": "<span font='10'></span> \uf062 {bandwidthUpBits} | \uf063 {bandwidthDownBits}",
} "format-disconnected": "",
"tooltip-format-wifi": "{essid} ({signalStrength}%)  {ipaddr}",
"tooltip-format-ethernet": "{ifname}  {ipaddr}"
},
//\ue04f{volume}%
"pulseaudio": {
"tooltip": false,
"format": "{volume}% <span font='10'>{icon}</span>",
"format-bluetooth": "{volume}% <span font='10'>{icon}</span>",
"format-muted": "",
"on-click": "pavucontrol",
"format-alt": "{volume}% <span font='10'>{icon}</span>",
"format-icons": {
"headphones": "",
"handsfree": "",
"headset": "",
"phone": "",
"portable": "",
"car": "",
"default": ["","", ""]
}
},
"mpd": {
"format": "{artist} - {title} <span color=\"#999999\">[<span color=\"#ffffff\">{elapsedTime:%M:%S}</span> / {totalTime:%M:%S}]</span>",
"format-disconnected": "",
"format-stopped": "",
"interval": 1,
"state-icons": {
"paused": "",
"playing": ""
}, },
"battery": { "tooltip-format": "MPD (connected)",
"tooltip": false, "tooltip-format-disconnected": "MPD (disconnected)"
"states": { }
"critical": 25
},
"full-at": 84,
"format": "<span font='10'>{icon}</span> {capacity}%",
"format-full": "<span font='10'>{icon}</span>",
"format-icons": ["", "", "", "", ""],
},
"network": {
"interval": 3,
"tooltip": true,
//"interface": "wlp4s0", // (Optional) To force the use of this interface   \uF2E7,
"format-wifi": "<span font='10'></span> \uf062 {bandwidthUpBits} | \uf063 {bandwidthDownBits}",
"format-ethernet": "<span font='10'></span> \uf062 {bandwidthUpBits} | \uf063 {bandwidthDownBits}",
"format-disconnected": "",
"tooltip-format-wifi": "{essid} ({signalStrength}%)  {ipaddr}",
"tooltip-format-ethernet": "{ifname}  {ipaddr}"
},
//\ue04f{volume}%
"pulseaudio": {
"tooltip": false,
"format": "{volume}% <span font='10'>{icon}</span>",
"format-bluetooth": "{volume}% <span font='10'>{icon}</span>",
"format-muted": "",
"on-click": "pavucontrol",
"format-alt": "{volume}% <span font='10'>{icon}</span>",
"format-icons": {
"headphones": "",
"handsfree": "",
"headset": "",
"phone": "",
"portable": "",
"car": "",
"default": ["","", ""]
}
},
"mpd": {
"format": "{artist} - {title} <span color=\"#999999\">[<span color=\"#ffffff\">{elapsedTime:%M:%S}</span> / {totalTime:%M:%S}]</span>",
"format-disconnected": "",
"format-stopped": "",
"interval": 1,
"state-icons": {
"paused": "",
"playing": ""
},
"tooltip-format": "MPD (connected)",
"tooltip-format-disconnected": "MPD (disconnected)"
}
} }

2
profiles/base-user/.config/waybar/style.css
View file

@ -51,7 +51,7 @@ window#waybar {
} }
#battery.critical { #battery.critical {
color: @base07; color: @base07;
} }
#battery.charging { #battery.charging {
color: @base0B; color: @base0B;

42
profiles/base-user/.xinitrc
View file

@ -46,28 +46,28 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
fi fi
get_session(){ get_session(){
local dbus_args=(--sh-syntax --exit-with-session) local dbus_args=(--sh-syntax --exit-with-session)
case $1 in case $1 in
awesome) dbus_args+=(awesome) ;; awesome) dbus_args+=(awesome) ;;
bspwm) dbus_args+=(bspwm-session) ;; bspwm) dbus_args+=(bspwm-session) ;;
budgie) dbus_args+=(budgie-desktop) ;; budgie) dbus_args+=(budgie-desktop) ;;
cinnamon) dbus_args+=(cinnamon-session) ;; cinnamon) dbus_args+=(cinnamon-session) ;;
deepin) dbus_args+=(startdde) ;; deepin) dbus_args+=(startdde) ;;
enlightenment) dbus_args+=(enlightenment_start) ;; enlightenment) dbus_args+=(enlightenment_start) ;;
fluxbox) dbus_args+=(startfluxbox) ;; fluxbox) dbus_args+=(startfluxbox) ;;
gnome) dbus_args+=(gnome-session) ;; gnome) dbus_args+=(gnome-session) ;;
i3|i3wm) dbus_args+=(i3 --shmlog-size 0) ;; i3|i3wm) dbus_args+=(i3 --shmlog-size 0) ;;
jwm) dbus_args+=(jwm) ;; jwm) dbus_args+=(jwm) ;;
kde) dbus_args+=(startkde) ;; kde) dbus_args+=(startkde) ;;
lxde) dbus_args+=(startlxde) ;; lxde) dbus_args+=(startlxde) ;;
lxqt) dbus_args+=(lxqt-session) ;; lxqt) dbus_args+=(lxqt-session) ;;
mate) dbus_args+=(mate-session) ;; mate) dbus_args+=(mate-session) ;;
xfce) dbus_args+=(xfce4-session) ;; xfce) dbus_args+=(xfce4-session) ;;
openbox) dbus_args+=(openbox-session) ;; openbox) dbus_args+=(openbox-session) ;;
*) dbus_args+=($DEFAULT_SESSION) ;; *) dbus_args+=($DEFAULT_SESSION) ;;
esac esac
echo "dbus-launch ${dbus_args[*]}" echo "dbus-launch ${dbus_args[*]}"
} }
exec $(get_session) exec $(get_session)