diff --git a/.vscode/settings.json b/.vscode/settings.json index 6ac3a0c..62c2677 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,22 @@ { "cSpell.words": [ "autohint", + "dunst", + "dunstrc", + "greenclip", "hintstyle", - "rgba" + "mimeapps", + "nanorc", + "pacman", + "polkit", + "polybar", + "poshthemes", + "powerline", + "rgba", + "rofi", + "seafile", + "terminalrc", + "Xresources" ], "sonarlint.connectedMode.project": { "connectionId": "public-sonarcloud", diff --git a/CHANGELOG.md b/CHANGELOG.md index fc974bf..190f6c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to date versioning. +## [2024-12-12] + +- Switched `notify-osd` for `dunst` +- Switched `pulseaudio` for `pipewire` + - **note** had to turn master volume on with `alsamixer` and use `sudo alsactl store` to keep the changes +- Included default Xresources file +- updated list with several new packages and removed some old ones + ## [2022-08-03] - Fixed i3lock re-using the last image diff --git a/README.md b/README.md index 7f32da6..1d65e23 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ Older versions: | bar | polybar | | App launcher | rofi | | Shell | Bash | +| Notifications | Dunst | | Package managers | Pacman & Trizen | | OS | Arch Linux | | Terminal | xfce4-terminal | diff --git a/config/.Xresources b/config/.Xresources new file mode 100644 index 0000000..226bbf3 --- /dev/null +++ b/config/.Xresources @@ -0,0 +1,8 @@ +Xft.antialias: true +Xft.hinting: true +Xft.rgba: rgba +Xft.hintstyle: hintslight +Xcursor.size: 12 + +# hi-dpi +#Xft.dpi: 120 diff --git a/config/git/settings.yml b/config/code/sync-settings.yml similarity index 100% rename from config/git/settings.yml rename to config/code/sync-settings.yml diff --git a/config/dunstrc b/config/dunstrc new file mode 100644 index 0000000..36589d5 --- /dev/null +++ b/config/dunstrc @@ -0,0 +1,379 @@ +# See dunst(5) for all configuration options + +[global] + ### Display ### + + # Which monitor should the notifications be displayed on. + monitor = 0 + + # Display notification on focused monitor. Possible modes are: + # mouse: follow mouse pointer + # keyboard: follow window with keyboard focus + # none: don't follow anything + # + # "keyboard" needs a window manager that exports the + # _NET_ACTIVE_WINDOW property. + # This should be the case for almost all modern window managers. + # + # If this option is set to mouse or keyboard, the monitor option + # will be ignored. + follow = keyboard + history = ctrl+shift+n + + ### Geometry ### + + # dynamic (0, 300) or fixed 300 + width = (0, 300) + height = (0, 200) + origin = top-right + offset = 10x50 + scale = 0 + + # Maximum number of notification (0 means no limit) + notification_limit = 0 + + ### Progress bar ### + + progress_bar = true + + # Set the progress bar height. This includes the frame, so make sure + # it's at least twice as big as the frame width. + progress_bar_height = 10 + + # Set the frame width of the progress bar + progress_bar_frame_width = 1 + + # Set the minimum width for the progress bar + progress_bar_min_width = 0 + + # Set the maximum width for the progress bar + progress_bar_max_width = 300 + + highlight = "#FF79C6" + + + # Show how many messages are currently hidden (because of + # notification_limit). + indicate_hidden = no + + # The transparency of the window. Range: [0; 100]. + # This option will only work if a compositing window manager is + # present (e.g. xcompmgr, compiz, etc.). (X11 only) + transparency = 0 + + # Draw a line of "separator_height" pixel height between two + # notifications. + # Set to 0 to disable. + separator_height = 1 + + # Padding between text and separator. + padding = 8 + + # Horizontal padding. + horizontal_padding = 10 + + # Padding between text and icon. + text_icon_padding = 0 + + # Defines width in pixels of frame around the notification window. + # Set to 0 to disable. + frame_width = 1 + + # Defines color of the frame around the notification window. + frame_color = "#bd93f9" + + # Define a color for the separator. + # possible values are: + # * auto: dunst tries to find a color fitting to the background; + # * foreground: use the same color as the foreground; + # * frame: use the same color as the frame; + # * anything else will be interpreted as a X color. + separator_color = frame + + # Sort messages by urgency. + sort = yes + + # Don't remove messages, if the user is idle (no mouse or keyboard input) + # for longer than idle_threshold seconds. + # Set to 0 to disable. + # A client can set the 'transient' hint to bypass this. See the rules + # section for how to disable this if necessary + idle_threshold = 120 + + ### Text ### + + font = Ubuntu 11 + + # The spacing between lines. If the height is smaller than the + # font height, it will get raised to the font height. + line_height = 0 + + # Possible values are: + # full: Allow a small subset of html markup in notifications: + # bold + # italic + # strikethrough + # underline + # + # For a complete reference see + # . + # + # strip: This setting is provided for compatibility with some broken + # clients that send markup even though it's not enabled on the + # server. Dunst will try to strip the markup but the parsing is + # simplistic so using this option outside of matching rules for + # specific applications *IS GREATLY DISCOURAGED*. + # + # no: Disable markup parsing, incoming notifications will be treated as + # plain text. Dunst will not advertise that it has the body-markup + # capability if this is set as a global setting. + # + # It's important to note that markup inside the format option will be parsed + # regardless of what this is set to. + markup = full + + # The format of the message. Possible variables are: + # %a appname + # %s summary + # %b body + # %i iconname (including its path) + # %I iconname (without its path) + # %p progress value if set ([ 0%] to [100%]) or nothing + # %n progress value if set without any extra characters + # %% Literal % + # Markup is allowed + format = "%s %p\n%b" + + # Alignment of message text. + # Possible values are "left", "center" and "right". + alignment = left + + # Vertical alignment of message text and icon. + # Possible values are "top", "center" and "bottom". + vertical_alignment = center + + # Show age of message if message is older than show_age_threshold + # seconds. + # Set to -1 to disable. + show_age_threshold = 60 + + # Specify where to make an ellipsis in long lines. + # Possible values are "start", "middle" and "end". + ellipsize = middle + + # Ignore newlines '\n' in notifications. + ignore_newline = no + + # Stack together notifications with the same content + stack_duplicates = no + + # Hide the count of stacked notifications with the same content + hide_duplicate_count = false + + # Display indicators for URLs (U) and actions (A). + show_indicators = no + + ### Icons ### + + # Align icons left/right/off + icon_position = left + + # Scale small icons up to this size, set to 0 to disable. Helpful + # for e.g. small files or high-dpi screens. In case of conflict, + # max_icon_size takes precedence over this. + min_icon_size = 0 + + # Scale larger icons down to this size, set to 0 to disable + max_icon_size = 64 + + # Paths to default icons. + icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ + + ### History ### + + # Should a notification popped up from history be sticky or timeout + # as if it would normally do. + sticky_history = no + + # Maximum amount of notifications kept in history + history_length = 5 + + ### Misc/Advanced ### + + # Browser for opening urls in context menu. + browser = /usr/bin/firefox -new-tab + + # Always run rule-defined scripts, even if the notification is suppressed + always_run_script = true + + # Define the title of the windows spawned by dunst + title = Dunst + + # Define the class of the windows spawned by dunst + class = Dunst + + # Define the corner radius of the notification window + # in pixel size. If the radius is 0, you have no rounded + # corners. + # The radius will be automatically lowered if it exceeds half of the + # notification height to avoid clipping text and/or icons. + corner_radius = 10 + + # Ignore the dbus closeNotification message. + # Useful to enforce the timeout set by dunst configuration. Without this + # parameter, an application may close the notification sent before the + # user defined timeout. + ignore_dbusclose = false + + ### Wayland ### + # These settings are Wayland-specific. They have no effect when using X11 + + # Uncomment this if you want to let notications appear under fullscreen + # applications (default: overlay) + # layer = top + + # Set this to true to use X11 output on Wayland. + force_xwayland = false + + ### Legacy + + # Use the Xinerama extension instead of RandR for multi-monitor support. + # This setting is provided for compatibility with older nVidia drivers that + # do not support RandR and using it on systems that support RandR is highly + # discouraged. + # + # By enabling this setting dunst will not be able to detect when a monitor + # is connected or disconnected which might break follow mode if the screen + # layout changes. + force_xinerama = false + + ### mouse + + # Defines list of actions for each mouse event + # Possible values are: + # * none: Don't do anything. + # * do_action: Invoke the action determined by the action_name rule. If there is no + # such action, open the context menu. + # * open_url: If the notification has exactly one url, open it. If there are multiple + # ones, open the context menu. + # * close_current: Close current notification. + # * close_all: Close all notifications. + # * context: Open context menu for the notification. + # * context_all: Open context menu for all notifications. + # These values can be strung together for each mouse event, and + # will be executed in sequence. + mouse_left_click = close_current + mouse_middle_click = do_action, close_current + mouse_right_click = close_all + +# Experimental features that may or may not work correctly. Do not expect them +# to have a consistent behaviour across releases. +[experimental] + # Calculate the dpi to use on a per-monitor basis. + # If this setting is enabled the Xft.dpi value will be ignored and instead + # dunst will attempt to calculate an appropriate dpi value for each monitor + # using the resolution and physical size. This might be useful in setups + # where there are multiple screens with very different dpi values. + per_monitor_dpi = false + + +[urgency_low] + # IMPORTANT: colors have to be defined in quotation marks. + # Otherwise the "#" and following would be interpreted as a comment. + background = "#282a36" + foreground = "#6272a4" + timeout = 3 + # Icon for notifications with low urgency, uncomment to enable + #new_icon = /path/to/icon + +[urgency_normal] + background = "#282a36" + foreground = "#bd93f9" + timeout = 5 + # Icon for notifications with normal urgency, uncomment to enable + #new_icon = /path/to/icon + +[urgency_critical] + background = "#ff5555" + foreground = "#f8f8f2" + frame_color = "#ff5555" + timeout = 20 + # Icon for notifications with critical urgency, uncomment to enable + #new_icon = /path/to/icon + +# Every section that isn't one of the above is interpreted as a rules to +# override settings for certain messages. +# +# Messages can be matched by +# appname (discouraged, see desktop_entry) +# body +# category +# desktop_entry +# icon +# match_transient +# msg_urgency +# stack_tag +# summary +# +# and you can override the +# background +# foreground +# format +# frame_color +# fullscreen +# new_icon +# set_stack_tag +# set_transient +# set_category +# timeout +# urgency +# skip_display +# history_ignore +# action_name +# word_wrap +# ellipsize +# alignment +# +# Shell-like globbing will get expanded. +# +# Instead of the appname filter, it's recommended to use the desktop_entry filter. +# GLib based applications export their desktop-entry name. In comparison to the appname, +# the desktop-entry won't get localized. +# +# SCRIPTING +# You can specify a script that gets run when the rule matches by +# setting the "script" option. +# The script will be called as follows: +# script appname summary body icon urgency +# where urgency can be "LOW", "NORMAL" or "CRITICAL". +# +# NOTE: It might be helpful to run dunst -print in a terminal in order +# to find fitting options for rules. + +# Disable the transient hint so that idle_threshold cannot be bypassed from the +# client +#[transient_disable] +# match_transient = yes +# set_transient = no +# +# Make the handling of transient notifications more strict by making them not +# be placed in history. +#[transient_history_ignore] +# match_transient = yes +# history_ignore = yes + +# fullscreen values +# show: show the notifications, regardless if there is a fullscreen window opened +# delay: displays the new notification, if there is no fullscreen window active +# If the notification is already drawn, it won't get undrawn. +# pushback: same as delay, but when switching into fullscreen, the notification will get +# withdrawn from screen again and will get delayed like a new notification +#[fullscreen_delay_everything] +# fullscreen = delay +#[fullscreen_show_critical] +# msg_urgency = critical +# fullscreen = show + +#[espeak] +# summary = "*" +# script = dunst_espeak.sh diff --git a/config/gtk/settings.ini b/config/gtk/settings.ini index e16a71f..9a4c92e 100644 --- a/config/gtk/settings.ini +++ b/config/gtk/settings.ini @@ -1,8 +1,8 @@ [Settings] gtk-theme-name="Dracula" gtk-font-name="Ubuntu 12" -gtk-cursor-theme-name="Adwaita" -gtk-cursor-theme-size=48 +gtk-cursor-theme-name="Dracula-cursors" +gtk-cursor-theme-size=12 gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=1 gtk-toolbar-style=GTK_TOOLBAR_BOTH diff --git a/config/notify-osd/notify-osd b/config/notify-osd/notify-osd deleted file mode 100644 index 86288d6..0000000 --- a/config/notify-osd/notify-osd +++ /dev/null @@ -1,25 +0,0 @@ - -slot-allocation = dynamic -bubble-expire-timeout = 5sec -bubble-vertical-gap = 25px -bubble-horizontal-gap = 9px -bubble-corner-radius = 45px -bubble-icon-size = 30px -bubble-gauge-size = 6px -bubble-width = 240px -bubble-background-color = 131313 -bubble-background-opacity = 80% -text-margin-size = 10px -text-title-size = 100% -text-title-weight = bold -text-title-color = ffffff -text-title-opacity = 100% -text-body-size = 90% -text-body-weight = normal -text-body-color = eaeaea -text-body-opacity = 100% -text-shadow-opacity = 100% -location = 1 -bubble-prevent-fade = 0 -bubble-close-on-click = 1 -bubble-as-desktop-bg = 0 diff --git a/config/polybar/bars.ini b/config/polybar/bars.ini index 0a7fa93..b415786 100644 --- a/config/polybar/bars.ini +++ b/config/polybar/bars.ini @@ -18,7 +18,8 @@ separator-foreground = ${colors.disabled} ; modules modules-left = xworkspaces i3 modules-center = tidal -modules-right = pulseaudio pulseaudio-microphone weather temperature updates ping battery date +modules-right = output-audio weather temperature updates ping battery date +; modules-right = output-audio input-audio weather temperature updates ping battery date ; fonts (fc-list) ; offset = height - size / 2 (for vertical center, icons are weird and need to be even numbers) diff --git a/config/polybar/modules.ini b/config/polybar/modules.ini index 215ef0b..d25d2bf 100644 --- a/config/polybar/modules.ini +++ b/config/polybar/modules.ini @@ -20,7 +20,7 @@ label-empty-foreground = ${colors.disabled} label-empty-padding = 1 -[module/pulseaudio] +[module/output-audio] type = internal/pulseaudio format-volume-prefix = "🔊 " @@ -171,7 +171,7 @@ scroll-up = "~/.config/i3/scripts/tidal-cli.sh next" scrolldown = "~/.config/i3/scripts/tidal-cli.sh previous" click-right = "~/.config/i3/scripts/tidal-cli.sh getLink | xclip -selection clipboard" -[module/pulseaudio-microphone] +[module/input-audio] type = custom/script exec = ~/.config/polybar/scripts/pulse-microphone.sh tail = true diff --git a/config/xfce4/thunar.xml b/config/xfce4/thunar.xml index 12be7a5..4f45054 100644 --- a/config/xfce4/thunar.xml +++ b/config/xfce4/thunar.xml @@ -3,8 +3,8 @@ - - + + diff --git a/config/xfce4/xfce4-terminal.xml b/config/xfce4/xfce4-terminal.xml index 36c5b66..f599ae5 100644 --- a/config/xfce4/xfce4-terminal.xml +++ b/config/xfce4/xfce4-terminal.xml @@ -3,7 +3,7 @@ - + diff --git a/dependencies/aur.txt b/dependencies/aur.txt index d941c37..d9200bd 100644 --- a/dependencies/aur.txt +++ b/dependencies/aur.txt @@ -2,7 +2,7 @@ visual-studio-code-bin i3blocks-contrib insync awesome-terminal-fonts-git -dracula-gtk-theme-full + downgrade oh-my-posh dive @@ -12,14 +12,26 @@ awf-gtk4 seafile networkmanager-l2tp xorg-xev -notify-osd-customizable -notifyconf + dotnet-host-bin keychain nomachine -pulseaudio-ctl otf-droid-sans-mono-powerline-git -seafile-client sysmontask -azure-cli greenclip + +# audio +pipewire-pulse +pipewire-alsa +pipewire-jack +tidal-hifi + +# theme +dracula-gtk-theme-full +dracula-cursors-git +dracula-icons-theme +dracula-xresources-git + +# slow stuff +azure-cli +seafile-client diff --git a/dependencies/pacman.txt b/dependencies/pacman.txt index d7c0e88..185041a 100644 --- a/dependencies/pacman.txt +++ b/dependencies/pacman.txt @@ -18,6 +18,8 @@ python-keyring libsecret seahorse reflector +gtk-engines +kubectl # # i3wm @@ -114,7 +116,6 @@ picom polybar poppler powertop -pulseaudio-bluetooth rofi rofi-emoji rofi-calc @@ -128,13 +129,19 @@ system-config-printer thefuck thunar thunar-archive-plugin +dunst +ufw +gufw w3m - +blueberry xclip xfce4-terminal xorg-xkill +pass +evince + # fonts fontconfig noto-fonts-emoji diff --git a/docs/afterinstall.md b/docs/afterinstall.md index 15abd53..887b994 100644 --- a/docs/afterinstall.md +++ b/docs/afterinstall.md @@ -2,19 +2,12 @@ -- [Set up vscode settings sync + globalstorage](#set-up-vscode-settings-sync--globalstorage) +- [after install](#after-install) + - [Set up vscode settings sync](#set-up-vscode-settings-sync) -## Set up vscode settings sync + globalstorage +## Set up vscode settings sync -After setting up settings sync make sure that the "ignoreUploadFolders" in [~/.config/Code/User/syncLocalSettings.json](~/.config/Code/User/syncLocalSettings.json) includes "globalstorages": - -```sh - "ignoreUploadFolders": [ - "workspaceStorage", - "History", - "globalStorage", - "GlobalStorage" - ], -``` +Simply install [zokugun's setting sync](https://github.com/zokugun/vscode-sync-settings). +The config file [config/code/sync-settings.yml](./../config/code/sync-settings.yml) will already point to the correct repo diff --git a/install.sh b/install.sh index 833fbc4..9256f5c 100644 --- a/install.sh +++ b/install.sh @@ -69,10 +69,10 @@ function copyToDir { function install_fonts { mkdir -p ~/.fonts mkdir -p ~/.local/share/fonts - mkdir -p /usr/local/share/fonts + sudo mkdir -p /usr/local/share/fonts cp -rf ./fonts/* ~/.fonts cp -rf ./fonts/* ~/.local/share/fonts - cp -rf ./fonts/* /usr/local/share/fonts + sudo cp -rf ./fonts/* /usr/local/share/fonts } # install trizen, an aur helper @@ -100,10 +100,9 @@ function install_gtk { } function install_docker { - systemctl enable docker - groupadd docker - usermod -aG docker $USER - newgrp docker + sudo systemctl enable docker + sudo usermod -aG docker $USER + } # install other configs @@ -114,7 +113,6 @@ function install_config { # link directories linkDir "$PWD"/wallpapers/images ~/Pictures/wallpapers linkDir "$PWD"/i3 ~/.config/i3 - linkDir "$PWD"/config/notify-osd/notify-osd ~/.notify-osd linkDir "$PWD"/config/terminal/xfce4-term ~/.config/xfce4/terminal linkDir "$PWD"/config/polybar ~/.config/polybar linkDir "$PWD"/config/poshthemes ~/.config/poshthemes @@ -127,13 +125,14 @@ function install_config { ln -sf "$PWD"/bash/.dotnet-install.sh ~/.dotnet-install.sh ln -sf "$PWD"/bash/.alias.sh ~/.alias ln -sf "$PWD"/config/nano/.nanorc ~/.nanorc + ln -sf "$PWD"/config/.Xresources ~/.Xresources ln -sf "$PWD"/bash/.powerline-shell.json ~/.powerline-shell.json + mkdir -p ~/.config/dunst + ln -sf "$PWD"/config/dunstrc ~/.config/dunst/dunstrc ln -sf "$PWD"/config/mimeapps.list ~/.config/mimeapps.list ln -sf "$PWD"/config/greenclip.toml ~/.config/greenclip.toml ln -sf "$PWD"/config/terminalrc ~/.config/xfce4/terminal/terminalrc - mkdir -p ~/.config/Code/User/globalStorage/zokugun.sync-settings - ln -sf "$PWD"/config/git/settings.yml ~/.config/Code/User/globalStorage/zokugun.sync-settings/settings.yml ln -sf "$PWD"/config/.gitconfig ~/.gitconfig ln -sf "$PWD"/config/.npmrc ~/.npmrc @@ -162,6 +161,9 @@ function install_config { mkdir -p "$HOME/.config/Code/User" cp "$PWD"/config/code/syncLocalSettings.json ~/.config/Code/User/ + mkdir -p ~/.config/Code/User/globalStorage/zokugun.sync-settings + ln -sf "$PWD"/config/code/sync-settings.yml ~/.config/Code/User/globalStorage/zokugun.sync-settings/settings.yml + # system fixes echo fs.inotify.max_user_watches=524288 | sudo tee /etc/sysctl.d/40-max-user-watches.conf && sudo sysctl --system mkdir -p ~/Pictures/Screenshots @@ -187,6 +189,11 @@ function create_ssh_key { eval "$(ssh-agent -s)" } +# set up pass +function setup_pass { + pass init info@rickvanlieshout.com +} + # ======================================= # User output functions # ======================================= @@ -265,6 +272,11 @@ if ask "Do you want to set up docker for this user?" Y; then install_docker fi +# Autostart docker and add user +if ask "Do you want to set up a password manager for your keychain?" Y; then + setup_pass +fi + # ask to enable the display manager if ask "Do you want to enable sddm?" Y; then sudo systemctl set-default graphical.target