From ac51a31675eda225683cb1ef1c594c568eb8beb0 Mon Sep 17 00:00:00 2001 From: nevaforget Date: Thu, 19 Dec 2024 23:32:30 +0100 Subject: [PATCH] that's a bunch of cool new stuff --- home/.bashrc | 2 +- home/.zshrc | 51 +--- home/config/VSCodium/User/settings.json | 54 ++-- home/config/alacritty/alacritty.toml | 18 +- home/config/alacritty/catppuccin-mocha.toml | 2 +- home/config/gtk-3.0/gtk.css | 15 + home/config/hypr/filter/blank.frag | 10 + home/config/hypr/filter/blue-light.frag | 16 ++ home/config/hypr/hl-animation.conf | 9 +- home/config/hypr/hl-autostart.conf | 4 + home/config/hypr/hl-decoration.conf | 2 +- home/config/hypr/hl-env.conf | 19 +- home/config/hypr/hl-general.conf | 6 +- home/config/hypr/hl-keybindings.conf | 17 +- home/config/hypr/hl-windowrules.conf | 14 + home/config/kitty/current-theme.conf | 80 ++++++ home/config/kitty/custom.conf | 2 + home/config/kitty/kitty.conf | 34 ++- home/config/kitty/kitty.conf.bak | 94 +++++++ home/config/rofi/config.rasi | 38 +-- home/config/waybar/config | 286 ++++++++++++-------- home/config/waybar/screenshader.xml | 26 ++ home/config/waybar/style copy.css | 232 ---------------- home/config/waybar/style.css | 84 +++--- home/config/waypaper/config.ini | 11 +- stower.sh | 14 +- usr/local/bin/capsnote | 20 ++ usr/local/bin/hyprm-dnd | 24 ++ usr/local/bin/hyprm-i18n | 17 ++ usr/local/bin/hyprm-waybar-cpugov | 49 ++++ usr/local/bin/hyprm-waybar-gpustat | 39 +++ usr/local/bin/hyprm-waybar-sink | 53 ++++ usr/local/bin/hyprm-waybar-weather | 19 ++ usr/local/bin/hyprshade-waybar | 20 ++ 34 files changed, 864 insertions(+), 517 deletions(-) create mode 100644 home/config/gtk-3.0/gtk.css create mode 100644 home/config/hypr/filter/blank.frag create mode 100644 home/config/hypr/filter/blue-light.frag create mode 100644 home/config/kitty/current-theme.conf create mode 100644 home/config/kitty/kitty.conf.bak create mode 100644 home/config/waybar/screenshader.xml delete mode 100644 home/config/waybar/style copy.css create mode 100755 usr/local/bin/capsnote create mode 100755 usr/local/bin/hyprm-dnd create mode 100755 usr/local/bin/hyprm-i18n create mode 100755 usr/local/bin/hyprm-waybar-cpugov create mode 100755 usr/local/bin/hyprm-waybar-gpustat create mode 100755 usr/local/bin/hyprm-waybar-sink create mode 100755 usr/local/bin/hyprm-waybar-weather create mode 100755 usr/local/bin/hyprshade-waybar diff --git a/home/.bashrc b/home/.bashrc index 6dc2f16..e795287 100644 --- a/home/.bashrc +++ b/home/.bashrc @@ -10,7 +10,7 @@ #PS1="\W:\$ " export PS1="󰣇 \[$(tput setaf 6)\]\W \[$(tput sgr0)\] " -export SUDO_EDITOR=/usr/bin/nvim +export SUDO_EDITOR="subl -w" bind 'set show-all-if-ambiguous on' bind 'TAB:menu-complete' diff --git a/home/.zshrc b/home/.zshrc index b35136d..46a71bb 100644 --- a/home/.zshrc +++ b/home/.zshrc @@ -5,17 +5,9 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]] source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" fi - - # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh - -export LANG=de_DE.UTF-8 -export EDITOR="nvim" -export SUDO_EDITOR="nvim" -export MOZ_ENABLE_WAYLAND=1 - # set PATH so it includes user's private ~/.local/bin if it exists if [ -d "$HOME/.local/bin" ] ; then PATH="$HOME/.local/bin:$PATH" @@ -30,21 +22,10 @@ TERM_NAME=(ps -o 'cmd=' -p $TERM_ID) if [[ "$TERM_NAME" = "kitty" ]]; then alias ssh="kitty +kitten ssh" else - alias ssh="TERM=xterm-256color ssh" + alias ssh="TERM=xterm-256color ssh" fi -alias l="lsd -l --group-dirs first --size short --config-file ~/.config/lsd/config.yaml" -alias ls="lsd" +alias fl='lsd -l -h -1 --group-dirs first -X --config-file ~/.config/lsd/config.yaml' alias orphans='[[ -n $(pacman -Qdt) ]] && sudo pacman -Rs $(pacman -Qdtq) || echo "no orphans to remove"' -#alias web="" - -web() { - xdg-open "https://search.moonarch.de/search?q=$@" -} - -f() { - fff "$@" - cd "$(cat "${XDG_CACHE_HOME:=${HOME}/.cache}/fff/.fff_d")" -} bindkey "^[[3~" delete-char bindkey "^[[H" beginning-of-line @@ -52,40 +33,12 @@ bindkey "^[[F" end-of-line bindkey "^[[1;5C" forward-word bindkey "^[[1;5D" backward-word - - - plugins=(zsh-interactive-cd git aliases docker archlinux sudo vscode) - - -# autoload -Uz compinit vcs_info promptinit colors && colors -# compinit -# promptinit - -# # This will set the default prompt theme -# prompt redhat - -# # git info -# precmd_vcs_info() { vcs_info } -# precmd_functions+=( precmd_vcs_info ) -# setopt prompt_subst -# RPROMPT='${vcs_info_msg_0_}' -# # PROMPT='${vcs_info_msg_0_}%# ' -# zstyle ':vcs_info:git:*' formats '%b' - -# PS1="%{$fg[red]%}%n%{$reset_color%}@%{$fg[blue]%}%m %{$fg[yellow]%}%(5~|%-1~/.../%3~|%4~) %{$reset_color%}%% " - export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion - - - - - - source /usr/share/oh-my-zsh/oh-my-zsh.sh source ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/themes/powerlevel10k/powerlevel10k.zsh-theme source ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh diff --git a/home/config/VSCodium/User/settings.json b/home/config/VSCodium/User/settings.json index 6180ff3..27405d8 100644 --- a/home/config/VSCodium/User/settings.json +++ b/home/config/VSCodium/User/settings.json @@ -1,20 +1,36 @@ { - "window.menuBarVisibility": "toggle", - "workbench.iconTheme": "catppuccin-mocha", - "workbench.colorTheme": "Catppuccin Mocha", - "workbench.startupEditor": "none", - "php.validate.run": "onSave", - "php.validate.executablePath": "/usr/bin/php", - "[vue]": { - "editor.defaultFormatter": "Vue.volar" - }, - "editor.fontFamily": "'JetBrainsMono Nerd Font', 'monospace', monospace", - "editor.tabSize": 2, - "diffEditor.ignoreTrimWhitespace": false, - "security.workspace.trust.untrustedFiles": "open", - "editor.fontLigatures": true, - "editor.fontSize": 12, - "workbench.externalBrowser": "firefox", - "typescript.updateImportsOnFileMove.enabled": "always", - "editor.minimap.enabled": false -} \ No newline at end of file + "window.menuBarVisibility": "toggle", + "workbench.iconTheme": "catppuccin-mocha", + "workbench.colorTheme": "Catppuccin Mocha", + "workbench.startupEditor": "none", + "php.validate.run": "onSave", + "php.validate.executablePath": "/usr/bin/php", + "editor.fontFamily": "'JetBrainsMono Nerd Font', 'monospace', monospace", + "editor.tabSize": 2, + "diffEditor.ignoreTrimWhitespace": false, + "security.workspace.trust.untrustedFiles": "open", + "editor.fontLigatures": true, + "editor.fontSize": 12, + "workbench.externalBrowser": "firefox", + "typescript.updateImportsOnFileMove.enabled": "always", + "editor.minimap.enabled": false, + "indentRainbow.colors": [ + "rgba(17,17,17,0.1)", + "rgba(17,17,17,0.2)", + "rgba(17,17,17,0.3)", + "rgba(17,17,17,0.4)", + "rgba(17,17,17,0.5)", + "rgba(17,17,17,0.6)", + "rgba(17,17,17,0.7)", + "rgba(17,17,17,0.8)", + "rgba(17,17,17,0.9)", + "rgba(17,17,17,1.0)" + ], + "[json]": { + "editor.defaultFormatter": "vscode.json-language-features" + }, + "workbench.tree.renderIndentGuides": "always", + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + } +} diff --git a/home/config/alacritty/alacritty.toml b/home/config/alacritty/alacritty.toml index 7639575..21b21a4 100644 --- a/home/config/alacritty/alacritty.toml +++ b/home/config/alacritty/alacritty.toml @@ -1,14 +1,13 @@ -import = [ - "~/.config/alacritty/catppuccin-mocha.toml" -] [window] +padding.x = 10 +padding.y = 10 + decorations = "None" -dynamic_padding = false +dynamic_padding = true opacity = 0.8 startup_mode = "Windowed" dynamic_title = true - [font] size = 11.0 @@ -30,11 +29,14 @@ style = "Regular" [keyboard] bindings = [ - { key = "Return", mods = "Control|Shift", action = "SpawnNewInstance" } #ctrl + shift + enter = open new instance in same dir + { key = "Return", mods = "Control|Shift", action = "SpawnNewInstance" }, #ctrl + shift + enter = open new instance in same dir ] [cursor] -style = "Beam" +style = "Block" [mouse] -hide_when_typing = true +hide_when_typing = false + +[general] +import = ["~/.config/alacritty/catppuccin-mocha.toml"] diff --git a/home/config/alacritty/catppuccin-mocha.toml b/home/config/alacritty/catppuccin-mocha.toml index 0f202c8..1af36f7 100644 --- a/home/config/alacritty/catppuccin-mocha.toml +++ b/home/config/alacritty/catppuccin-mocha.toml @@ -1,6 +1,6 @@ #https://github.com/catppuccin/alacritty/raw/main/catppuccin-mocha.toml [colors.primary] -background = "#1E1E2E" +background = "#181825" foreground = "#CDD6F4" dim_foreground = "#CDD6F4" bright_foreground = "#CDD6F4" diff --git a/home/config/gtk-3.0/gtk.css b/home/config/gtk-3.0/gtk.css new file mode 100644 index 0000000..24d0653 --- /dev/null +++ b/home/config/gtk-3.0/gtk.css @@ -0,0 +1,15 @@ +* { + text-shadow: none; +} + +/* remove window title from Client-Side Decorations */ +.solid-csd headerbar .title { + font-size: 0; +} + +/* hide extra window decorations/double border */ +window decoration { + margin: 0; + border: none; + padding: 0; +} \ No newline at end of file diff --git a/home/config/hypr/filter/blank.frag b/home/config/hypr/filter/blank.frag new file mode 100644 index 0000000..d848008 --- /dev/null +++ b/home/config/hypr/filter/blank.frag @@ -0,0 +1,10 @@ +// blank shader + +precision mediump float; +varying vec2 v_texcoord; +uniform sampler2D tex; + +void main() { + vec4 pixColor = texture2D(tex, v_texcoord); + gl_FragColor = pixColor; +} diff --git a/home/config/hypr/filter/blue-light.frag b/home/config/hypr/filter/blue-light.frag new file mode 100644 index 0000000..5eeac17 --- /dev/null +++ b/home/config/hypr/filter/blue-light.frag @@ -0,0 +1,16 @@ +// +// Example blue light filter shader. +// + +precision mediump float; +varying vec2 v_texcoord; +uniform sampler2D tex; + +void main() { + + vec4 pixColor = texture2D(tex, v_texcoord); + + pixColor[2] *= 0.8; + + gl_FragColor = pixColor; +} diff --git a/home/config/hypr/hl-animation.conf b/home/config/hypr/hl-animation.conf index 327b92c..e1f5b34 100644 --- a/home/config/hypr/hl-animation.conf +++ b/home/config/hypr/hl-animation.conf @@ -4,11 +4,18 @@ bezier = overshot, 0.05, 0.9, 0.1, 1.1 bezier = smoothOut, 0.36, 0, 0.66, -0.56 bezier = smoothIn, 0.25, 1, 0.5, 1 +bezier = easeOutQuint,0.23,1,0.32,1 +bezier = easeInOutCubic,0.65,0.05,0.36,1 +bezier = linear,0,0,1,1 +bezier = almostLinear,0.5,0.5,0.75,1.0 +bezier = quick,0.15,0,0.1,1 + + animations { enabled=1 animation = windows,1,5,overshot,slide # slide or popin animation = windowsOut, 1, 8,smoothOut,slide - animation = windowsMove, 1, 5,default + animation = windowsMove, 1, 5, default animation = border,1,4,default animation = fade, 1, 5, smoothIn animation = fadeOut, 1, 5, smoothIn diff --git a/home/config/hypr/hl-autostart.conf b/home/config/hypr/hl-autostart.conf index c4c7cbf..bd2ae6b 100644 --- a/home/config/hypr/hl-autostart.conf +++ b/home/config/hypr/hl-autostart.conf @@ -9,10 +9,12 @@ exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CUR exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = ~/.config/hypr/xdg-portal-hyprland + #exec-once = lxpolkit exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec-once = waypaper --restore +#exec-once = hyprpanel exec-once = waybar exec-once = dunst # exec-once = swayosd-server @@ -22,5 +24,7 @@ exec-once = wl-paste --watch cliphist store #Stores only text data exec-once = wl-paste --type image --watch cliphist store #Stores only image data exec-once = hypridle +exec = hyprshade off + # exec-once = sway-audio-idle-inhibit #exec-once = xdg-mime default pcmanfm.desktop inode/directory \ No newline at end of file diff --git a/home/config/hypr/hl-decoration.conf b/home/config/hypr/hl-decoration.conf index 58f0edc..f2cacf7 100644 --- a/home/config/hypr/hl-decoration.conf +++ b/home/config/hypr/hl-decoration.conf @@ -1,7 +1,7 @@ decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more - rounding = 10 + rounding = 4 blur { enabled = true diff --git a/home/config/hypr/hl-env.conf b/home/config/hypr/hl-env.conf index 481641a..877d7a0 100644 --- a/home/config/hypr/hl-env.conf +++ b/home/config/hypr/hl-env.conf @@ -1,12 +1,23 @@ +env = GDK_BACKEND,wayland,x11,* +env = QT_QPA_PLATFORM,wayland +env = SDL_VIDEODRIVER,wayland +env = CLUTTER_BACKEND,wayland + +env = QT_AUTO_SCREEN_SCALE_FACTOR,1 +env = QT_QPA_PLATFORM,wayland;xcb +env = QT_QPA_PLATFORMTHEME,qt6ct +env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 + +#env = XCURSOR_THEME,Sweet Cursors” #env = XCURSOR_SIZE,24 + env = XDG_CURRENT_DESKTOP,Hyprland env = XDG_SESSION_DESKTOP,Hyprland -env = WINDOW_MANAGER,Hyprland env = XDG_SESSION_TYPE,wayland -env = QT_QPA_PLATFORMTHEME,qt6ct # change to qt6ct if you have that +env = WINDOW_MANAGER,Hyprland #env = GTK_THEME,Catppuccin-Mocha-Standard-Lavender-Dark env = LANG,de_DE.UTF-8 -env = EDITOR,"nvim" -env = SUDO_EDITOR,"nvim" +env = EDITOR,"subl" +env = SUDO_EDITOR,"subl -w" env = MOZ_ENABLE_WAYLAND,1 \ No newline at end of file diff --git a/home/config/hypr/hl-general.conf b/home/config/hypr/hl-general.conf index 46c2549..8a05b5e 100644 --- a/home/config/hypr/hl-general.conf +++ b/home/config/hypr/hl-general.conf @@ -3,9 +3,9 @@ general { gaps_in = 4 gaps_out = 8 - border_size = 2 - col.active_border = rgba(7f849cFF) - col.inactive_border = rgba(1e1e2eFF) + border_size = 1 + col.active_border = rgba(7f849c80) + col.inactive_border = rgba(1e1e2e80) layout = dwindle diff --git a/home/config/hypr/hl-keybindings.conf b/home/config/hypr/hl-keybindings.conf index e41c66d..b6a4b8a 100644 --- a/home/config/hypr/hl-keybindings.conf +++ b/home/config/hypr/hl-keybindings.conf @@ -18,6 +18,7 @@ bind = $mainMod, N, exec, pkill rofi || ~/.config/rofi/nm-vpn/nm-vpn.sh bind = $mainMod, R, exec, pkill rofi || ~/.config/rofi/launcher/launcher.sh run bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, Q, killactive, +bind = $mainMod, S, exec, pkill rofi || rofi -show "ssh" bind = $mainMod, T, exec, pkill rofi || rofi -show fb -modes "fb:~/.config/rofi/settings-menu/setmen.sh" -theme $HOME/.config/rofi/settings-menu/settings-menu.rasi bind = $mainMod, U, exec, $HOME/.config/conky/conkytoggler bind = $mainMod, V, togglefloating, @@ -27,10 +28,10 @@ bind = $mainMod, F4, exec, wlogout -P 1 -s -r 10 -c 10 bind = $mainMod, escape, exec, killall -SIGUSR1 # Move focus with mainMod -bind = $mainMod, H, movefocus, l -bind = $mainMod, J, movefocus, d -bind = $mainMod, K, movefocus, u -bind = $mainMod, L, movefocus, r +# bind = $mainMod, H, movefocus, l +# bind = $mainMod, J, movefocus, d +# bind = $mainMod, K, movefocus, u +# bind = $mainMod, L, movefocus, r # Move window with mainMod + arrow keys bind = $mainMod, left, movewindow, l @@ -72,7 +73,10 @@ bindm = $mainMod, mouse:273, resizewindow #bind = ALT, TAB, exec, pkill rofi || ~/.config/rofi/launcher/launcher.sh window bind = ALT,W, exec, killall waybar && waybar & -bind = $mainMod,tab,hycov:toggleoverview +#bind = $mainMod,tab,hycov:toggleoverview +bind = $mainMod,tab, exec, hyprnome + + #bind = $mainMod,tab,exec, pkill rofi || rofi -show window -theme $HOME/.config/rofi/app-switcher/app-switcher.rasi #bind = $mainMod, L, exec, swaync-client -t -sw #bind = $mainMod, K, exec, xkill @@ -80,9 +84,10 @@ bind = $mainMod,tab,hycov:toggleoverview bind=,PRINT,exec, hyprm-screenshot #bind=,PRINT,exec, pkill rofi || ~/.config/rofi/screenshot/screenshot.sh bind = CTRL ALT, DELETE, exec, alacritty -t "BTOP" -e btop -p 1 +#bind = CTRL ALT, DELETE, exec, sysmontask #bind = CTRL ALT, DELETE, exec, env GTK_THEME=Adwaita:dark resources -bind = $mainMod, O, exec, ~/.config/rofi/powermenu/powermenu.sh +#ind = $mainMod, O, exec, ~/.config/rofi/powermenu/powermenu.sh diff --git a/home/config/hypr/hl-windowrules.conf b/home/config/hypr/hl-windowrules.conf index 5f2ad78..b61b5d0 100644 --- a/home/config/hypr/hl-windowrules.conf +++ b/home/config/hypr/hl-windowrules.conf @@ -69,6 +69,14 @@ windowrule = float, title:^(BTOP)$ #windowrule = size 1024 768, title:^(BTOP)$ windowrule = center, title:^(BTOP)$ +windowrule = float, title:^(sysmontask)$ +windowrule = size 1024 768, title:^(sysmontask)$ +windowrule = center, title:^(sysmontask)$ + +windowrule = float, title:^(missioncenter)$ +windowrule = size 1024 768, title:^(missioncenter)$ +windowrule = center, title:^(missioncenter)$ + windowrule = float, title:^(Picture-in-Picture)$ windowrule = size 800 600, title:^(Volume Control)$ windowrule = move 75 44%, title:^(Volume Control)$ @@ -124,3 +132,9 @@ windowrule = center, title:^(FontManager)$ windowrule = float, title:^(Celluloid)$ windowrule = center, title:^(Celluloid)$ + + + +layerrule = blur, waybar +layerrule = blur, rofi +layerrule = dimaround, rofi \ No newline at end of file diff --git a/home/config/kitty/current-theme.conf b/home/config/kitty/current-theme.conf new file mode 100644 index 0000000..2533db7 --- /dev/null +++ b/home/config/kitty/current-theme.conf @@ -0,0 +1,80 @@ +# vim:ft=kitty + +## name: Catppuccin-Mocha +## author: Pocco81 (https://github.com/Pocco81) +## license: MIT +## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf +## blurb: Soothing pastel theme for the high-spirited! + + + +# The basic colors +foreground #CDD6F4 +background #1E1E2E +selection_foreground #1E1E2E +selection_background #F5E0DC + +# Cursor colors +cursor #F5E0DC +cursor_text_color #1E1E2E + +# URL underline color when hovering with mouse +url_color #F5E0DC + +# Kitty window border colors +active_border_color #B4BEFE +inactive_border_color #6C7086 +bell_border_color #F9E2AF + +# OS Window titlebar colors +wayland_titlebar_color system +macos_titlebar_color system + +# Tab bar colors +active_tab_foreground #11111B +active_tab_background #CBA6F7 +inactive_tab_foreground #CDD6F4 +inactive_tab_background #181825 +tab_bar_background #11111B + +# Colors for marks (marked text in the terminal) +mark1_foreground #1E1E2E +mark1_background #B4BEFE +mark2_foreground #1E1E2E +mark2_background #CBA6F7 +mark3_foreground #1E1E2E +mark3_background #74C7EC + +# The 16 terminal colors + +# black +color0 #45475A +color8 #585B70 + +# red +color1 #F38BA8 +color9 #F38BA8 + +# green +color2 #A6E3A1 +color10 #A6E3A1 + +# yellow +color3 #F9E2AF +color11 #F9E2AF + +# blue +color4 #89B4FA +color12 #89B4FA + +# magenta +color5 #F5C2E7 +color13 #F5C2E7 + +# cyan +color6 #94E2D5 +color14 #94E2D5 + +# white +color7 #BAC2DE +color15 #A6ADC8 diff --git a/home/config/kitty/custom.conf b/home/config/kitty/custom.conf index d94f08d..3a6182a 100644 --- a/home/config/kitty/custom.conf +++ b/home/config/kitty/custom.conf @@ -3,6 +3,8 @@ # - https://gist.github.com/marcusramberg/64010234c95a93d953e8c79fdaf94192 # - https://github.com/arcticicestudio/nord-hyper + + background_opacity 0.9 foreground #D8DEE9 background #24273a diff --git a/home/config/kitty/kitty.conf b/home/config/kitty/kitty.conf index 7197228..349c0b2 100644 --- a/home/config/kitty/kitty.conf +++ b/home/config/kitty/kitty.conf @@ -1,15 +1,15 @@ -font_family JetBrainsMono Nerd Font -bold_font auto -italic_font auto -bold_italic_font auto +# font_family JetBrainsMono Nerd Font +# bold_font auto +# italic_font auto +# bold_italic_font auto font_size 10.0 -disable_ligatures never +disable_ligatures cursor cursor_shape beam enable_audio_bell no -window_padding_width 10 10 +#window_padding_width 10 10 open_url_with firefox @@ -24,12 +24,13 @@ tab_title_template " {index}: {title[title.rfind('/')+1:]}" editor nvim -set-window-title "kitty" - sync_to_monitor yes +background_opacity 0.8 -include ./custom.conf +allow_remote_control yes + +#include ./custom.conf # Key mapping @@ -87,4 +88,17 @@ map ctrl+shift+, move_tab_backward # Miscellaneous map ctrl+shift+up increase_font_size map ctrl+shift+down decrease_font_size -map ctrl+shift+backspace restore_font_size \ No newline at end of file +map ctrl+shift+backspace restore_font_size + +# BEGIN_KITTY_FONTS +font_family family="JetBrainsMono Nerd Font Mono" +bold_font auto +italic_font auto +bold_italic_font auto +# END_KITTY_FONTS + + +# BEGIN_KITTY_THEME +# Catppuccin-Mocha +include current-theme.conf +# END_KITTY_THEME diff --git a/home/config/kitty/kitty.conf.bak b/home/config/kitty/kitty.conf.bak new file mode 100644 index 0000000..b450929 --- /dev/null +++ b/home/config/kitty/kitty.conf.bak @@ -0,0 +1,94 @@ +# font_family JetBrainsMono Nerd Font +# bold_font auto +# italic_font auto +# bold_italic_font auto + +font_size 10.0 +disable_ligatures cursor + +cursor_shape beam +enable_audio_bell no + +window_padding_width 10 10 + +open_url_with firefox + +copy_on_select true + +update_check_interval 0 + +confirm_os_window_close 0 + +tab_bar_style separator +tab_title_template " {index}: {title[title.rfind('/')+1:]}" + +editor nvim + +sync_to_monitor yes + +#include ./custom.conf + + +# Key mapping +# For a list of key names, see: http://www.glfw.org/docs/latest/group__keys.html +# For a list of modifier names, see: http://www.glfw.org/docs/latest/group__mods.html +# You can use the special action no_op to unmap a keyboard shortcut that is +# assigned in the default configuration. + +# Clipboard +map super+v paste_from_clipboard +map ctrl+shift+s paste_from_selection +map super+c copy_to_clipboard +map shift+insert paste_from_selection + +# Scrolling +map ctrl+shift+up scroll_line_up +map ctrl+shift+down scroll_line_down +map ctrl+shift+k scroll_line_up +map ctrl+shift+j scroll_line_down +map ctrl+shift+page_up scroll_page_up +map ctrl+shift+page_down scroll_page_down +map ctrl+shift+home scroll_home +map ctrl+shift+end scroll_end +map ctrl+shift+h show_scrollback + +# Window management +map super+n new_os_window +map super+w close_window +map ctrl+shift+enter new_window +map ctrl+shift+] next_window +map ctrl+shift+[ previous_window +map ctrl+shift+f move_window_forward +map ctrl+shift+b move_window_backward +map ctrl+shift+` move_window_to_top +map ctrl+shift+1 first_window +map ctrl+shift+2 second_window +map ctrl+shift+3 third_window +map ctrl+shift+4 fourth_window +map ctrl+shift+5 fifth_window +map ctrl+shift+6 sixth_window +map ctrl+shift+7 seventh_window +map ctrl+shift+8 eighth_window +map ctrl+shift+9 ninth_window +map ctrl+shift+0 tenth_window + +# Tab management +map ctrl+shift+right next_tab +map ctrl+shift+left previous_tab +map ctrl+shift+t new_tab +map ctrl+shift+q close_tab +map ctrl+shift+l next_layout +map ctrl+shift+. move_tab_forward +map ctrl+shift+, move_tab_backward + +# Miscellaneous +map ctrl+shift+up increase_font_size +map ctrl+shift+down decrease_font_size +map ctrl+shift+backspace restore_font_size + +# BEGIN_KITTY_FONTS +font_family family="JetBrainsMono Nerd Font Mono" +bold_font auto +italic_font auto +bold_italic_font auto +# END_KITTY_FONTS diff --git a/home/config/rofi/config.rasi b/home/config/rofi/config.rasi index 7e5b1c5..dc914d9 100644 --- a/home/config/rofi/config.rasi +++ b/home/config/rofi/config.rasi @@ -22,6 +22,7 @@ configuration { sidebar-mode: true; threads: 0; scroll-method: 0; + ssh-command: "sshfs_connect {host}"; } /*****----- Global Properties -----*****/ @@ -52,8 +53,8 @@ configuration { alternate-active-foreground: var(background); font: "JetBrainsMono Nerd Font 11"; - border-radius: 10px; - frame-border: 2px solid; + border-radius: 4px; + frame-border: 1px solid; } @@ -79,7 +80,7 @@ window { border-color: var(borders); cursor: "default"; - background-color: @theme-bg-color; + background-color: @theme-bg-color-shade-3; } @@ -183,7 +184,7 @@ listview { scrollbar { handle-width: 5px; handle-color: @handle-colour; - border-radius: 10px; + border-radius: var(border-radius); background-color: transparent; } @@ -194,7 +195,7 @@ element { margin: 0px; padding: 5px 10px; border: 0px solid; - border-radius: 10px; + border-radius: var(border-radius); border-color: @borders; background-color: transparent; text-color: var(theme-text-color); @@ -212,19 +213,19 @@ element normal.urgent { } element normal.active { background-color: var(normal-foreground); - text-color: var(normal-background); + text-color: var(theme-bg-color-shade-1); } element selected.normal { - background-color: var(theme-selected-bg-color); - text-color: var(theme-selected-fg-color); + background-color: var(theme-selected-fg-color); + text-color: var(theme-selected-bg-color); } element selected.urgent { - background-color: var(theme-selected-bg-color); - text-color: var(normal-background); + background-color: var(theme-bg-color-shade-1); + text-color: var(theme-text-color); } element selected.active { background-color: var(error-color); - text-color: var(normal-background); + text-color: var(theme-text-color); } element-icon { @@ -257,15 +258,15 @@ mode-switcher{ button { padding: 2px 14px 2px 9px; border: 0px solid; - border-radius: 10px; + border-radius: var(border-radius); border-color: @borders; - background-color: @theme-selected-bg-color; - text-color: var(theme-base-color); + background-color: @theme-bg-color-shade-1; + text-color: var(theme-selected-bg-color); cursor: pointer; } button selected { - background-color: var(selected-normal-background); - text-color: var(selected-normal-foreground); + background-color: var(theme-selected-fg-color); + text-color: var(theme-selected-bg-color); } /*****----- Message -----*****/ @@ -282,7 +283,8 @@ message { textbox { padding: 30px 10px 0 10px; border: 0px solid; - border-radius: 10px 10px 0 0; + /*border-radius: 10px 10px 0 0;*/ + border-radius: 0 0 0 0; border-color: @borders; background-color: transparent; font: "JetBrainsMono Nerd Font 12"; @@ -296,7 +298,7 @@ textbox { error-message { padding: 10px; border: 2px solid; - border-radius: 10px; + border-radius: var(border-radius); border-color: @borders; background-color: @background; text-color: var(theme-text-color); diff --git a/home/config/waybar/config b/home/config/waybar/config index d2348e5..412f4ae 100644 --- a/home/config/waybar/config +++ b/home/config/waybar/config @@ -1,21 +1,39 @@ { - "layer": "top", - "margin-top": 5, + "layer": "top", + "margin-top": 0, "spacing": 5, - "modules-left": ["group/sys", "tray", "hyprland/workspaces"], - "modules-center": ["mpris", "wlr/taskbar"], - "modules-right": ["custom/cpugov", "group/net", "group/sound", "cava", "group/indicators"], + "modules-left": [ + "group/sys", + "hyprland/workspaces", + "tray" + ], + "modules-center": [ + "mpris", + "wlr/taskbar" + ], + "modules-right": [ + "custom/cpugov", + "group/net", + "group/sound", + "cava", + "group/indicators" + ], "group/indicators": { "orientation": "inherit", "modules": [ - "gamemode", "custom/updates", "idle_inhibitor" + "gamemode", + "custom/updates", + "idle_inhibitor", + "custom/screenshader", + "custom/dnd", + "privacy" ] }, "group/net": { "orientation": "inherit", "modules": [ "custom/vpn", - "network", + "network", "bluetooth" ] }, @@ -23,7 +41,7 @@ "orientation": "inherit", "modules": [ "custom/cpugov", - "cpu", + "cpu", "memory", "custom/gpu-usage" ], @@ -35,7 +53,8 @@ "group/sound": { "orientation": "inherit", "modules": [ - "pulseaudio", "pulseaudio/slider" + "pulseaudio", + "pulseaudio/slider" ], "drawer": { "transition-duration": 500, @@ -45,20 +64,25 @@ "group/sys": { "orientation": "inherit", "modules": [ - "custom/power", "clock" + "custom/power", + "clock" ] }, "network": { "format-wifi": "{icon}", "format-ethernet": " {ifname}", - "format-disconnected": "󰱟 Offline", + "format-disconnected": "󰱟 Offline", "tooltip-format": "󰊗 {ifname} via {gwaddr}", "tooltip-format-wifi": " WiFi {essid} ({signalStrength}%)", "tooltip-format-ethernet": "󰱔 {ifname}", "tooltip-format-disconnected": "Disconnected", - "max-length": 50, "on-click": "nm-connection-editor", - "format-icons": ["󱛅", "󱛂", "󱛃", "󱚽"], + "format-icons": [ + "󱛅", + "󱛂", + "󱛃", + "󱚽" + ], "max-length": 5 }, "tray": { @@ -71,34 +95,32 @@ "format": "{:%d.%m. %H:%M}", "timezone": "DE", "calendar": { - "mode" : "month", - "mode-mon-col" : 3, - "weeks-pos" : "right", - "on-scroll" : 1, + "mode": "month", + "mode-mon-col": 3, + "weeks-pos": "right", + "on-scroll": 1, "on-click-right": "mode", "format": { - "months": "{}", - "days": "{}", - "weeks": "W{}", - "weekdays": "{}", - "today": "{}" - } - }, - "actions": { - "on-click-right": "mode", - "on-click-forward": "tz_up", - "on-click-backward": "tz_down", - "on-scroll-up": "shift_up", - "on-scroll-down": "shift_down", - "on-click-middle": "alarm-clock-applet" + "months": "{}", + "days": "{}", + "weeks": "W{}", + "weekdays": "{}", + "today": "{}" } - // "on-click": "evolution" + }, + "actions": { + "on-click-right": "mode", + "on-click-forward": "tz_up", + "on-click-backward": "tz_down", + "on-scroll-up": "shift_up", + "on-scroll-down": "shift_down", + "on-click-middle": "alarm-clock-applet" + } + // "on-click": "evolution" }, "user": { "format": "{user}", "interval": 240, - "height": 30, - "width": 30, "icon": false, "height": 16, "width": 16, @@ -118,7 +140,11 @@ "phone": "", "portable": "", "car": "", - "default": ["", "", "󰕾"] + "default": [ + "", + "", + "󰕾" + ] }, "on-click": "$HOME/.config/rofi/audio/rofi-sink-switcher.sh &", "on-click-right": "pavucontrol", @@ -144,8 +170,8 @@ "paused": "⏸" } }, - "custom/power": { - "format": "󰣇", + "custom/power": { + "format": "󰣇", "menu": "on-click", "menu-file": "~/.config/waybar/session_menu.xml", "menu-actions": { @@ -156,7 +182,7 @@ "suspend": "systemctl suspend", "shutdown": "systemctl poweroff" } - }, + }, "gamemode": { "format": "{glyph}{count}", "format-alt": "{glyph}", @@ -179,64 +205,69 @@ "on-click-middle": "close", "on-right-middle": "minimize-raise", "active-first": false, - "ignore-list": [ - ], + "ignore-list": ["title<>"], "app_ids-mapping": { - "firefoxdeveloperedition": "firefox-developer-edition" + "firefoxdeveloperedition": "firefox-developer-edition" }, "rewrite": { "Mozilla Firefox": "Firefox", - "Visual Studio Code": "Code", - "Alacritty": "Terminal" - } + "firefox": "Firefox", + "VSCodium": "Code", + "codium": "Code", + "Alacritty": "Terminal", + }, + "squash-list": [ + "firefox" + ] }, "hyprland/workspaces": { - "format": "{name}{windows}", + "format": "{name} {windows}", "active-only": false, - "window-rewrite-default": " 󰘔", + "window-rewrite-default": "󰘔", "on-click": "activate", "format-window-separator": " ", "format-icons": { - "urgent": "", - "focused": "", - "active": "", - "default": "" + "urgent": "", + "focused": "", + "active": "", + "default": "" }, "window-rewrite": { - "firefox": " ", - "mercury-default": " ", - "LibreWolf": " ", - "celluloid": " ", - "videostream": " ", - "mpv": " ", - "rust": " ", - "private browsing": " ", - "google": " ", - "chrome": " ", - "Chromium": " ", - "nemo": " ", - "pcmanfm": " ", - "libreoffice calc": " ", - "libreoffice writer": " 󰈙", - "libreoffice": " 󰈙", - "vim": " ", - "nvim": " ", - "viewnior": " ", - "transmission": " ", - "music": " ", - "audacious": " ", - "webcord": " 󰙯", - "armcord": " 󰙯", - "goofcord": " 󰙯", - "discord": " 󰙯", - "Steam": " 󰓓", - "Teams": " 󰊻", - "kitty": " ", - "alacritty": " ", - "foot": " ", - "code": " 󰨞", - "codium": " 󰅨", - "subl": " " + "firefox": "", + "mercury-default": "", + "LibreWolf": "", + "celluloid": "", + "videostream": "", + "mpv": "", + "rust": "", + "private browsing": "", + "google": "", + "chrome": "", + "Chromium": "", + "nemo": "", + "pcmanfm": "", + "libreoffice calc": "", + "libreoffice writer": "󰈙", + "libreoffice": "󰈙", + "vim": "", + "nvim": "", + "viewnior": "", + "transmission": "", + "music": "", + "audacious": "", + "webcord": "󰙯", + "armcord": "󰙯", + "goofcord": "󰙯", + "discord": "󰙯", + "Steam": "󰓓", + "Teams": "󰊻", + "kitty": "", + "alacritty": "", + "foot": "", + "code": "󰨞", + "codium": "󰅨", + "subl": "", + "title<>": "" }, "sort-by-number": true }, @@ -259,20 +290,41 @@ }, "exec-if": "which waybar-module-pacman-updates", "exec": "waybar-module-pacman-updates", - "on-click": "paru" + "on-click": "alacritty paru" + }, + "custom/dnd": { + "format": " {} ", + "exec": "hyprm-dnd", + "return-type": "json", + "on-click": "dunstctl set-paused toggle", + "restart-interval": 1, + }, + "custom/screenshader": { + "format": " {} ", + "menu": "on-click", + "menu-file": "~/.config/waybar/screenshader.xml", + "menu-actions": { + "blue-light-heavy": "hyprshade on blue-light-filter", + "blue-light-soft": "hyprshade on blue-light-alt", + "off": "hyprshade off" + }, + "exec-if": "hyprshade", + "exec": "hyprshade-waybar", + "return-type": "json", + "restart-interval": 1000 }, "custom/notification": { "tooltip": false, "format": "{icon} {}", "format-icons": { - "notification": "󰂞", - "none": "󰂜", - "dnd-notification": "󰂛", - "dnd-none": "󰂛", - "inhibited-notification": "󰂜", - "inhibited-none": "󰂜", - "dnd-inhibited-notification": "󰂛", - "dnd-inhibited-none": "󰂛" + "notification": "󰂞", + "none": "󰂜", + "dnd-notification": "󰂛", + "dnd-none": "󰂛", + "inhibited-notification": "󰂜", + "inhibited-none": "󰂜", + "dnd-inhibited-notification": "󰂛", + "dnd-inhibited-none": "󰂛" }, "return-type": "json", "exec-if": "which swaync-client", @@ -300,7 +352,16 @@ "noise_reduction": 0.77, "input_delay": 2, "sleep_timer": 5, - "format-icons" : ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" ], + "format-icons": [ + "▁", + "▂", + "▃", + "▄", + "▅", + "▆", + "▇", + "█" + ], "actions": { "on-click-right": "mode" } @@ -317,8 +378,8 @@ "▅", // yellow "▆", // yellow "▇", // orange - "█" // red - ] + "█" // red + ] }, "memory": { "interval": 30, @@ -333,19 +394,17 @@ "▅", // yellow "▆", // yellow "▇", // orange - "█" // red - ] + "█" // red + ] }, "custom/cpugov": { - "exec": "$HOME/.config/waybar/waybar-cpugov", + "exec": "hyprm-waybar-cpugov", "return-type": "json", "restart-interval": 10, - "on-click": "$HOME/.config/rofi/cpugov/rofi-cpugov.sh", - "on-click-right": "env GTK_THEME=Adwaita:dark resources" + "on-click": "$HOME/.config/rofi/cpugov/rofi-cpugov.sh" }, "custom/gpu-usage": { - "exec": "$HOME/.config/waybar/waybar-gpustat", - + "exec": "hyprm-waybar-gpustat", "return-type": "json", "restart-interval": 10 }, @@ -356,7 +415,13 @@ "critical": 15 }, "format": "{capacity}% {icon}", - "format-icons": ["", "", "", "", ""], + "format-icons": [ + "", + "", + "", + "", + "" + ], "max-length": 25 }, "bluetooth": { @@ -390,10 +455,10 @@ "tooltip-format": "Power profile: {profile}\nDriver: {driver}", "tooltip": true, "format-icons": { - "default": "󰓅", - "performance": "󰓅", - "balanced": "󰾅", - "power-saver": "󰌪" + "default": "󰓅", + "performance": "󰓅", + "balanced": "󰾅", + "power-saver": "󰌪" } }, "privacy": { @@ -419,11 +484,10 @@ ] }, "custom/weather": { - "exec": "${HOME}/.config/waybar/waybar-weather Oberhausen+Germany", + "exec": "hyprm-waybar-weather NRW+Germany", "return-type": "json", "format": "{}", "tooltip": true, "interval": 3600 } -} - +} \ No newline at end of file diff --git a/home/config/waybar/screenshader.xml b/home/config/waybar/screenshader.xml new file mode 100644 index 0000000..780809c --- /dev/null +++ b/home/config/waybar/screenshader.xml @@ -0,0 +1,26 @@ + + + + + + +  Blue Light Heavy + + + + +  Blue Light Soft + + + + + + + + + +  Off + + + + \ No newline at end of file diff --git a/home/config/waybar/style copy.css b/home/config/waybar/style copy.css deleted file mode 100644 index ef0f752..0000000 --- a/home/config/waybar/style copy.css +++ /dev/null @@ -1,232 +0,0 @@ -* { - border: none; - font-family: "JetBrainsMono Nerd Font", sans-serif; - font-size: 13px; - color:alpha(@theme_text_color, 0.8); -} -window#waybar { - background: @theme_bg_color; -} -/*-----main groups----*/ -.modules-right { - margin: 0 0 0 0; - background-color:alpha(@theme_selected_bg_color, 0.15); -} -.modules-center { - margin: 0 0 0 0; -} -.modules-left { - margin: 0 0 0 0; - background-color:alpha(@theme_selected_bg_color, 0.15); -} - -/** -## ALL MODULES -**/ -#clock, -#battery, -#backlight, -#cpu, -#memory, -#bluetooth, -#temperature, -#network, -#pulseaudio, -#tray, -#mode, -#idle_inhibitor, -#workspaces, -#custom-power, -#custom-menu, -#custom-media, -#custom-notification, -#custom-updates, -#custom-pacman, -#user, -#cava, -#custom-gpu-usage, -#custom-cpugov, -#custom-vpn.connected{ - padding:0px 10px; - -} - -/** -* GROUPS -**/ -#sys, #stats, #net, #sound { - margin: 0; - padding:2px 5px 1px 5px; - border-radius:0; - color:alpha(@theme_text_color, 0.5); -} - - -/** -* SYS -**/ -#sys { - background-color:alpha(@theme_selected_bg_color, 0.1); -} -#custom-power { - margin-left:0; - margin-right:0; -} -#user { - padding-left:0; - font-weight:bold; -} - - -#stats .drawer-child { - padding-left: 10px; - padding-right: 10px; -} - -#tray { - padding-right:0 -} - -/** -* SOUND -**/ - -#cava { - background-color: transparent; - padding-left: 0; -} -#pulseaudio-slider { - padding-left: 10px; - padding-right: 10px; -} -#pulseaudio-slider slider { - min-height: 0px; - min-width: 0px; - opacity: 0; - background-image: none; - border: none; - box-shadow: none; - background-color: @insensitive_bg_color; - border:2px solid @theme_selected_bg_color; -} -#pulseaudio-slider trough { - min-height: 4px; - min-width: 80px; - border-radius: 5px; - background-color: #11111b; -} -#pulseaudio-slider highlight { - - min-width: 5px; - border-radius: 5px; - background-color: #6c7086; -} - -#custom-updates { - background-color:alpha(@theme_selected_bg_color, 0.2); - padding-right:12px -} - - -/** -* MISC -**/ -#mpris { - background-color: rgba(172,176,208, .3); - border-radius:20px; - margin: 8px 10px 8px 0px; - padding:0 10px; -} - -/** -* WORKSPACES -**/ -#workspaces { - padding:0 10px 0 10px; -} -#workspaces button { - padding: 0px 10px; - background-color: transparent; - outline:none; - border-radius: 20px; - margin: 8px 5px 8px 0px; -} -#workspaces button:last-child { - margin-right: 0; -} -#workspaces button.empty { - color:inherit; -} -#workspaces button.active { - background-color: transparent; -} -#workspaces button.visible { - background-color:alpha(@theme_selected_bg_color, 0.3); -} -#workspaces button.urgent { - color: #cc3436; -} -#workspaces button:hover { - background-color:alpha(@theme_selected_bg_color, 0.4); - box-shadow: inherit; - text-shadow: inherit; -} - - -/** -## INDICATORS -**/ -#pulseaudio.muted { - color: #cc3436; -} -#battery.charging { - color: #2dcc36; -} -#battery.warning:not(.charging) { - color: #e6e600; -} -#battery.critical:not(.charging) { - color: #cc3436; -} -#temperature.critical { - color: #cc3436; -} -#idle_inhibitor { - padding-right: 14px; - background-color:alpha(@theme_selected_bg_color, 0.2); -} -#idle_inhibitor.activated { - color:alpha(@theme_selected_bg_color, 0.9); -} - - -/** -* TASKBAR -**/ -#taskbar { - font-size:8px; - background: transparent; - opacity: 1; - padding:0; -} -#taskbar button { - border-bottom: 2px solid alpha(@borders, 0.9); - padding:6px 10px 3px 10px; - background: transparent; - transition:100ms border ease-in-out; - margin-left:4px; - border-radius:0; - font-size:8px; -} -#taskbar button:first-child { - margin-left:0; -} -#taskbar button:hover { - - background-color:alpha(@theme_selected_bg_color, 0.2); -} -#taskbar button.active { - background-color:alpha(@theme_selected_bg_color, 0.1); - border-bottom: 2px solid @borders; - opacity:1; -} \ No newline at end of file diff --git a/home/config/waybar/style.css b/home/config/waybar/style.css index 74a47ff..4b0a5bf 100644 --- a/home/config/waybar/style.css +++ b/home/config/waybar/style.css @@ -10,22 +10,21 @@ window#waybar { } /*-----main groups----*/ .modules-right { - margin: 0 5px 0 0; + margin: 0; padding-left:5px; - padding-right:10px; - border-radius: 10px; - /* background-color:alpha(@theme_selected_bg_color, 0.15); */ - background: @theme_bg_color + padding-right:0; + border-radius: 0; + } .modules-center { - margin: 0 0 0 0; - border-radius: 10px; + margin: 0; + border-radius: 0; } .modules-left { margin: 0 0 0 5px; /* background-color:alpha(@theme_selected_bg_color, 0.15); background: @theme_bg_color */ - border-radius: 10px; + border-radius: 0; margin-left: 5px; } @@ -60,7 +59,6 @@ window#waybar { #privacy, #gamemode{ padding:0px 10px; - } /** @@ -68,10 +66,7 @@ window#waybar { **/ #sys, #stats, #net, #sound { margin: 0; - - border-radius:10px; color:alpha(@theme_text_color, 0.5); - background-color: @theme_bg_color; } @@ -79,7 +74,7 @@ window#waybar { * SYS **/ #sys { - padding:0 10px 0 10px; + padding:0 0px 0 10px; } #custom-power { margin-left:0; @@ -101,9 +96,10 @@ window#waybar { } #tray { - background-color: @theme_bg_color; - border-radius:10px; - margin: 0; + border-radius: 4px; + padding: 0px 8px 0px 8px; + margin: 8px 0px 8px 0px; + background-color:alpha(@theme_selected_bg_color, 0.1); } #custom-notification { @@ -119,7 +115,7 @@ window#waybar { padding-left: 0; } #pulseaudio-slider { - padding-left: 0px; + padding-left: 10px; padding-right: 10px; } #pulseaudio-slider slider { @@ -130,13 +126,13 @@ window#waybar { border: none; box-shadow: none; background-color: @insensitive_bg_color; - border:2px solid @theme_selected_bg_color; + border:1px solid alpha(@theme_selected_bg_color, 0.1); } #pulseaudio-slider trough { min-height: 4px; min-width: 80px; border-radius: 5px; - background-color: #11111b; + background-color: alpha(@theme_selected_bg_color, 0.3); } #pulseaudio-slider highlight { @@ -155,8 +151,7 @@ window#waybar { * MISC **/ #mpris { - background-color: rgba(172,176,208, .3); - border-radius:20px; + border-radius:0; margin: 8px 10px 8px 0px; padding:0 10px; } @@ -165,33 +160,36 @@ window#waybar { * WORKSPACES **/ #workspaces { - padding:0 10px 0 0px; - border-radius:10px + padding:0; + border-radius: 0 } #workspaces button { - padding: 0px 10px; - background-color: shade(@theme_bg_color, 1); + padding: 0px 10px 0px 8px; + margin: 8px 2px 8px 0px; outline:none; - border-radius: 10px; - margin: 8px 5px 8px 0px; + border-radius: 4px; + background-color:alpha(@theme_selected_bg_color, 0.05); } #workspaces button:last-child { margin-right: 0; } -#workspaces button.empty { +#workspaces button.empty, #workspaces button.active.empty { color:inherit; + padding: 0px 0px 0px 8px; } #workspaces button.active { background-color: transparent; + padding: 0px 10px 0px 8px; } + #workspaces button.visible { - background-color: shade(@theme_bg_color, 1.5); + background-color:alpha(@theme_selected_bg_color, 0.1); } #workspaces button.urgent { color: #cc3436; } #workspaces button:hover { - background-color:alpha(@theme_selected_bg_color, 0.4); + background-color:alpha(@theme_selected_bg_color, 0.05); box-shadow: inherit; text-shadow: inherit; } @@ -223,9 +221,7 @@ window#waybar { #indicators { padding-right:5px; padding-left:5px; - background-color:shade(@theme_bg_color, 1.5); - border-radius:10px; - margin:10px 0; + border-radius:0; } @@ -234,19 +230,18 @@ window#waybar { **/ #taskbar { font-size:8px; - background: transparent; + margin:0; opacity: 1; padding:0; - border-radius:10px; - background: @theme_bg_color; + border-radius: 0; } #taskbar.empty { - background: transparent; + opacity:0; } #taskbar button { padding:3px 10px 3px 10px; transition:100ms border ease-in-out; - border-radius:10px; + border-radius: 0; font-size:8px; } @@ -254,20 +249,23 @@ window#waybar { border-radius:0px; } #taskbar button:first-child { - border-radius: 10px 0 0 10px; + } #taskbar button:last-child { - border-radius: 0 10px 10px 0; + } #taskbar button:last-child:first-child { - border-radius: 10px; + +} +#taskbar button.empty { + opacity:0; } #taskbar button:hover { - background-color:alpha(@theme_selected_bg_color, 0.2); + background-color:alpha(@theme_selected_bg_color, 0.1); } #taskbar button.active { - background-color:alpha(@theme_selected_bg_color, 0.1); + background-color:alpha(@theme_selected_bg_color, 0.05); opacity:1; } \ No newline at end of file diff --git a/home/config/waypaper/config.ini b/home/config/waypaper/config.ini index 83c3b19..053e5c8 100644 --- a/home/config/waypaper/config.ini +++ b/home/config/waypaper/config.ini @@ -1,12 +1,12 @@ [Settings] -folder = /home/dom/Pictures/Wallpaper -fill = Fill +folder = ~/Pictures/Wallpaper +fill = fill sort = name backend = swww color = #241F31 language = en subfolders = True -wallpaper = /home/dom/Pictures/Wallpaper/MonarchOS.png +wallpaper = ~/Pictures/Wallpaper/1586853771_daniel-leone-v7datklzzaw-unsplash-modded.jpg monitors = All swww_transition = any swww_transition_type = any @@ -15,4 +15,9 @@ swww_transition_angle = 0 swww_transition_duration = 2 post_command = show_hidden = False +show_gifs_only = False +number_of_columns = 3 +show_transition_options = True +swww_transition_fps = 60 +use_xdg_state = False diff --git a/stower.sh b/stower.sh index e072fa6..e9247c1 100755 --- a/stower.sh +++ b/stower.sh @@ -102,7 +102,7 @@ function inst_pkgs { if [[ $confirm_basics == "Y" ]]; then - declare -a pkg_list=(jq network-manager-applet alarm-clock-applet man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname neovim lsd alsa-utils ponymix btop powertop polkit polkit-gnome timeshift timeshift-autosnap pcmanfm librewolf-bin fzf unzip wayland hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar nwg-look cliphist wlogout swayosd hyprlock waybar-module-pacman-updates swaync ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp) + declare -a pkg_list=(jq network-manager-applet alarm-clock-applet man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop powertop polkit polkit-gnome timeshift timeshift-autosnap pcmanfm librewolf-bin fzf unzip wayland hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar-cava-git nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst) for key in "${pkg_list[@]}" do @@ -238,11 +238,11 @@ function setup { # dotfiles log "Time stow things up" - cp -R $HYPRMOONARCH_DIR/home/config/ $HOME/.hyprmoonarch-dotfiles/.config/ - cp -R $HYPRMOONARCH_DIR/home/.bashrc $HOME/.hyprmoonarch-dotfiles/.bashrc - cp -R $HYPRMOONARCH_DIR/home/.zshrc $HOME/.hyprmoonarch-dotfiles/.zshrc - cp -R $HYPRMOONARCH_DIR/home/.p10k.zsh $HOME/.hyprmoonarch-dotfiles/.p10k.zsh - cd $HOME/.hyprmoonarch-dotfiles/ + cp -R $HYPRMOONARCH_DIR/home/config/ $HOME/.hyprm/.config/ + cp -R $HYPRMOONARCH_DIR/home/.bashrc $HOME/.hyprm/.bashrc + cp -R $HYPRMOONARCH_DIR/home/.zshrc $HOME/.hyprm/.zshrc + cp -R $HYPRMOONARCH_DIR/home/.p10k.zsh $HOME/.hyprm/.p10k.zsh + cd $HOME/.hyprm/ stow . cd $HYPRMOONARCH_DIR @@ -253,7 +253,7 @@ function init { rm -f $LOG mkdir $HYPRMOONARCH_DIR/.cache - mkdir $HOME/.hyprmoonarch-dotfiles + mkdir $HOME/.hyprm log "Installation start\n" diff --git a/usr/local/bin/capsnote b/usr/local/bin/capsnote new file mode 100755 index 0000000..fb38db0 --- /dev/null +++ b/usr/local/bin/capsnote @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +sleep 0.2 + +value=($(cat /sys/class/leds/input*::capslock/brightness | cut -f1 -d,)) + +# echo ${value[2]} + +if [ ${value[2]} == 1 ]; + then + icon_name="/usr/share/icons/Tela-purple-dark/symbolic/status/capslock-enabled-symbolic.svg" + output="caps lock on" + else + icon_name="/usr/share/icons/Tela-purple-dark/symbolic/status/capslock-disabled-symbolic.svg" + output="caps lock off" +fi + +#notify-send -t 600 -i $icon_name -r 555 $output +# dunstify "$output" -i "$icon_name" -t 600 --replace=555 -h boolean:value:"${value[2]}" -u low +notify-send -e "$output" -i "$icon_name" -h string:x-canonical-private-synchronous:state -h boolean:value:"${value[2]}" -r 555 \ No newline at end of file diff --git a/usr/local/bin/hyprm-dnd b/usr/local/bin/hyprm-dnd new file mode 100755 index 0000000..55e988a --- /dev/null +++ b/usr/local/bin/hyprm-dnd @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +set -euo pipefail + +readonly ENABLED='' +readonly DISABLED='' + +dbus-monitor path='/org/freedesktop/Notifications',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged' --profile | + while read -r _; do + PAUSED="$(dunstctl is-paused)" + if [ "$PAUSED" == 'false' ]; then + CLASS="enabled" + TEXT="$ENABLED" + TOOLTIP="Notifications are on" + else + CLASS="disabled" + TEXT="$DISABLED" + TOOLTIP="Notifications are off" + COUNT="$(dunstctl count waiting)" + if [ "$COUNT" != '0' ]; then + TEXT="$DISABLED ($COUNT)" + fi + fi + printf '{"text": "%s", "class": "%s", "tooltip": "%s"}\n' "$TEXT" "$CLASS" "$TOOLTIP" + done diff --git a/usr/local/bin/hyprm-i18n b/usr/local/bin/hyprm-i18n new file mode 100755 index 0000000..c20057c --- /dev/null +++ b/usr/local/bin/hyprm-i18n @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + + +CURRENT_LANG=$(echo $LANG| cut -d. -f1) +TRANSL_FILE=~/.config/$CURRENT_LANG + + +echo $TRANSL_FILE + +while IFS="," read -r rec_column1 rec_column2 rec_column3 rec_column4 +do + echo "Displaying Record-$rec_column1" + echo "Quantity: $rec_column2" + echo "Price: $rec_column3" + echo "Value: $rec_column4" + echo "" +done < <(tail -n +2 $TRANSL_FILE) \ No newline at end of file diff --git a/usr/local/bin/hyprm-waybar-cpugov b/usr/local/bin/hyprm-waybar-cpugov new file mode 100755 index 0000000..8082dd9 --- /dev/null +++ b/usr/local/bin/hyprm-waybar-cpugov @@ -0,0 +1,49 @@ +#!/usr/bin/bash + +while : +do + + CPU_GOV=$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor) + + case $CPU_GOV in + performance) + CPU_GOV_SHORT=󰓅 + ;; + balanced) + CPU_GOV_SHORT=󰾅 + ;; + powersave) + CPU_GOV_SHORT=󰌪 + ;; + userspace) + CPU_GOV_SHORT=uspace + ;; + ondemand) + CPU_GOV_SHORT=ondmnd + ;; + conservative) + CPU_GOV_SHORT=cons + ;; + schedutil) + CPU_GOV_SHORT=sutil + ;; + *) + STATEMENTS + ;; + esac + + CPU_GOV_FULL="${CPU_GOV^}" + +s="text|alt|tooltip|class +$CPU_GOV_SHORT|$CPU_GOV_FULL|CPU Mode: $CPU_GOV_FULL|cpugov" + +jq --unbuffered --compact-output -Rn ' +( input | split("|") ) as $keys | +( inputs | split("|") ) as $vals | +[[$keys, $vals] | transpose[] | {key:.[0],value:.[1]}] | from_entries +' <<<"$s" + + sleep 5 +done + +#echo '{"text": "$(CPU_GOV)", "alt": "$CPU_GOV", "tooltip": "$CPU_GOV", "class": "$cpugov" }' \ No newline at end of file diff --git a/usr/local/bin/hyprm-waybar-gpustat b/usr/local/bin/hyprm-waybar-gpustat new file mode 100755 index 0000000..2cb74cf --- /dev/null +++ b/usr/local/bin/hyprm-waybar-gpustat @@ -0,0 +1,39 @@ +#!/usr/bin/bash + +while : +do + + GPU_STAT=$(cat /sys/class/hwmon/hwmon5/device/gpu_busy_percent) + ICON="▁" + +if [ "$GPU_STAT" -lt 10 ]; then + ICON="▁" +elif [ "$GPU_STAT" -lt 20 ]; then + ICON="▂" +elif [ "$GPU_STAT" -lt 40 ]; then + ICON="▃" +elif [ "$GPU_STAT" -lt 50 ]; then + ICON="▄" +elif [ "$GPU_STAT" -lt 60 ]; then + ICON="▅" +elif [ "$GPU_STAT" -lt 70 ]; then + ICON="▆" +elif [ "$GPU_STAT" -lt 80 ]; then + ICON="▇" +elif [ "$GPU_STAT" -lt 100 ]; then + ICON="█" +fi + +s="text|alt|tooltip|class|percentage +GPU $ICON|GPU $ICON $GPU_STAT%|GPU $ICON $GPU_STAT%|gpustat|$GPU_STAT" + +jq --unbuffered --compact-output -Rn ' +( input | split("|") ) as $keys | +( inputs | split("|") ) as $vals | +[[$keys, $vals] | transpose[] | {key:.[0],value:.[1]}] | from_entries +' <<<"$s" + + sleep 5 +done + +#echo '{"text": "$(CPU_GOV)", "alt": "$CPU_GOV", "tooltip": "$CPU_GOV", "class": "$cpugov" }' \ No newline at end of file diff --git a/usr/local/bin/hyprm-waybar-sink b/usr/local/bin/hyprm-waybar-sink new file mode 100755 index 0000000..f75a2c5 --- /dev/null +++ b/usr/local/bin/hyprm-waybar-sink @@ -0,0 +1,53 @@ +#!/usr/bin/bash + +set -e + + + + + + +# https://blog.dhampir.no/content/sleeping-without-a-subprocess-in-bash-and-how-to-sleep-forever +snore() { + local IFS + [[ -n "${_snore_fd:-}" ]] || exec {_snore_fd}<> <(:) + read -r ${1:+-t "$1"} -u $_snore_fd || : +} + +getter() { + + DELAY=0.2 + + while snore $DELAY; do + + SINKS=$(pactl --format=json list sinks) + CURRENT_SINK=$(pactl get-default-sink) + + CURRENT_SINK_OBJ=$(pactl --format=json list sinks | jq '.[] | select(.state="$(pactl get-default-sink)")') + + echo $CURRENT_SINK_OBJ + exit 1 + +s="text|alt|tooltip|class +$CPU_GOV_SHORT|$CPU_GOV_FULL|CPU Mode: $CPU_GOV_FULL|cpugov" + +jq --unbuffered --compact-output -Rn ' +( input | split("|") ) as $keys | +( inputs | split("|") ) as $vals | +[[$keys, $vals] | transpose[] | {key:.[0],value:.[1]}] | from_entries +' <<<"$s" + + done +} + + + + + +if [[ $1 = "-g" ]] then + getter +fi + + +exit 0 +#echo '{"text": "$(CPU_GOV)", "alt": "$CPU_GOV", "tooltip": "$CPU_GOV", "class": "$cpugov" }' \ No newline at end of file diff --git a/usr/local/bin/hyprm-waybar-weather b/usr/local/bin/hyprm-waybar-weather new file mode 100755 index 0000000..2276fc9 --- /dev/null +++ b/usr/local/bin/hyprm-waybar-weather @@ -0,0 +1,19 @@ +#!/usr/bin/env bash +for i in {1..5} +do + text=$(curl -s "https://wttr.in/$1?format=1") + if [[ $? == 0 ]] + then + text=$(echo "$text" | sed -E "s/\s+/ /g") + tooltip=$(curl -s "https://wttr.in/$1?format=4") + if [[ $? == 0 ]] + then + tooltip=$(echo "$tooltip" | sed -E "s/\s+/ /g") + tooltip="${tooltip//+/ }" + echo "{\"text\":\"$text\", \"tooltip\":\"$tooltip\"}" + exit + fi + fi + sleep 2 +done +echo "{\"text\":\"error\", \"tooltip\":\"error\"}" \ No newline at end of file diff --git a/usr/local/bin/hyprshade-waybar b/usr/local/bin/hyprshade-waybar new file mode 100755 index 0000000..bd30dbe --- /dev/null +++ b/usr/local/bin/hyprshade-waybar @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +while : +do + tooltip=$(hyprshade current) + + if [[ -z "$tooltip" ]]; then + tooltip="Off" + fi + + text="󰈈" + + if [[ -z "$tooltip" ]]; then + text="󰡮" + fi + + echo '{"text": "'$text'", "tooltip": "Current shader: '$tooltip'", "class": "hyprshade", "alt": "'$tooltip'"}' + + sleep 1 +done \ No newline at end of file