From acc21888b9c6b0373e15f4caeb1ba0c17d19457a Mon Sep 17 00:00:00 2001 From: tomoron Date: Mon, 10 Feb 2025 05:28:31 +0100 Subject: [PATCH] continue refactor, home modules are actual modules and remove some useless files --- Makefile | 3 + dotfiles/bashrc | 33 - dotfiles/config/bspwm/bspwmrc | 22 - dotfiles/config/polybar/colors.ini | 15 - dotfiles/config/polybar/config-small.ini | 297 -------- dotfiles/config/polybar/modules.ini | 636 ------------------ dotfiles/config/polybar/scripts/launcher.sh | 3 - .../config/polybar/scripts/launcher_bin.sh | 3 - .../hyprcursors/X_cursor.hlc | Bin 620 -> 0 bytes .../hyprcursors/bd_double_arrow.hlc | Bin 692 -> 0 bytes .../hyprcursors/bottom_left_corner.hlc | Bin 1338 -> 0 bytes .../hyprcursors/bottom_right_corner.hlc | Bin 1320 -> 0 bytes .../hyprcursors/bottom_side.hlc | Bin 780 -> 0 bytes .../hyprcursors/bottom_tee.hlc | Bin 570 -> 0 bytes .../hyprcursors/center_ptr.hlc | Bin 911 -> 0 bytes .../hyprcursors/circle.hlc | Bin 1363 -> 0 bytes .../hyprcursors/context-menu.hlc | Bin 1405 -> 0 bytes .../hyprcursors/copy.hlc | Bin 1525 -> 0 bytes .../hyprcursors/cross.hlc | Bin 574 -> 0 bytes .../hyprcursors/crossed_circle.hlc | Bin 673 -> 0 bytes .../hyprcursors/crosshair.hlc | Bin 1179 -> 0 bytes .../hyprcursors/dnd-ask.hlc | Bin 1672 -> 0 bytes .../hyprcursors/dnd-copy.hlc | Bin 1600 -> 0 bytes .../hyprcursors/dnd-link.hlc | Bin 1642 -> 0 bytes .../hyprcursors/dnd_no_drop.hlc | Bin 1560 -> 0 bytes .../hyprcursors/dotbox.hlc | Bin 675 -> 0 bytes .../hyprcursors/fd_double_arrow.hlc | Bin 698 -> 0 bytes .../hyprcursors/grabbing.hlc | Bin 1051 -> 0 bytes .../hyprcursors/hand1.hlc | Bin 1500 -> 0 bytes .../hyprcursors/hand2.hlc | Bin 1091 -> 0 bytes .../hyprcursors/left_ptr.hlc | Bin 921 -> 0 bytes .../hyprcursors/left_ptr_watch.hlc | Bin 48404 -> 0 bytes .../hyprcursors/left_side.hlc | Bin 772 -> 0 bytes .../hyprcursors/left_tee.hlc | Bin 571 -> 0 bytes .../hyprcursors/link.hlc | Bin 1519 -> 0 bytes .../hyprcursors/ll_angle.hlc | Bin 540 -> 0 bytes .../hyprcursors/lr_angle.hlc | Bin 548 -> 0 bytes .../hyprcursors/move.hlc | Bin 1176 -> 0 bytes .../hyprcursors/pencil.hlc | Bin 630 -> 0 bytes .../hyprcursors/plus.hlc | Bin 502 -> 0 bytes .../hyprcursors/pointer-move.hlc | Bin 1295 -> 0 bytes .../hyprcursors/question_arrow.hlc | Bin 1288 -> 0 bytes .../hyprcursors/right_ptr.hlc | Bin 909 -> 0 bytes .../hyprcursors/right_side.hlc | Bin 783 -> 0 bytes .../hyprcursors/right_tee.hlc | Bin 915 -> 0 bytes .../hyprcursors/sb_down_arrow.hlc | Bin 674 -> 0 bytes .../hyprcursors/sb_h_double_arrow.hlc | Bin 875 -> 0 bytes .../hyprcursors/sb_left_arrow.hlc | Bin 819 -> 0 bytes .../hyprcursors/sb_right_arrow.hlc | Bin 826 -> 0 bytes .../hyprcursors/sb_up_arrow.hlc | Bin 667 -> 0 bytes .../hyprcursors/sb_v_double_arrow.hlc | Bin 878 -> 0 bytes .../hyprcursors/tcross.hlc | Bin 587 -> 0 bytes .../hyprcursors/top_left_corner.hlc | Bin 1317 -> 0 bytes .../hyprcursors/top_right_corner.hlc | Bin 1325 -> 0 bytes .../hyprcursors/top_side.hlc | Bin 767 -> 0 bytes .../hyprcursors/top_tee.hlc | Bin 566 -> 0 bytes .../hyprcursors/ul_angle.hlc | Bin 532 -> 0 bytes .../hyprcursors/ur_angle.hlc | Bin 537 -> 0 bytes .../hyprcursors/vertical-text.hlc | Bin 735 -> 0 bytes .../hyprcursors/wait.hlc | Bin 65810 -> 0 bytes .../hyprcursors/wayland-cursor.hlc | Bin 2600 -> 0 bytes .../hyprcursors/xterm.hlc | Bin 738 -> 0 bytes .../hyprcursors/zoom-in.hlc | Bin 980 -> 0 bytes .../hyprcursors/zoom-out.hlc | Bin 917 -> 0 bytes .../icons/bibata-modern-classic/manifest.hl | 4 - dotfiles/xinitrc | 1 - flake.nix | 17 +- homeConfigs/dotfiles/config/bspwm/bspwmrc | 2 + .../dotfiles}/config/hypr/hyprland.conf | 0 .../dotfiles}/config/hypr/hyprlock.conf | 0 .../dotfiles}/config/nitrogen/bg-saved.cfg | 0 .../dotfiles}/config/nitrogen/wallpaper.png | Bin .../dotfiles}/config/nvim/init.vim | 0 .../dotfiles/config/polybar/colors.ini | 152 +++++ .../dotfiles/config/polybar/config-small.ini | 233 +++++++ .../dotfiles}/config/polybar/config.ini | 0 .../dotfiles/config/polybar/modules.ini | 132 ++++ .../dotfiles}/config/polybar/user_modules.ini | 0 .../dotfiles}/config/sxhkd/sxhkdrc | 0 .../dotfiles}/local/bin/brightness | 0 .../dotfiles}/local/bin/desk_sync | 0 .../dotfiles}/local/bin/hibernate | 0 .../dotfiles}/local/bin/kbd_brightness | 0 .../dotfiles}/local/bin/scan | 0 {dotfiles => homeConfigs/dotfiles}/vimrc | 0 home.nix => homeConfigs/home.nix | 104 ++- .../hosts}/desktop/bspwm/host.sh | 0 .../hosts}/desktop/bspwm/screenlayout.sh | 0 {homes => homeConfigs/hosts}/desktop/home.nix | 0 {homes => homeConfigs/hosts}/ft/bspwm/host.sh | 0 .../hosts}/ft/dotfiles/config/bspwm/bspwmrc | 0 .../ft/dotfiles/config/nitrogen/607699.png | Bin .../ft/dotfiles/config/nitrogen/bg-saved.cfg | 0 .../ft/dotfiles/config/nitrogen/nitrogen.cfg | 0 .../config/nitrogen/thumb-1920-814854.png | Bin .../hosts}/ft/dotfiles/config/sxhkd/sxhkdrc | 0 {homes => homeConfigs/hosts}/ft/home.nix | 0 .../hosts}/laptop/bspwm/host.sh | 0 .../hosts}/laptop/bspwm/screenLayoutDocked.sh | 0 .../hosts}/laptop/bspwm/screenLayoutHDMI.sh | 0 .../hosts}/laptop/bspwm/screenLayoutSingle.sh | 0 {homes => homeConfigs/hosts}/laptop/home.nix | 3 - .../hosts}/laptop/hyprland.nix | 0 .../hosts}/laptop/waybar.nix | 0 {homes => homeConfigs/hosts}/modules/game.nix | 0 .../hosts}/modules/nitrogen.nix | 0 {homes => homeConfigs/hosts}/server/home.nix | 0 {homes => homeConfigs/hosts}/vbox/home.nix | 0 homeConfigs/modules/alacritty.nix | 20 + homeConfigs/modules/firefox.nix | 19 + homeConfigs/modules/git.nix | 27 + homeConfigs/modules/vim.nix | 37 + homeConfigs/modules/wayland/hypridle.nix | 28 + homeConfigs/modules/wayland/hyprland.nix | 175 +++++ homeConfigs/modules/wayland/hyprlock.nix | 32 + homeConfigs/modules/wayland/packages.nix | 13 + homeConfigs/modules/wayland/waybar.nix | 149 ++++ homeConfigs/modules/x11/bspwm.nix | 39 ++ homeConfigs/modules/x11/picom.nix | 27 + homeConfigs/modules/x11/polybar.nix | 236 +++++++ homeConfigs/modules/x11/sxhkd.nix | 77 +++ homeConfigs/modules/x11/x11.nix | 16 + homeConfigs/packages.nix | 37 + modules/alacritty.nix | 12 - modules/firefox.nix | 11 - modules/git.nix | 18 - modules/hyprland.nix | 191 ------ modules/picom.nix | 25 - modules/vim.nix | 28 - modules/waybar.nix | 147 ---- osConfigs/global.nix | 39 +- osConfigs/hosts/laptop.nix | 15 +- osConfigs/packages.nix | 26 + 133 files changed, 1541 insertions(+), 1563 deletions(-) delete mode 100644 dotfiles/bashrc delete mode 100755 dotfiles/config/bspwm/bspwmrc delete mode 100644 dotfiles/config/polybar/colors.ini delete mode 100644 dotfiles/config/polybar/config-small.ini delete mode 100644 dotfiles/config/polybar/modules.ini delete mode 100755 dotfiles/config/polybar/scripts/launcher.sh delete mode 100755 dotfiles/config/polybar/scripts/launcher_bin.sh delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/X_cursor.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/bd_double_arrow.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/bottom_left_corner.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/bottom_right_corner.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/bottom_side.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/bottom_tee.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/center_ptr.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/circle.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/context-menu.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/copy.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/cross.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/crossed_circle.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/crosshair.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/dnd-ask.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/dnd-copy.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/dnd-link.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/dnd_no_drop.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/dotbox.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/fd_double_arrow.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/grabbing.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/hand1.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/hand2.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/left_ptr.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/left_ptr_watch.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/left_side.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/left_tee.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/link.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/ll_angle.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/lr_angle.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/move.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/pencil.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/plus.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/pointer-move.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/question_arrow.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/right_ptr.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/right_side.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/right_tee.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/sb_down_arrow.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/sb_h_double_arrow.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/sb_left_arrow.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/sb_right_arrow.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/sb_up_arrow.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/sb_v_double_arrow.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/tcross.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/top_left_corner.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/top_right_corner.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/top_side.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/top_tee.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/ul_angle.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/ur_angle.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/vertical-text.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/wait.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/wayland-cursor.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/xterm.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/zoom-in.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/hyprcursors/zoom-out.hlc delete mode 100644 dotfiles/local/share/icons/bibata-modern-classic/manifest.hl delete mode 100755 dotfiles/xinitrc create mode 100755 homeConfigs/dotfiles/config/bspwm/bspwmrc rename {dotfiles => homeConfigs/dotfiles}/config/hypr/hyprland.conf (100%) rename {dotfiles => homeConfigs/dotfiles}/config/hypr/hyprlock.conf (100%) rename {dotfiles => homeConfigs/dotfiles}/config/nitrogen/bg-saved.cfg (100%) rename {dotfiles => homeConfigs/dotfiles}/config/nitrogen/wallpaper.png (100%) rename {dotfiles => homeConfigs/dotfiles}/config/nvim/init.vim (100%) create mode 100644 homeConfigs/dotfiles/config/polybar/colors.ini create mode 100644 homeConfigs/dotfiles/config/polybar/config-small.ini rename {dotfiles => homeConfigs/dotfiles}/config/polybar/config.ini (100%) create mode 100644 homeConfigs/dotfiles/config/polybar/modules.ini rename {dotfiles => homeConfigs/dotfiles}/config/polybar/user_modules.ini (100%) rename {dotfiles => homeConfigs/dotfiles}/config/sxhkd/sxhkdrc (100%) rename {dotfiles => homeConfigs/dotfiles}/local/bin/brightness (100%) rename {dotfiles => homeConfigs/dotfiles}/local/bin/desk_sync (100%) rename {dotfiles => homeConfigs/dotfiles}/local/bin/hibernate (100%) rename {dotfiles => homeConfigs/dotfiles}/local/bin/kbd_brightness (100%) rename {dotfiles => homeConfigs/dotfiles}/local/bin/scan (100%) rename {dotfiles => homeConfigs/dotfiles}/vimrc (100%) rename home.nix => homeConfigs/home.nix (51%) rename {homes => homeConfigs/hosts}/desktop/bspwm/host.sh (100%) rename {homes => homeConfigs/hosts}/desktop/bspwm/screenlayout.sh (100%) rename {homes => homeConfigs/hosts}/desktop/home.nix (100%) rename {homes => homeConfigs/hosts}/ft/bspwm/host.sh (100%) rename {homes => homeConfigs/hosts}/ft/dotfiles/config/bspwm/bspwmrc (100%) rename {homes => homeConfigs/hosts}/ft/dotfiles/config/nitrogen/607699.png (100%) rename {homes => homeConfigs/hosts}/ft/dotfiles/config/nitrogen/bg-saved.cfg (100%) rename {homes => homeConfigs/hosts}/ft/dotfiles/config/nitrogen/nitrogen.cfg (100%) rename {homes => homeConfigs/hosts}/ft/dotfiles/config/nitrogen/thumb-1920-814854.png (100%) rename {homes => homeConfigs/hosts}/ft/dotfiles/config/sxhkd/sxhkdrc (100%) rename {homes => homeConfigs/hosts}/ft/home.nix (100%) rename {homes => homeConfigs/hosts}/laptop/bspwm/host.sh (100%) rename {homes => homeConfigs/hosts}/laptop/bspwm/screenLayoutDocked.sh (100%) rename {homes => homeConfigs/hosts}/laptop/bspwm/screenLayoutHDMI.sh (100%) rename {homes => homeConfigs/hosts}/laptop/bspwm/screenLayoutSingle.sh (100%) rename {homes => homeConfigs/hosts}/laptop/home.nix (86%) rename {homes => homeConfigs/hosts}/laptop/hyprland.nix (100%) rename {homes => homeConfigs/hosts}/laptop/waybar.nix (100%) rename {homes => homeConfigs/hosts}/modules/game.nix (100%) rename {homes => homeConfigs/hosts}/modules/nitrogen.nix (100%) rename {homes => homeConfigs/hosts}/server/home.nix (100%) rename {homes => homeConfigs/hosts}/vbox/home.nix (100%) create mode 100644 homeConfigs/modules/alacritty.nix create mode 100644 homeConfigs/modules/firefox.nix create mode 100644 homeConfigs/modules/git.nix create mode 100644 homeConfigs/modules/vim.nix create mode 100644 homeConfigs/modules/wayland/hypridle.nix create mode 100644 homeConfigs/modules/wayland/hyprland.nix create mode 100644 homeConfigs/modules/wayland/hyprlock.nix create mode 100644 homeConfigs/modules/wayland/packages.nix create mode 100644 homeConfigs/modules/wayland/waybar.nix create mode 100644 homeConfigs/modules/x11/bspwm.nix create mode 100644 homeConfigs/modules/x11/picom.nix create mode 100644 homeConfigs/modules/x11/polybar.nix create mode 100644 homeConfigs/modules/x11/sxhkd.nix create mode 100644 homeConfigs/modules/x11/x11.nix create mode 100644 homeConfigs/packages.nix delete mode 100644 modules/alacritty.nix delete mode 100644 modules/firefox.nix delete mode 100644 modules/git.nix delete mode 100644 modules/hyprland.nix delete mode 100644 modules/picom.nix delete mode 100644 modules/vim.nix delete mode 100644 modules/waybar.nix create mode 100644 osConfigs/packages.nix diff --git a/Makefile b/Makefile index a9bed8b..7ba28bd 100644 --- a/Makefile +++ b/Makefile @@ -15,3 +15,6 @@ os: sudo nixos-rebuild $(MODE) $(FLAGS) --flake $(FLAKE)#$(HOST) home : home-manager $(MODE) $(FLAGS) --flake $(FLAKE)#$(HOST) + +cleanup : + sudo nix-collect-garbage -d diff --git a/dotfiles/bashrc b/dotfiles/bashrc deleted file mode 100644 index 6bbbecb..0000000 --- a/dotfiles/bashrc +++ /dev/null @@ -1,33 +0,0 @@ -export PATH="$HOME/.local/bin:$PATH" -alias ls='ls --color=auto' -alias grep='grep --color=auto' -export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' -alias vim=nvim -alias vi=nvim -alias "copy=xclip -selection c" -alias hl="Hyprland" -cat_cp() { - cat $@ | xclip -selection c -} - -shopt -s histappend - -alias clr=clear - -cd() { - builtin cd "$@" - echo -n "$PWD" > ~/.last_directory -} - -export PATH="$HOME/.local/bin:$PATH" -export PATH="$HOME/pyenv/bin:$PATH" -alias tagueule="asusctl profile -P Quiet" - -[ -z "${PS1:-}" ] && return - -if [ -f ~/.last_directory ];then - echo -n going to - cat ~/.last_directory - echo - builtin cd "$(cat ~/.last_directory)" -fi diff --git a/dotfiles/config/bspwm/bspwmrc b/dotfiles/config/bspwm/bspwmrc deleted file mode 100755 index 4658cb3..0000000 --- a/dotfiles/config/bspwm/bspwmrc +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh - -if [ -f $HOME/.config/bspwm/screenlayout.sh ];then /bin/sh $HOME/.config/bspwm/screenlayout.sh ;fi -if [ -f $HOME/.config/bspwm/host.sh ];then /bin/sh $HOME/.config/bspwm/host.sh;fi - -pgrep sxhkd > /dev/null || sxhkd & -pgrep polybar >/dev/null || polybar -q main -c "$HOME/.config/polybar/config.ini"& - -bspc config border_width 2 -bspc config window_gap 10 - -bspc config split_ratio 0.52 -bspc config borderless_monocle true -bspc config gapless_monocle true - -pgrep alacritty > /dev/null || alacritty & -pgrep picom > /dev/null || picom & -pgrep dunst >/dev/null || dunst & -numlockx on & -setxkbmap fr us& -nitrogen --restore & -pgrep activate-linux >/dev/null || (sleep 2;activate-linux -d)& diff --git a/dotfiles/config/polybar/colors.ini b/dotfiles/config/polybar/colors.ini deleted file mode 100644 index 4c6fa9f..0000000 --- a/dotfiles/config/polybar/colors.ini +++ /dev/null @@ -1,15 +0,0 @@ -[color] - -;; Use pywal.sh in scripts directory to use colors from an image/wallpaper. - -;; main colors -background = #AA111111 -foreground = #CCCCCC -foreground-alt = #FFFFFF -alpha = #00000000 - -;; shades -shade1 = #AAFFFFFF -shade2 = #AAFF0000 - -;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ diff --git a/dotfiles/config/polybar/config-small.ini b/dotfiles/config/polybar/config-small.ini deleted file mode 100644 index 208c71b..0000000 --- a/dotfiles/config/polybar/config-small.ini +++ /dev/null @@ -1,297 +0,0 @@ -# **************************************************************************** # -# # -# ::: :::::::: # -# config-small.ini :+: :+: :+: # -# +:+ +:+ +:+ # -# By: tomoron +#+ +:+ +#+ # -# +#+#+#+#+#+ +#+ # -# Created: 2024/08/28 20:38:59 by tomoron #+# #+# # -# Updated: 2024/10/16 22:18:29 by tomoron ### ########.fr # -# # -# **************************************************************************** # - -;; Global WM Settings - -[global/wm] -; Adjust the _NET_WM_STRUT_PARTIAL top value -; Used for top aligned bars -margin-bottom = 0 - -; Adjust the _NET_WM_STRUT_PARTIAL bottom value -; Used for bottom aligned bars -margin-top = 0 - - -;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ - -;; File Inclusion -; include an external file, like module file, etc. - -include-file = ~/.config/polybar/colors.ini -include-file = ~/.config/polybar/modules.ini -include-file = ~/.config/polybar/user_modules.ini - -;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ - -;; Bar Settings - -[bar/main] -; Use either of the following command to list available outputs: -; If unspecified, the application will pick the first one it finds. -; $ polybar -m | cut -d ':' -f 1 -; $ xrandr -q | grep " connected" | cut -d ' ' -f1 -monitor = ${env:MONITOR:} - -; Use the specified monitor as a fallback if the main one is not found. -monitor-fallback = - -; Require the monitor to be in connected state -; XRandR sometimes reports my monitor as being disconnected (when in use) -monitor-strict = false - -; Tell the Window Manager not to configure the window. -; Use this to detach the bar if your WM is locking its size/position. -override-redirect = false - -; Put the bar at the bottom of the screen -bottom = false - -; Prefer fixed center position for the `modules-center` block -; When false, the center position will be based on the size of the other blocks. -fixed-center = true - -; Dimension defined as pixel value (e.g. 35) or percentage (e.g. 50%), -; the percentage can optionally be extended with a pixel offset like so: -; 50%:-10, this will result in a width or height of 50% minus 10 pixels -width = 100% -height = 40 - -; Offset defined as pixel value (e.g. 35) or percentage (e.g. 50%) -; the percentage can optionally be extended with a pixel offset like so: -; 50%:-10, this will result in an offset in the x or y direction -; of 50% minus 10 pixels -offset-x = 0 -offset-y = 0 - -; Background ARGB color (e.g. #f00, #ff992a, #ddff1023) -background = ${color.alpha} - -; Foreground ARGB color (e.g. #f00, #ff992a, #ddff1023) -foreground = ${color.foreground} - -; Background gradient (vertical steps) -; background-[0-9]+ = #aarrggbb -;;background-0 = - -; Value used for drawing rounded corners -; Note: This shouldn't be used together with border-size because the border -; doesn't get rounded -; Individual top/bottom values can be defined using: -; radius-{top,bottom} -radius-top = 0.0 -radius-bottom = 0.0 - -; Under-/overline pixel size and argb color -; Individual values can be defined using: -; {overline,underline}-size -; {overline,underline}-color -underline-size = 2 -underline-color = ${color.foreground} - -; Values applied to all borders -; Individual side values can be defined using: -; border-{left,top,right,bottom}-size -; border-{left,top,right,bottom}-color -; The top and bottom borders are added to the bar height, so the effective -; window height is: -; height + border-top-size + border-bottom-size -; Meanwhile the effective window width is defined entirely by the width key and -; the border is placed withing this area. So you effectively only have the -; following horizontal space on the bar: -; width - border-right-size - border-left-size -border-size = 0 -border-color = ${color.background} - -; Number of spaces to add at the beginning/end of the bar -; Individual side values can be defined using: -; padding-{left,right} -padding = 0 - -; Number of spaces to add before/after each module -; Individual side values can be defined using: -; module-margin-{left,right} -module-margin-left = 0 -module-margin-right = 0 - -;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ - -; Fonts are defined using ; -; Font names are specified using a fontconfig pattern. -; font-0 = NotoSans-Regular:size=8;2 -; font-1 = MaterialIcons:size=10 -; font-2 = Termsynu:size=8;-1 -; font-3 = FontAwesome:size=10 -; See the Fonts wiki page for more details - -font-0 = "Iosevka Nerd Font:style=Bold:pixelsize=13;4" -font-1 = "Iosevka Nerd Font:style=Bold:pixelsize=15;4" -font-2 = "Iosevka Nerd Font:style=Bold:pixelsize=15;4" - -; Modules are added to one of the available blocks -; modules-left = cpu ram -; modules-center = xwindow xbacklight -; modules-right = ipc clock - -modules-left = workspaces space mpris -modules-center = -modules-right = fans dgpu memory sep filesystem sep cpu sep temperature sep polybar sep battery sep network sep date - -;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ - -; The separator will be inserted between the output of each module -separator = - -; Opacity value between 0.0 and 1.0 used on fade in/out -dim-value = 1.0 - -; Value to be used to set the WM_NAME atom -; If the value is empty or undefined, the atom value -; will be created from the following template: polybar-[BAR]_[MONITOR] -; NOTE: The placeholders are not available for custom values -wm-name = - -; Locale used to localize various module data (e.g. date) -; Expects a valid libc locale, for example: sv_SE.UTF-8 -locale = - -; Position of the system tray window -; If empty or undefined, tray support will be disabled -; NOTE: A center aligned tray will cover center aligned modules -; -; Available positions: -; left -; center -; right -; none -tray-position = none - -; If true, the bar will not shift its -; contents when the tray changes -tray-detached = false - -; Tray icon max size -tray-maxsize = 16 - -; Background color for the tray container -; ARGB color (e.g. #f00, #ff992a, #ddff1023) -; By default the tray container will use the bar -; background color. -tray-background = ${color.background} - -; Tray offset defined as pixel value (e.g. 35) or percentage (e.g. 50%) -tray-offset-x = 0 -tray-offset-y = 0 - -; Pad the sides of each tray icon -tray-padding = 0 - -; Scale factor for tray clients -tray-scale = 1.0 - -; Restack the bar window and put it above the -; selected window manager's root -; -; Fixes the issue where the bar is being drawn -; on top of fullscreen window's -; -; Currently supported WM's: -; bspwm -; i3 (requires: `override-redirect = true`) -;;wm-restack = - -; Set a DPI values used when rendering text -; This only affects scalable fonts -; dpi = - -; Enable support for inter-process messaging -; See the Messaging wiki page for more details. -enable-ipc = true - -; Fallback click handlers that will be called if -; there's no matching module handler found. -click-left = -click-middle = -click-right = -scroll-up = -scroll-down = -double-click-left = -double-click-middle = -double-click-right = - -; Requires polybar to be built with xcursor support (xcb-util-cursor) -; Possible values are: -; - default : The default pointer as before, can also be an empty string (default) -; - pointer : Typically in the form of a hand -; - ns-resize : Up and down arrows, can be used to indicate scrolling -cursor-click = -cursor-scroll = - -;; WM Workspace Specific - -; bspwm -;;scroll-up = bspwm-desknext -;;scroll-down = bspwm-deskprev -;;scroll-up = bspc desktop -f prev.local -;;scroll-down = bspc desktop -f next.local - -;i3 -;;scroll-up = i3wm-wsnext -;;scroll-down = i3wm-wsprev -;;scroll-up = i3-msg workspace next_on_output -;;scroll-down = i3-msg workspace prev_on_output - -;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ - -;; Application Settings - -[settings] -; The throttle settings lets the eventloop swallow up til X events -; if they happen within Y millisecond after first event was received. -; This is done to prevent flood of update event. -; -; For example if 5 modules emit an update event at the same time, we really -; just care about the last one. But if we wait too long for events to swallow -; the bar would appear sluggish so we continue if timeout -; expires or limit is reached. -throttle-output = 5 -throttle-output-for = 10 - -; Time in milliseconds that the input handler will wait between processing events -;throttle-input-for = 30 - -; Reload upon receiving XCB_RANDR_SCREEN_CHANGE_NOTIFY events -screenchange-reload = false - -; Compositing operators -; @see: https://www.cairographics.org/manual/cairo-cairo-t.html#cairo-operator-t -compositing-background = source -compositing-foreground = over -compositing-overline = over -compositing-underline = over -compositing-border = over - -; Define fallback values used by all module formats -;format-foreground = -;format-background = -;format-underline = -;format-overline = -;format-spacing = -;format-padding = -;format-margin = -;format-offset = - -; Enables pseudo-transparency for the bar -; If set to true the bar can be transparent without a compositor. -pseudo-transparency = false - -;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ diff --git a/dotfiles/config/polybar/modules.ini b/dotfiles/config/polybar/modules.ini deleted file mode 100644 index 4f51e55..0000000 --- a/dotfiles/config/polybar/modules.ini +++ /dev/null @@ -1,636 +0,0 @@ -# **************************************************************************** # -# # -# ::: :::::::: # -# modules.ini :+: :+: :+: # -# +:+ +:+ +:+ # -# By: tomoron +#+ +:+ +#+ # -# +#+#+#+#+#+ +#+ # -# Created: 2024/08/28 20:38:49 by tomoron #+# #+# # -# Updated: 2024/10/16 22:55:55 by tomoron ### ########.fr # -# # -# **************************************************************************** # - -[module/mpris] -type = custom/script -exec-if = playerctl metadata -exec = playerctl metadata --format '{{ playerName }}:{{ artist }} - {{title}}' -interval = 1 -interval-if = 1 - -[module/dgpu] -type = custom/script -exec-if = test "$(supergfxctl -g)" = "Hybrid" -exec = echo " on |" -format-padding=1 -interval-if = 10 -interval = 100 - -[module/fans] -type = custom/script -exec-if = test "$(cat /sys/class/hwmon/hwmon6/fan1_input)" -gt 0 -o "$(cat /sys/class/hwmon/hwmon6/fan2_input)" -gt 0 -exec = echo " " "$(cat /sys/class/hwmon/hwmon6/fan1_input).$(cat /sys/class/hwmon/hwmon6/fan2_input) |" -interval = 1 -interval-if = 1 - -[module/pulseaudio] -type = internal/pulseaudio - -; Soundcard to be used -; Usually in the format hw:# where # is the card number -; You can find the different card numbers in `/proc/asound/cards` -master-soundcard = default -speaker-soundcard = default -headphone-soundcard = default - -; Name of the master, speaker and headphone mixers -; Use the following command to list available mixer controls: -; $ amixer scontrols | sed -nr "s/.*'([[:alnum:]]+)'.*/\1/p" -; If master, speaker or headphone-soundcard isn't the default, -; use `amixer -c # scontrols` instead where # is the number -; of the master, speaker or headphone soundcard respectively -; -; Default: Master -master-mixer = Master - -; Optionally define speaker and headphone mixers -; Default: none -;;speaker-mixer = Speaker -; Default: none -;;headphone-mixer = Headphone - -; NOTE: This is required if headphone_mixer is defined -; Use the following command to list available device controls -; $ amixer controls | sed -r "/CARD/\!d; s/.*=([0-9]+).*name='([^']+)'.*/printf '%3.0f: %s\n' '\1' '\2'/e" | sort -; You may also need to use `amixer -c # controls` as above for the mixer names -; Default: none -;;headphone-id = 9 - -; Use volume mapping (similar to amixer -M and alsamixer), where the increase in volume is linear to the ear -; Default: false -;;mapped = true - -; Interval for volume increase/decrease (in percent points) -; Default: 5 -interval = 5 - -; Available tags: -; (default) -; -; (default) -; -; -format-muted = "" -format-muted-prefix = "󰝟 " -format-muted-prefix-font = 2 -format-muted-padding = 1 - -; Available tokens: -; %percentage% (default) -label-volume = %percentage%% - -; Available tokens: -; %percentage% (default -label-muted = " M" -label-muted-foreground = ${color.foreground} - -; Only applies if is used -ramp-volume-0 = "" -ramp-volume-1 = "" -ramp-volume-2 = " " -ramp-volume-font = 2 - -; If defined, it will replace when -; headphones are plugged in to `headphone_control_numid` -; If undefined, will be used for both -; Only applies if is used -ramp-headphones-0 =  - -[module/battery] -type = internal/battery - -; This is useful in case the battery never reports 100% charge -full-at = 100 - -; Use the following command to list batteries and adapters: -; $ ls -1 /sys/class/power_supply/ -battery = BAT0 -adapter = AC0 - -; If an inotify event haven't been reported in this many -; seconds, manually poll for new values. -; -; Needed as a fallback for systems that don't report events -; on sysfs/procfs. -; -; Disable polling by setting the interval to 0. -; -; Default: 5 -poll-interval = 2 - -; see "man date" for details on how to format the time string -; NOTE: if you want to use syntax tags here you need to use %%{...} -; Default: %H:%M:%S -time-format = %H:%M - -; Available tags: -; (default) -; -; -; -format-charging = "󰂄 " -format-charging-padding = 1 - -; Available tags: -; (default) -; -; -; -format-discharging = " " -format-discharging-padding = 1 - -; Available tags: -; (default) -; -; -format-full = -format-full-prefix = " " -format-full-prefix-font = 2 -format-full-padding = 2 - -; Available tokens: -; %percentage% (default) -; %time% -; %consumption% (shows current charge rate in watts) -label-charging = %percentage%% %time% - -; Available tokens: -; %percentage% (default) -; %time% -; %consumption% (shows current discharge rate in watts) -label-discharging = %percentage%% %time% - -; Available tokens: -; %percentage% (default) -label-full = " Full" - -; Only applies if is used -ramp-capacity-0 = " " -ramp-capacity-1 = " " -ramp-capacity-2 = " " -ramp-capacity-3 = " " -ramp-capacity-4 = " " -ramp-capacity-font = 2 - -; Only applies if is used -;bar-capacity-width = 10 - -; Only applies if is used -animation-charging-0 = "󰂇 " -animation-charging-1 = "󰢝 " -animation-charging-2 = "󰂉 " -animation-charging-3 = "󰂋 " -animation-charging-4 = "󰂅 " -animation-charging-font = 2 - -; Framerate in milliseconds -animation-charging-framerate = 750 - -; Only applies if is used -;;animation-discharging-0 = ${battery.anim0} -;;animation-discharging-1 = ${battery.anim1} - -; Framerate in milliseconds -;animation-discharging-framerate = 500 - -; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ - -[module/cpu] -type = internal/cpu - -; Seconds to sleep between updates -; Default: 1 -interval = 1 - -; Available tags: -;