diff --git a/TODO.md b/TODO.md index c6537bd..3a1b0ad 100644 --- a/TODO.md +++ b/TODO.md @@ -1,2 +1,5 @@ - move volnote / capsnote to usr -- move rofi from ~/.config/rofi to /usr/share/rofi \ No newline at end of file +- move rofi from ~/.config/rofi to /usr/share/rofi + +- https://wiki.archlinux.de/title/Cpupower + - load kernel modul based on architecture \ No newline at end of file diff --git a/home/.zshrc b/home/.zshrc index d79b491..30e5698 100644 --- a/home/.zshrc +++ b/home/.zshrc @@ -1,43 +1,86 @@ -# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. -# Initialization code that may require console input (password prompts, [y/n] -# confirmations, etc.) must go above this block; everything else may go below. -if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then - source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" -fi +# Lines configured by zsh-newuser-install +HISTFILE=~/.histfile +HISTSIZE=1000 +SAVEHIST=1000 +setopt autocd nomatch notify appendhistory sharehistory hist_ignore_space hist_ignore_all_dups hist_save_no_dups hist_find_no_dups +unsetopt beep extendedglob +bindkey -e +# End of lines configured by zsh-newuser-install +# The following lines were added by compinstall +zstyle :compinstall filename '/home/dom/.zshrc' -# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. -[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh +autoload -Uz compinit +compinit +# End of lines added by compinstall + +parse_git_branch() { + local branch="" + branch=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/') + local git_status=$(git status --porcelain 2>/dev/null) + local color=green + if echo "$git_status" | grep -q "^ M"; then + color=yellow + branch="${branch}*" + fi + if echo "$git_status" | grep -qE "^ A|^\?\?"; then + color=yellow + branch="${branch}+" + fi + if echo "$git_status" | grep -q "^ D"; then + color=yellow + branch="${branch}-" + fi + + if [[ -n "$branch" ]]; then + branch=[%F{${color}}${branch}%F{reset}] + fi + echo " $branch" +} + +precmd() { + print "" + print -rP "%F{#b4befe}%B%n@%m%b %2~%F{#f5e0dc}$(parse_git_branch)%f" +} +# PS1="%F{#008000}%B%n@%m%b %K{#3a3a3a}%1~%k:%f" +PROMPT="%B%F{#b4befe}$%f%b " +RPROMPT="%F{241}%B%T%b%f" # set PATH so it includes user's private ~/.local/bin if it exists if [ -d "$HOME/.local/bin" ] ; then PATH="$HOME/.local/bin:$PATH" fi -HISTFILE=~/.histfile -HISTSIZE=1000 -SAVEHIST=1000 - -TERM_ID=(ps -o 'ppid=' -p $$) -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" -fi -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"' - +# Key bindings bindkey "^[[3~" delete-char bindkey "^[[H" beginning-of-line 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) +# Aliases +alias ssh="TERM=xterm-256color ssh" +#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 ls='exa --icons --color=always --group-directories-first' +alias ll='exa -alF --icons --color=always --group-directories-first' +alias la='exa -a --icons --color=always --group-directories-first' +alias l='exa -F --icons --color=always --group-directories-first' -#source /usr/share/oh-my-zsh/oh-my-zsh.sh -source ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/themes/powerlevel10k/powerlevel10k.zsh-theme +# FZF +eval "$(fzf --zsh)" +export FZF_DEFAULT_COMMAND="fd --hidden --strip-cwd-prefix --exclude .git" +export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" +export FZF_ALT_C_COMMAND="fd --type=d --hidden --strip-cwd-prefix --exclude .git" +export FZF_DEFAULT_OPTS="--height 50% --layout=default --border --color=hl:#2dd4bf" + +# FZF Previews +export FZF_CTRL_T_OPTS="--preview 'bat --color=always -n --line-range :500 {}'" +export FZF_ALT_C_OPTS="--preview 'eza --tree --color=always {} | head -200'" + +# Plugins source ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh source ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh +ZSH_AUTOSUGGEST_STRATEGY=(history completion) -eval "$(fzf --zsh)" +export SUDOEDITOR="vim" +export EDITOR="vim" diff --git a/home/config/gtk-3.0/settings.ini b/home/config/gtk-3.0/settings.ini index ca2298f..81151bb 100644 --- a/home/config/gtk-3.0/settings.ini +++ b/home/config/gtk-3.0/settings.ini @@ -1,6 +1,6 @@ [Settings] gtk-theme-name=catppuccin-mocha-lavender-standard+default -gtk-icon-theme-name=Newaita-reborn-dracula +gtk-icon-theme-name=Newaita-reborn-dracula-dark gtk-font-name=Hack Nerd Font 11 gtk-cursor-theme-name=Sweet-cursors gtk-cursor-theme-size=24 diff --git a/home/config/niri/config.kdl b/home/config/niri/config.kdl new file mode 100644 index 0000000..3ffd22b --- /dev/null +++ b/home/config/niri/config.kdl @@ -0,0 +1,643 @@ +// https://yalter.github.io/niri/Configuration:-Introduction + +cursor { + xcursor-theme "Sweet-cursors" + hide-when-typing + hide-after-inactive-ms 1000 +} + +// https://yalter.github.io/niri/Configuration:-Input +input { + mod-key "Super" + keyboard { + xkb { + // You can set rules, model, layout, variant and options. + // For more information, see xkeyboard-config(7). + + // For example: + // layout "de" + // options "grp:win_space_toggle,compose:ralt,ctrl:nocaps" + + // If this section is empty, niri will fetch xkb settings + // from org.freedesktop.locale1. You can control these using + // localectl set-x11-keymap. + } + + // Enable numlock on startup, omitting this setting disables it. + numlock + } + + // Next sections include libinput settings. + // Omitting settings disables them, or leaves them at their default values. + // All commented-out settings here are examples, not defaults. + touchpad { + off + tap + // dwta + // dwtp + // drag false + // drag-lock + natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + // scroll-method "two-finger" + // disabled-on-external-mouse + } + + mouse { + // off + // natural-scroll + // accel-speed 0.2 + accel-profile "flat" + // scroll-method "no-scroll" + } + + trackpoint { + off + // natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + // scroll-method "on-button-down" + // scroll-button 273 + // scroll-button-lock + // middle-emulation + } + + // Uncomment this to make the mouse warp to the center of newly focused windows. + // warp-mouse-to-focus + + // Focus windows and outputs automatically when moving the mouse into them. + // Setting max-scroll-amount="0%" makes it work only on windows already fully on screen. + focus-follows-mouse max-scroll-amount="0%" +} + +// You can configure outputs by their name, which you can find +// by running `niri msg outputs` while inside a niri instance. +// The built-in laptop monitor is usually called "eDP-1". +// Find more information on the wiki: +// https://yalter.github.io/niri/Configuration:-Outputs +// Remember to uncomment the node by removing "/-"! +/-output "eDP-1" { + // Uncomment this line to disable this output. + // off + + // Resolution and, optionally, refresh rate of the output. + // The format is "x" or "x@". + // If the refresh rate is omitted, niri will pick the highest refresh rate + // for the resolution. + // If the mode is omitted altogether or is invalid, niri will pick one automatically. + // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes. + mode "1920x1080@120.030" + + // You can use integer or fractional scale, for example use 1.5 for 150% scale. + scale 2 + + // Transform allows to rotate the output counter-clockwise, valid values are: + // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270. + transform "normal" + + // Position of the output in the global coordinate space. + // This affects directional monitor actions like "focus-monitor-left", and cursor movement. + // The cursor can only move between directly adjacent outputs. + // Output scale and rotation has to be taken into account for positioning: + // outputs are sized in logical, or scaled, pixels. + // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080, + // so to put another output directly adjacent to it on the right, set its x to 1920. + // If the position is unset or results in an overlap, the output is instead placed + // automatically. + position x=1280 y=0 +} +output "HDMI-A-1" { + mode "2560x1440@119.998" +} + +// Settings that influence how windows are positioned and sized. +// Find more information on the wiki: +// https://yalter.github.io/niri/Configuration:-Layout +layout { + // Set gaps around windows in logical pixels. + gaps 8 + + // When to center a column when changing focus, options are: + // - "never", default behavior, focusing an off-screen column will keep at the left + // or right edge of the screen. + // - "always", the focused column will always be centered. + // - "on-overflow", focusing a column will center it if it doesn't fit + // together with the previously focused column. + center-focused-column "never" + + // always-center-single-column + + // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between. + preset-column-widths { + // Proportion sets the width as a fraction of the output width, taking gaps into account. + // For example, you can perfectly fit four windows sized "proportion 0.25" on an output. + // The default preset widths are 1/3, 1/2 and 2/3 of the output. + proportion 0.33333 + proportion 0.5 + proportion 0.66667 + + // Fixed sets the width in logical pixels exactly. + // fixed 1920 + } + + // You can also customize the heights that "switch-preset-window-height" (Mod+Shift+R) toggles between. + // preset-window-heights { } + + // You can change the default width of the new windows. + default-column-width { proportion 0.5; } + // If you leave the brackets empty, the windows themselves will decide their initial width. + // default-column-width {} + + // By default focus ring and border are rendered as a solid background rectangle + // behind windows. That is, they will show up through semitransparent windows. + // This is because windows using client-side decorations can have an arbitrary shape. + // + // If you don't like that, you should uncomment `prefer-no-csd` below. + // Niri will draw focus ring and border *around* windows that agree to omit their + // client-side decorations. + // + // Alternatively, you can override it with a window rule called + // `draw-border-with-background`. + + // You can change how the focus ring looks. + focus-ring { + // Uncomment this line to disable the focus ring. + // off + + // How many logical pixels the ring extends out from the windows. + width 1 + + // Colors can be set in a variety of ways: + // - CSS named colors: "red" + // - RGB hex: "#rgb", "#rgba", "#rrggbb", "#rrggbbaa" + // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others. + + // Color of the ring on the active monitor. + active-color "#7f849c80" + + // Color of the ring on inactive monitors. + // + // The focus ring only draws around the active window, so the only place + // where you can see its inactive-color is on other monitors. + inactive-color "#1e1e2e80" + + // You can also use gradients. They take precedence over solid colors. + // Gradients are rendered the same as CSS linear-gradient(angle, from, to). + // The angle is the same as in linear-gradient, and is optional, + // defaulting to 180 (top-to-bottom gradient). + // You can use any CSS linear-gradient tool on the web to set these up. + // Changing the color space is also supported, check the wiki for more info. + // + // active-gradient from="#80c8ff" to="#c7ff7f" angle=45 + + // You can also color the gradient relative to the entire view + // of the workspace, rather than relative to just the window itself. + // To do that, set relative-to="workspace-view". + // + // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" + } + + // You can also add a border. It's similar to the focus ring, but always visible. + border { + // The settings are the same as for the focus ring. + // If you enable the border, you probably want to disable the focus ring. + off + + width 2 + active-color "#ffc87f" + inactive-color "#505050" + + // Color of the border around windows that request your attention. + urgent-color "#9b0000" + + // Gradients can use a few different interpolation color spaces. + // For example, this is a pastel rainbow gradient via in="oklch longer hue". + // + // active-gradient from="#e5989b" to="#ffb4a2" angle=45 relative-to="workspace-view" in="oklch longer hue" + + // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" + } + + // You can enable drop shadows for windows. + shadow { + // Uncomment the next line to enable shadows. + // on + + // By default, the shadow draws only around its window, and not behind it. + // Uncomment this setting to make the shadow draw behind its window. + // + // Note that niri has no way of knowing about the CSD window corner + // radius. It has to assume that windows have square corners, leading to + // shadow artifacts inside the CSD rounded corners. This setting fixes + // those artifacts. + // + // However, instead you may want to set prefer-no-csd and/or + // geometry-corner-radius. Then, niri will know the corner radius and + // draw the shadow correctly, without having to draw it behind the + // window. These will also remove client-side shadows if the window + // draws any. + // + // draw-behind-window true + + // You can change how shadows look. The values below are in logical + // pixels and match the CSS box-shadow properties. + + // Softness controls the shadow blur radius. + softness 30 + + // Spread expands the shadow. + spread 2 + + // Offset moves the shadow relative to the window. + offset x=0 y=5 + + // You can also change the shadow color and opacity. + color "#0007" + } + + // Struts shrink the area occupied by windows, similarly to layer-shell panels. + // You can think of them as a kind of outer gaps. They are set in logical pixels. + // Left and right struts will cause the next window to the side to always be visible. + // Top and bottom struts will simply add outer gaps in addition to the area occupied by + // layer-shell panels and regular gaps. + struts { + // left 64 + // right 64 + // top 64 + // bottom 64 + } +} + +// Add lines like this to spawn processes at startup. +// Note that running niri as a session supports xdg-desktop-autostart, +// which may be more convenient to use. +// See the binds section below for more spawn examples. + +// This line starts waybar, a commonly used bar for Wayland compositors. +spawn-at-startup "waybar" +spawn-at-startup "xwayland-satellite" +spawn-at-startup "dunst" +spawn-sh-at-startup "waypaper --restore" +spawn-sh-at-startup "foot --server" +spawn-sh-at-startup "wl-paste --watch cliphist store" +spawn-sh-at-startup "wl-paste --type image --watch cliphist store" +spawn-at-startup "niri-switch-daemon" + +// To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup: +// spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell" + +hotkey-overlay { + // Uncomment this line to disable the "Important Hotkeys" pop-up at startup. + // skip-at-startup + hide-not-bound +} + +// Uncomment this line to ask the clients to omit their client-side decorations if possible. +// If the client will specifically ask for CSD, the request will be honored. +// Additionally, clients will be informed that they are tiled, removing some client-side rounded corners. +// This option will also fix border/focus ring drawing behind some semitransparent windows. +// After enabling or disabling this, you need to restart the apps for this to take effect. +prefer-no-csd + +// You can change the path where screenshots are saved. +// A ~ at the front will be expanded to the home directory. +// The path is formatted with strftime(3) to give you the screenshot date and time. +screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" + +// You can also set this to null to disable saving screenshots to disk. +// screenshot-path null + +// Animation settings. +// The wiki explains how to configure individual animations: +// https://yalter.github.io/niri/Configuration:-Animations +animations { + // Uncomment to turn off all animations. + // off + + // Slow down all animations by this factor. Values below 1 speed them up instead. + // slowdown 3.0 +} + +// Window rules let you adjust behavior for individual windows. +// Find more information on the wiki: +// https://yalter.github.io/niri/Configuration:-Window-Rules + +// Work around WezTerm's initial configure bug +// by setting an empty default-column-width. +window-rule { + // This regular expression is intentionally made as specific as possible, + // since this is the default config, and we want no false positives. + // You can get away with just app-id="wezterm" if you want. + match app-id=r#"^org\.wezfurlong\.wezterm$"# + default-column-width {} +} + +// Open the Firefox picture-in-picture player as floating by default. +window-rule { + // This app-id regular expression will work for both: + // - host Firefox (app-id is "firefox") + // - Flatpak Firefox (app-id is "org.mozilla.firefox") + match app-id=r#"firefox$"# title="^Picture-in-Picture$" + open-floating true +} + +// Example: block out two password managers from screen capture. +// (This example rule is commented out with a "/-" in front.) +/-window-rule { + match app-id=r#"^org\.keepassxc\.KeePassXC$"# + match app-id=r#"^org\.gnome\.World\.Secrets$"# + + block-out-from "screen-capture" + + // Use this instead if you want them visible on third-party screenshot tools. + // block-out-from "screencast" +} + +// Example: enable rounded corners for all windows. +// (This example rule is commented out with a "/-" in front.) +window-rule { + geometry-corner-radius 4 + clip-to-geometry true +} + +binds { + // Keys consist of modifiers separated by + signs, followed by an XKB key name + // in the end. To find an XKB name for a particular key, you may use a program + // like wev. + // + // "Mod" is a special modifier equal to Super when running on a TTY, and to Alt + // when running as a winit window. + // + // Most actions that you can bind here can also be invoked programmatically with + // `niri msg action do-something`. + + // Mod-Shift-/, which is usually the same as Mod-?, + // shows a list of important hotkeys. + Mod+Shift+Slash { show-hotkey-overlay; } + + Mod+C hotkey-overlay-title=null { spawn-sh "cliphist list | rofi -dmenu | cliphist decode | wl-copy"; } + + Alt+W { spawn-sh "killall waybar && waybar &"; } + + Mod+A { spawn-sh "pkill rofi || ~/.config/rofi/volume/volume.sh"; } + + Mod+E { spawn-sh "xdg-open ~"; } + + Mod+T { spawn-sh "pkill rofi || rofi -show fb -modes \"fb:~/.config/rofi/settings-menu/setmen.sh\" -theme $HOME/.config/rofi/settings-menu/settings-menu.rasi"; } + + Mod+Tab { spawn "niri-switch"; } + Mod+Shift+Tab { spawn "niri-switch" "--previous"; } + + Mod+Return hotkey-overlay-title="Open a Terminal: foot" { spawn "foot"; } + Mod+Space hotkey-overlay-title="Run an Application: rofi" { spawn-sh "pkill rofi || ~/.config/rofi/launcher/launcher.sh"; } + Mod+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn-sh "wlogout -P 1 -s -r 10 -c 10"; } + + // Use spawn-sh to run a shell command. Do this if you need pipes, multiple commands, etc. + // Note: the entire command goes as a single argument. It's passed verbatim to `sh -c`. + // For example, this is a standard bind to toggle the screen reader (orca). + // Super+Alt+S allow-when-locked=true hotkey-overlay-title=null { spawn-sh "pkill orca || exec orca"; } + + // Example volume keys mappings for PipeWire & WirePlumber. + // The allow-when-locked=true property makes them work even when the session is locked. + // Using spawn-sh allows to pass multiple arguments together with the command. + XF86AudioRaiseVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+"; } + XF86AudioLowerVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-"; } + XF86AudioMute allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; } + XF86AudioMicMute allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; } + + // Example brightness key mappings for brightnessctl. + // You can use regular spawn with multiple arguments too (to avoid going through "sh"), + // but you need to manually put each argument in separate "" quotes. + XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "+10%"; } + XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "10%-"; } + + // Open/close the Overview: a zoomed-out view of workspaces and windows. + // You can also move the mouse into the top-left hot corner, + // or do a four-finger swipe up on a touchpad. + Mod+O repeat=false { toggle-overview; } + // Mod+Tab repeat=false { toggle-overview; } + + Mod+Q repeat=false { close-window; } + + Mod+Left { focus-column-left; } + Mod+Down { focus-window-down; } + Mod+Up { focus-window-up; } + Mod+Right { focus-column-right; } + Mod+H { focus-column-left; } + Mod+J { focus-window-down; } + Mod+K { focus-window-up; } + Mod+L { focus-column-right; } + + Mod+Ctrl+Left { move-column-left; } + Mod+Ctrl+Down { move-window-down; } + Mod+Ctrl+Up { move-window-up; } + Mod+Ctrl+Right { move-column-right; } + Mod+Ctrl+H { move-column-left; } + Mod+Ctrl+J { move-window-down; } + Mod+Ctrl+K { move-window-up; } + Mod+Ctrl+L { move-column-right; } + + // Alternative commands that move across workspaces when reaching + // the first or last window in a column. + // Mod+J { focus-window-or-workspace-down; } + // Mod+K { focus-window-or-workspace-up; } + // Mod+Ctrl+J { move-window-down-or-to-workspace-down; } + // Mod+Ctrl+K { move-window-up-or-to-workspace-up; } + + Mod+Home { focus-column-first; } + Mod+End { focus-column-last; } + Mod+Ctrl+Home { move-column-to-first; } + Mod+Ctrl+End { move-column-to-last; } + + Mod+Shift+Left { focus-monitor-left; } + Mod+Shift+Down { focus-monitor-down; } + Mod+Shift+Up { focus-monitor-up; } + Mod+Shift+Right { focus-monitor-right; } + Mod+Shift+H { focus-monitor-left; } + Mod+Shift+J { focus-monitor-down; } + Mod+Shift+K { focus-monitor-up; } + Mod+Shift+L { focus-monitor-right; } + + Mod+Shift+Ctrl+Left { move-column-to-monitor-left; } + Mod+Shift+Ctrl+Down { move-column-to-monitor-down; } + Mod+Shift+Ctrl+Up { move-column-to-monitor-up; } + Mod+Shift+Ctrl+Right { move-column-to-monitor-right; } + Mod+Shift+Ctrl+H { move-column-to-monitor-left; } + Mod+Shift+Ctrl+J { move-column-to-monitor-down; } + Mod+Shift+Ctrl+K { move-column-to-monitor-up; } + Mod+Shift+Ctrl+L { move-column-to-monitor-right; } + + // Alternatively, there are commands to move just a single window: + // Mod+Shift+Ctrl+Left { move-window-to-monitor-left; } + // ... + + // And you can also move a whole workspace to another monitor: + // Mod+Shift+Ctrl+Left { move-workspace-to-monitor-left; } + // ... + + Mod+Page_Down { focus-workspace-down; } + Mod+Page_Up { focus-workspace-up; } + Mod+U { focus-workspace-down; } + Mod+I { focus-workspace-up; } + Mod+Ctrl+Page_Down { move-column-to-workspace-down; } + Mod+Ctrl+Page_Up { move-column-to-workspace-up; } + Mod+Ctrl+U { move-column-to-workspace-down; } + Mod+Ctrl+I { move-column-to-workspace-up; } + + // Alternatively, there are commands to move just a single window: + // Mod+Ctrl+Page_Down { move-window-to-workspace-down; } + // ... + + Mod+Shift+Page_Down { move-workspace-down; } + Mod+Shift+Page_Up { move-workspace-up; } + Mod+Shift+U { move-workspace-down; } + Mod+Shift+I { move-workspace-up; } + + // You can bind mouse wheel scroll ticks using the following syntax. + // These binds will change direction based on the natural-scroll setting. + // + // To avoid scrolling through workspaces really fast, you can use + // the cooldown-ms property. The bind will be rate-limited to this value. + // You can set a cooldown on any bind, but it's most useful for the wheel. + Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } + Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } + Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } + Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } + + Mod+WheelScrollRight { focus-column-right; } + Mod+WheelScrollLeft { focus-column-left; } + Mod+Ctrl+WheelScrollRight { move-column-right; } + Mod+Ctrl+WheelScrollLeft { move-column-left; } + + // Usually scrolling up and down with Shift in applications results in + // horizontal scrolling; these binds replicate that. + Mod+Shift+WheelScrollDown { focus-column-right; } + Mod+Shift+WheelScrollUp { focus-column-left; } + Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } + Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } + + // Similarly, you can bind touchpad scroll "ticks". + // Touchpad scrolling is continuous, so for these binds it is split into + // discrete intervals. + // These binds are also affected by touchpad's natural-scroll, so these + // example binds are "inverted", since we have natural-scroll enabled for + // touchpads by default. + // Mod+TouchpadScrollDown { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02+"; } + // Mod+TouchpadScrollUp { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02-"; } + + // You can refer to workspaces by index. However, keep in mind that + // niri is a dynamic workspace system, so these commands are kind of + // "best effort". Trying to refer to a workspace index bigger than + // the current workspace count will instead refer to the bottommost + // (empty) workspace. + // + // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on + // will all refer to the 3rd workspace. + Mod+1 { focus-workspace 1; } + Mod+2 { focus-workspace 2; } + Mod+3 { focus-workspace 3; } + Mod+4 { focus-workspace 4; } + Mod+5 { focus-workspace 5; } + Mod+6 { focus-workspace 6; } + Mod+7 { focus-workspace 7; } + Mod+8 { focus-workspace 8; } + Mod+9 { focus-workspace 9; } + Mod+Ctrl+1 { move-column-to-workspace 1; } + Mod+Ctrl+2 { move-column-to-workspace 2; } + Mod+Ctrl+3 { move-column-to-workspace 3; } + Mod+Ctrl+4 { move-column-to-workspace 4; } + Mod+Ctrl+5 { move-column-to-workspace 5; } + Mod+Ctrl+6 { move-column-to-workspace 6; } + Mod+Ctrl+7 { move-column-to-workspace 7; } + Mod+Ctrl+8 { move-column-to-workspace 8; } + Mod+Ctrl+9 { move-column-to-workspace 9; } + + // Alternatively, there are commands to move just a single window: + // Mod+Ctrl+1 { move-window-to-workspace 1; } + + // Switches focus between the current and the previous workspace. + // Mod+Tab { focus-workspace-previous; } + + // The following binds move the focused window in and out of a column. + // If the window is alone, they will consume it into the nearby column to the side. + // If the window is already in a column, they will expel it out. + Mod+BracketLeft { consume-or-expel-window-left; } + Mod+BracketRight { consume-or-expel-window-right; } + + // Consume one window from the right to the bottom of the focused column. + Mod+Comma { consume-window-into-column; } + // Expel the bottom window from the focused column to the right. + Mod+Period { expel-window-from-column; } + + Mod+R { switch-preset-column-width; } + // Cycling through the presets in reverse order is also possible. + // Mod+R { switch-preset-column-width-back; } + Mod+Shift+R { switch-preset-window-height; } + Mod+Ctrl+R { reset-window-height; } + Mod+F { maximize-column; } + Mod+Shift+F { fullscreen-window; } + + // Expand the focused column to space not taken up by other fully visible columns. + // Makes the column "fill the rest of the space". + Mod+Ctrl+F { expand-column-to-available-width; } + + // Mod+C { center-column; } + + // Center all fully visible columns on screen. + Mod+Ctrl+C { center-visible-columns; } + + // Finer width adjustments. + // This command can also: + // * set width in pixels: "1000" + // * adjust width in pixels: "-5" or "+5" + // * set width as a percentage of screen width: "25%" + // * adjust width as a percentage of screen width: "-10%" or "+10%" + // Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0, + // set-column-width "100" will make the column occupy 200 physical screen pixels. + Mod+Minus { set-column-width "-10%"; } + Mod+Equal { set-column-width "+10%"; } + + // Finer height adjustments when in column with other windows. + Mod+Shift+Minus { set-window-height "-10%"; } + Mod+Shift+Equal { set-window-height "+10%"; } + + // Move the focused window between the floating and the tiling layout. + Mod+V { toggle-window-floating; } + Mod+Shift+V { switch-focus-between-floating-and-tiling; } + + // Toggle tabbed column display mode. + // Windows in this column will appear as vertical tabs, + // rather than stacked on top of each other. + Mod+W { toggle-column-tabbed-display; } + + // Actions to switch layouts. + // Note: if you uncomment these, make sure you do NOT have + // a matching layout switch hotkey configured in xkb options above. + // Having both at once on the same hotkey will break the switching, + // since it will switch twice upon pressing the hotkey (once by xkb, once by niri). + // Mod+Space { switch-layout "next"; } + // Mod+Shift+Space { switch-layout "prev"; } + + Print { screenshot; } + Ctrl+Print { screenshot-screen; } + Alt+Print { screenshot-window; } + + // Applications such as remote-desktop clients and software KVM switches may + // request that niri stops processing the keyboard shortcuts defined here + // so they may, for example, forward the key presses as-is to a remote machine. + // It's a good idea to bind an escape hatch to toggle the inhibitor, + // so a buggy application can't hold your session hostage. + // + // The allow-inhibiting=false property can be applied to other binds as well, + // which ensures niri always processes them, even when an inhibitor is active. + Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } + + // The quit action will show a confirmation dialog to avoid accidental exits. + Mod+Shift+E { quit; } + Ctrl+Alt+Delete { quit; } + + // Powers off the monitors. To turn them back on, do any input like + // moving the mouse or pressing any other key. + Mod+Shift+P { power-off-monitors; } +} diff --git a/home/config/waybar/config b/home/config/waybar/config index 412f4ae..e89630a 100644 --- a/home/config/waybar/config +++ b/home/config/waybar/config @@ -4,18 +4,20 @@ "spacing": 5, "modules-left": [ "group/sys", - "hyprland/workspaces", - "tray" + "niri/workspaces", + "tray", + + "wlr/taskbar", + "niri/window" ], "modules-center": [ - "mpris", - "wlr/taskbar" + ], "modules-right": [ + "mpris", "custom/cpugov", "group/net", "group/sound", - "cava", "group/indicators" ], "group/indicators": { @@ -25,7 +27,6 @@ "custom/updates", "idle_inhibitor", "custom/screenshader", - "custom/dnd", "privacy" ] }, @@ -197,7 +198,7 @@ }, "wlr/taskbar": { "markup": true, - "format": "{icon} {title:.10}", + "format": "{icon}", "icon-size": 20, "tooltip-format": "{title:.100}", // "sort-by-app-id": true, @@ -272,14 +273,10 @@ "sort-by-number": true }, "hyprland/window": { - "format": "{}", - "rewrite": { - "(.*) — firefox": "🌎 $1", - "(.*) - zsh": "> [$1]", - "(.*) - kitty": "> [$1]", - "(.*) - alacritty": "> [$1]" - }, - "separate-outputs": false + "format": "{title}", + "icon": false, + "icon-size": 16, + "separate-outputs": true }, "custom/updates": { "format": "{icon}", @@ -304,9 +301,9 @@ "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" + "blue-light-heavy": "hyprctl hyprsunset temperature 5000", + "blue-light-soft": "hyprctl hyprsunset temperature 5500", + "off": "hyprctl hyprsunset identity" }, "exec-if": "hyprshade", "exec": "hyprshade-waybar", @@ -327,7 +324,7 @@ "dnd-inhibited-none": "󰂛" }, "return-type": "json", - "exec-if": "which swaync-client", + "exec-if": "which sync-client", "exec": "swaync-client -swb", "on-click": "sh -c 'sleep 0.1s; swaync-client -t -sw; sleep 0.1s'", "on-click-right": "swaync-client -d -sw", @@ -489,5 +486,26 @@ "format": "{}", "tooltip": true, "interval": 3600 + }, + "niri/workspaces": { + "format": "{icon}", + "format-icons": { + // Named workspaces + // (you need to configure them in niri) + "browser": "", + "discord": "", + "chat": "", + + // Icons by state + "active": "", + "default": "" + } + }, + "niri/window": { + "format": "{}", + "rewrite": { + "(.*) - Mozilla Firefox": "🌎 $1", + "(.*) - zsh": "> [$1]" + } } } \ No newline at end of file diff --git a/home/config/waybar/style.css b/home/config/waybar/style.css index 4b0a5bf..8fa6a1f 100644 --- a/home/config/waybar/style.css +++ b/home/config/waybar/style.css @@ -1,25 +1,29 @@ * { border: none; - font-family: "JetBrainsMono Nerd Font", sans-serif; + font-family: "Ubuntu Nerd Font", sans-serif; font-size: 13px; - color:alpha(@theme_text_color, 0.8); + color: alpha(@theme_text_color, 0.8); } + window#waybar { - background: transparent; - + /*background: transparent;*/ + background: alpha(@theme_selected_fg_color, 0.2); } + /*-----main groups----*/ .modules-right { margin: 0; - padding-left:5px; - padding-right:0; + padding-left: 5px; + padding-right: 0; border-radius: 0; } + .modules-center { margin: 0; border-radius: 0; } + .modules-left { margin: 0 0 0 5px; /* background-color:alpha(@theme_selected_bg_color, 0.15); @@ -57,16 +61,21 @@ window#waybar { #custom-vpn.connected, #power-profiles-daemon, #privacy, -#gamemode{ - padding:0px 10px; +#gamemode, +#taskbar, +#window { + padding: 0px 10px; } /** * GROUPS **/ -#sys, #stats, #net, #sound { +#sys, +#stats, +#net, +#sound { margin: 0; - color:alpha(@theme_text_color, 0.5); + color: alpha(@theme_text_color, 0.5); } @@ -74,17 +83,20 @@ window#waybar { * SYS **/ #sys { - padding:0 0px 0 10px; + padding: 0 0px 0 10px; } + #custom-power { - margin-left:0; - margin-right:0; - padding-left:0; + margin-left: 0; + margin-right: 0; + padding-left: 0; } + #user { - padding-left:0; - font-weight:bold; + padding-left: 0; + font-weight: bold; } + #custom-weather { padding-left: 5px; } @@ -99,11 +111,11 @@ window#waybar { border-radius: 4px; padding: 0px 8px 0px 8px; margin: 8px 0px 8px 0px; - background-color:alpha(@theme_selected_bg_color, 0.1); + background-color: alpha(@theme_selected_bg_color, 0.1); } #custom-notification { - padding-right:0 + padding-right: 0 } /** @@ -114,10 +126,12 @@ window#waybar { background-color: transparent; padding-left: 0; } + #pulseaudio-slider { padding-left: 10px; padding-right: 10px; } + #pulseaudio-slider slider { min-height: 0px; min-width: 0px; @@ -126,14 +140,16 @@ window#waybar { border: none; box-shadow: none; background-color: @insensitive_bg_color; - border:1px solid alpha(@theme_selected_bg_color, 0.1); + border: 1px solid alpha(@theme_selected_bg_color, 0.1); } + #pulseaudio-slider trough { min-height: 4px; min-width: 80px; border-radius: 5px; background-color: alpha(@theme_selected_bg_color, 0.3); } + #pulseaudio-slider highlight { min-width: 5px; @@ -142,7 +158,7 @@ window#waybar { } #custom-updates { - padding-right:5px; + padding-right: 5px; padding-left: 5px; } @@ -151,45 +167,91 @@ window#waybar { * MISC **/ #mpris { - border-radius:0; + border-radius: 0; margin: 8px 10px 8px 0px; - padding:0 10px; + padding: 0 10px; } /** * WORKSPACES **/ -#workspaces { - padding:0; +/*#workspaces { + padding: 0; border-radius: 0 } + #workspaces button { padding: 0px 10px 0px 8px; margin: 8px 2px 8px 0px; - outline:none; + outline: none; border-radius: 4px; - background-color:alpha(@theme_selected_bg_color, 0.05); + background-color: alpha(@theme_selected_bg_color, 0.05); } + #workspaces button:last-child { margin-right: 0; } -#workspaces button.empty, #workspaces button.active.empty { - color:inherit; + +#workspaces button.empty, +#workspaces button.active.empty { + color: inherit; padding: 0px 0px 0px 8px; -} -#workspaces button.active { +} + +#workspaces button.active { background-color: transparent; padding: 0px 10px 0px 8px; } -#workspaces button.visible { - background-color:alpha(@theme_selected_bg_color, 0.1); +#workspaces button.visible { + 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.05); + +#workspaces button:hover { + background-color: alpha(@theme_selected_bg_color, 0.05); + box-shadow: inherit; + text-shadow: inherit; +}*/ + +#workspaces { + padding: 0; + border-radius: 0; + +} + +#workspaces button { + margin: 8px 2px 8px 0px; + padding: 0; + outline: none; + border-radius: 4px; + background-color: alpha(@theme_selected_bg_color, 0.05); +} + +#workspaces button:last-child { + margin-right: 0; +} + +#workspaces button.empty, +#workspaces button.active.empty { + color: inherit; +} + +#workspaces button.active {} + +#workspaces button.visible { + 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.05); box-shadow: inherit; text-shadow: inherit; } @@ -201,27 +263,31 @@ window#waybar { #pulseaudio.muted { color: #cc3436; } + #battery.charging { color: #2dcc36; } + #battery.warning:not(.charging) { - color: #e6e600; + color: #e6e600; } + #battery.critical:not(.charging) { color: #cc3436; } + #temperature.critical { color: #cc3436; } #idle_inhibitor.activated { - color:alpha(@theme_selected_bg_color, 0.9); + color: alpha(@theme_selected_bg_color, 0.9); } #indicators { - padding-right:5px; - padding-left:5px; - border-radius:0; + padding-right: 5px; + padding-left: 5px; + border-radius: 0; } @@ -229,43 +295,54 @@ window#waybar { * TASKBAR **/ #taskbar { - font-size:8px; - margin:0; + font-size: 8px; + margin: 0 0 0 5px; opacity: 1; - padding:0; + padding: 0; border-radius: 0; } + #taskbar.empty { - opacity:0; + opacity: 0; } + #taskbar button { - padding:3px 10px 3px 10px; - transition:100ms border ease-in-out; + padding: 3px 10px 3px 10px; + transition: 100ms border ease-in-out; border-radius: 0; - font-size:8px; + font-size: 8px; } #taskbar button:not(:first-child) { - border-radius:0px; + border-radius: 0px; } -#taskbar button:first-child { -} -#taskbar button:last-child { - -} -#taskbar button:last-child:first-child { - -} +#taskbar button:first-child {} + +#taskbar button:last-child {} + +#taskbar button:last-child:first-child {} + #taskbar button.empty { - opacity:0; + opacity: 0; } #taskbar button:hover { - background-color:alpha(@theme_selected_bg_color, 0.1); + background-color: alpha(@theme_selected_bg_color, 0.1); } + #taskbar button.active { - background-color:alpha(@theme_selected_bg_color, 0.05); - opacity:1; + background-color: alpha(@theme_selected_bg_color, 0.05); + opacity: 1; +} + + +menu { + border-radius: 4px; +} + +menuitem { + border-radius: 4px; + } \ No newline at end of file diff --git a/stower.sh b/stower.sh index 25cdcf3..5b6a7a4 100755 --- a/stower.sh +++ b/stower.sh @@ -103,8 +103,7 @@ function inst_pkgs { if [[ $confirm_basics == "Y" ]]; then - - declare -a pkg_list=(wayland stow jq network-manager-applet alarm-clock-applet xarchiver man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop timeshift timeshift-autosnap newaita-reborn-icons-git waterfox fzf unzip hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates-git ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst sweet-cursors-hyprcursor-git catppuccin-gtk-theme-mocha rofi cmake meson cpio pkg-config ttf-ubuntu-nerd ttf-hack-nerd ttf-jetbrains-mono-nerd hyprsysteminfo qt5-styleplugins qt6gtk2 qt5gtk2 hyprpolkitagent hyprshade) + declare -a pkg_list=(wayland stow jq network-manager-applet alarm-clock-applet xarchiver man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop timeshift timeshift-autosnap newaita-reborn-icons-git waterfox fzf unzip hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates-git ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst sweet-cursors-hyprcursor-git catppuccin-gtk-theme-mocha rofi cmake meson cpio pkg-config ttf-ubuntu-nerd ttf-hack-nerd ttf-jetbrains-mono-nerd hyprsysteminfo qt5-styleplugins qt6gtk2 qt5gtk2 hyprpolkitagent hyprshade cpupower fd) for key in "${pkg_list[@]}" do @@ -243,10 +242,16 @@ function setup { log "Set up GUI Themes" gsettings set org.gnome.desktop.interface gtk-theme "Catppuccin-Mocha-Standard-Lavender-Dark" log "Setting cursor theme" + hyprctl setcursor Sweet-cursors-hyprcursor 32 log "Done... Window decorations" + gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' log "Done... Set color-scheme to prefer-dark" + + rm -rf $HYPRMOONARCH_DIR/.cache/Sweet-cursors + git clone https://gitea.moonarch.de/nevaforget/Sweet-cursors $HYPRMOONARCH_DIR/.cache/Sweet-cursors + cp -R $HYPRMOONARCH_DIR/.cache/Sweet-cursors /usr/share/icons/Sweet-cursors gsettings set org.gnome.desktop.interface cursor-theme Sweet-cursors log "Done... Set a sweet cursor" diff --git a/usr/local/bin/volnote b/usr/local/bin/volnote index c5e574a..72d71b4 100755 --- a/usr/local/bin/volnote +++ b/usr/local/bin/volnote @@ -20,20 +20,20 @@ function send_notification { # https://en.wikipedia.org/wiki/Box-drawing_character #bar=$(seq -s "─" $(($volume/5)) | sed 's/[0-9]//g') if [ "$volume" = "0" ]; then - icon_name="/usr/share/icons/zafiro-dark/panel/16/audio-volume-off.svg" + icon_name="/usr/share/icons/Newaita-reborn/panel/16/audio-volume-off.svg" dunstify "$volume"" " -i "$icon_name" -t 2000 -h int:value:"$volume" -h string:synchronous:"─" --replace=555 else if [ "$volume" -lt "10" ]; then - icon_name="/usr/share/icons/zafiro-dark/panel/16/audio-volume-low.svg" + icon_name="/usr/share/icons/Newaita-reborn/panel/16/audio-volume-low.svg" dunstify "$volume"" " -i "$icon_name" --replace=555 -t 2000 else if [ "$volume" -lt "30" ]; then - icon_name="/usr/share/icons/zafiro-dark/panel/16/audio-volume-low.svg" + icon_name="/usr/share/icons/Newaita-reborn/panel/16/audio-volume-low.svg" else if [ "$volume" -lt "70" ]; then - icon_name="/usr/share/icons/zafiro-dark/panel/16/audio-volume-medium.svg" + icon_name="/usr/share/icons/Newaita-reborn/panel/16/audio-volume-medium.svg" else - icon_name="/usr/share/icons/zafiro-dark/panel/16/audio-volume-high.svg" + icon_name="/usr/share/icons/Newaita-reborn/panel/16/audio-volume-high.svg" fi fi fi @@ -41,7 +41,6 @@ fi bar=$(seq -s "─" $(($volume/5)) | sed 's/[0-9]//g') # Send the notification dunstify "$volume"" ""$bar" -i "$icon_name" -t 2000 -h int:value:"$volume" -h string:synchronous:"$bar" --replace=555 - } case $1 in @@ -58,7 +57,7 @@ case $1 in send_notification ;; toggle) - dunstify --replace 554 -i "/usr/share/icons/zafiro-dark/actions/16-Dark/media-album-track.svg" "Player Control" "Media $(playerctl status)" + dunstify --replace 554 -i "/usr/share/icons/Newaita-reborn/actions/16-Dark/media-album-track.svg" "Player Control" "Media $(playerctl status)" playerctl play-pause ;; mute) @@ -66,7 +65,7 @@ case $1 in amixer -D pulse set Master 1+ toggle > /dev/null if is_mute ; then DIR=`dirname "$0"` - dunstify -i "/usr/share/icons/zafiro-dark/panel/16/audio-volume-off.svg" --replace=555 -u normal "Mute" -t 2000 + dunstify -i "/usr/share/icons/Newaita-reborn/panel/16/audio-volume-off.svg" --replace=555 -u normal "Mute" -t 2000 else send_notification fi diff --git a/usr/share/icons/default/index.theme b/usr/share/icons/default/index.theme new file mode 100644 index 0000000..78856b4 --- /dev/null +++ b/usr/share/icons/default/index.theme @@ -0,0 +1,2 @@ +[Icon Theme] +Inherits=Sweet-cursors