diff --git a/modules/home/opt/bin/default.nix b/modules/home/opt/bin/default.nix index aeb26cb0..260ab729 100644 --- a/modules/home/opt/bin/default.nix +++ b/modules/home/opt/bin/default.nix @@ -27,10 +27,6 @@ executable = true; text = import ./theme/materialpy.nix { }; }; - ".local/bin/panes" = { - executable = true; - text = import ./eyecandy/panes.nix { }; - }; ".local/bin/powermenu" = { executable = true; text = import ./rofiscripts/powermenu.nix { }; @@ -63,7 +59,7 @@ executable = true; text = import ./zellij/zellij-start.nix { }; }; - ".local/bin/swayscratch" = { + ".local/bin/zstart" = { executable = true; text = import ./zellij/zellij-start.nix { }; }; diff --git a/modules/home/opt/bin/eyecandy/panes.nix b/modules/home/opt/bin/eyecandy/panes.nix deleted file mode 100644 index 164db345..00000000 --- a/modules/home/opt/bin/eyecandy/panes.nix +++ /dev/null @@ -1,18 +0,0 @@ -_: '' - #> Syntax: zsh - f=3 b=4 - for j in f b; do - for i in {0..7}; do - printf -v $j$i %b "\e[''${!j}''${i}m" - done - done - d=$'\e[1m' - t=$'\e[0m' - v=$'\e[7m' - cat << EOF - $f0████$d▄$t $f1████$d▄$t $f2████$d▄$t $f3████$d▄$t $f4████$d▄$t $f5████$d▄$t $f6████$d▄$t $f7████$d▄$t - $f0████$d█$t $f1████$d█$t $f2████$d█$t $f3████$d█$t $f4████$d█$t $f5████$d█$t $f6████$d█$t $f7████$d█$t - $f0████$d█$t $f1████$d█$t $f2████$d█$t $f3████$d█$t $f4████$d█$t $f5████$d█$t $f6████$d█$t $f7████$d█$t - $d$f0 ▀▀▀▀ $d$f1 ▀▀▀▀ $f2▀▀▀▀ $f3▀▀▀▀ $f4▀▀▀▀ $f5▀▀▀▀ $f6▀▀▀▀ $f7▀▀▀▀$t - EOF -'' diff --git a/modules/home/opt/options.nix b/modules/home/opt/options.nix index 96ebf848..8f5d6e32 100644 --- a/modules/home/opt/options.nix +++ b/modules/home/opt/options.nix @@ -20,7 +20,6 @@ spicetify.enable = lib.mkEnableOption "Enable spicetify"; sss.enable = lib.mkEnableOption "Enable sss"; swaybg.enable = lib.mkEnableOption "Enable swaybg"; - swayfx.enable = lib.mkEnableOption "Enable swayfx"; swayidle.enable = lib.mkEnableOption "Enable swayidle"; wezterm.enable = lib.mkEnableOption "Enable wezterm"; zellij.enable = lib.mkEnableOption "Enable zellij"; diff --git a/modules/home/opt/utils/default.nix b/modules/home/opt/utils/default.nix index 03225d29..7c9b0256 100644 --- a/modules/home/opt/utils/default.nix +++ b/modules/home/opt/utils/default.nix @@ -1,12 +1,10 @@ { imports = [ ./git - ./gitui ./gpg-agent ./k9s ./keybase ./lazygit - ./picom ./rnnoise ./rofi ./sss diff --git a/modules/home/opt/utils/gitui/default.nix b/modules/home/opt/utils/gitui/default.nix deleted file mode 100644 index d33db892..00000000 --- a/modules/home/opt/utils/gitui/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, config, ... }: -{ - config = lib.mkIf config.modules.gitui.enable { - programs.gitui = { - enable = true; - keyConfig = '' - ( - open_help: Some(( code: Char('?'), modifiers: ( bits: 0,),)), - - move_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)), - move_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)), - move_up: Some(( code: Char('k'), modifiers: ( bits: 0,),)), - move_down: Some(( code: Char('j'), modifiers: ( bits: 0,),)), - - popup_up: Some(( code: Char('p'), modifiers: ( bits: 2,),)), - popup_down: Some(( code: Char('n'), modifiers: ( bits: 2,),)), - page_up: Some(( code: Char('b'), modifiers: ( bits: 2,),)), - page_down: Some(( code: Char('f'), modifiers: ( bits: 2,),)), - home: Some(( code: Char('g'), modifiers: ( bits: 0,),)), - end: Some(( code: Char('G'), modifiers: ( bits: 1,),)), - shift_up: Some(( code: Char('K'), modifiers: ( bits: 1,),)), - shift_down: Some(( code: Char('J'), modifiers: ( bits: 1,),)), - - edit_file: Some(( code: Char('I'), modifiers: ( bits: 1,),)), - - status_reset_item: Some(( code: Char('U'), modifiers: ( bits: 1,),)), - - diff_reset_lines: Some(( code: Char('u'), modifiers: ( bits: 0,),)), - diff_stage_lines: Some(( code: Char('s'), modifiers: ( bits: 0,),)), - - stashing_save: Some(( code: Char('w'), modifiers: ( bits: 0,),)), - stashing_toggle_index: Some(( code: Char('m'), modifiers: ( bits: 0,),)), - - stash_open: Some(( code: Char('l'), modifiers: ( bits: 0,),)), - - abort_merge: Some(( code: Char('M'), modifiers: ( bits: 1,),)), - ) - ''; - }; - }; -} diff --git a/modules/home/opt/utils/picom/default.nix b/modules/home/opt/utils/picom/default.nix deleted file mode 100644 index 77269463..00000000 --- a/modules/home/opt/utils/picom/default.nix +++ /dev/null @@ -1,195 +0,0 @@ -{ pkgs, ... }: -{ - services.picom = { - enable = true; - #package = nixpkgs-f2k.packages.${pkgs.system}.picom-pijulius; - package = pkgs.picom.overrideAttrs (oldAttrs: { - pname = "compfy"; - buildInputs = [ pkgs.pcre2 ] ++ oldAttrs.buildInputs; - src = pkgs.fetchFromGitHub { - owner = "allusive-dev"; - repo = "compfy"; - rev = "1.7.2"; - hash = "sha256-7hvzwLEG5OpJzsrYa2AaIW8X0CPyOnTLxz+rgWteNYY="; - }; - postInstall = ''''; - }); - }; - home.file.".config/compfy/compfy.conf".text = '' - - # Enables patches for specific window managers. - # Currently patched: "awesome", "dwm", "herb" - wm-support = "awesome"; - - ################################# - # ANIMATIONS # - ################################# - - # Toggles whether animations should be used for windows - animations = true; - - # Changes animation stiffness. - # What stiffness basically is inferring is how much the window geometry will be stretched, - # when opening/closing windows - animation-stiffness = 100; - animation-window-mass = 0.5; - animation-dampening = 12; - animation-clamping = true; - - # Options: ("none","zoom","fly-in","slide-up","slide-down","slide-left","slide-right") - animation-for-open-window = "slide-left"; - animation-for-unmap-window = "slide-right"; - - # Exclude certain windows from having a open animation. - - # animation-open-exclude = [ - # "class_g = 'Dunst'" - # ]; - - # Exclude certain windows from having a closing animation. - - # animation-unmap-exclude = [ - # "class_g = 'Dunst'" - # ]; - - ################################# - # Corners # - ################################# - - # Adjusts the window corner rounding in pixels. - corner-radius = 5; - - # Explicitly declare the corner-radius of individual windows. - # - # corners-rule = [ - # "20:class_g = 'Polybar'", - # "15:class_g = 'Dunst'", - # ]; - - rounded-corners-exclude = [ - "window_type = 'dock'", - "class_g = 'bar'" - ]; - - shadow = true; - - # The blur radius for shadows, in pixels. (defaults to 16) - shadow-radius = 16; - - # The opacity of shadows. (0.0 - 1.0, defaults to 0.75) - # shadow-opacity = 0.75; - - shadow-offset-x = -15; - shadow-offset-y = -15; - # shadow-color = "#000000"; - - shadow-exclude = [ - "window_type = 'dock'", - "class_g = 'awesome'" - ]; - - # FADING IS REQUIRED FOR CLOSING ANIMATIONS - fading = false; - # (This does not means the animations take longer, just the fading). - fade-in-step = 0.05; - fade-out-step = 0.05; - # The time between steps in fade step, in milliseconds. (> 0, defaults to 10) - # fade-delta = 10 - # fade-exclude = [] - # no-fading-openclose = false - # no-fading-destroyed-argb = false - - inactive-opacity = 1.0; - frame-opacity = 1.0; - - # Overrides any opacities set in `opacity-rule` when set to true. - inactive-opacity-override = false; - - # Default opacity for active windows. (0.0 - 1.0, defaults to 1.0) - active-opacity = 1.0; - - # Dim inactive windows. (0.0 - 1.0, defaults to 0.0) - inactive-dim = 0.1; - - # inactive-exclude = [ - # "class_g = 'dwm'" - # ]; - - - # active-exclude = [ - # "class_g = 'dwm'" - # ]; - - - # Specify a list of opacity rules, in the format `PERCENT:PATTERN`, - # like `50:name *= "Firefox"`. - - # opacity-rule = [ - # "80:class_g = 'Alacritty'" - # ]; - - - blur-background = false; - blur-method = "dual_kawase"; - # - # blur-size = 12 - # - # blur-deviation = false - # - blur-strength = 5; - - # Blur kernel preset. Play around and see what looks best. - # Options "3x3box", "5x5box", "7x7box", "3x3gaussian", "5x5gaussian", "7x7gaussian", "9x9gaussian", "11x11gaussian" - # - # blur-kern = "3x3box"; - - # Toggle whether you want to use a blacklist or whitelist. - # Defaults to "true" - blur-whitelist = true; - - # Whitelist for windows to have background blurring - blur-include = [ - "class_g = 'Alacritty'", - "class_g = 'kitty'" - ]; - - # Blacklist for background blurring. - # Only works if "blur-whitelist = false;" - # - # blur-exclude = [ - # "class_g = 'Firefox'" - # ]; - - ################################# - # General Settings # - ################################# - - # Enable remote control via D-Bus. See the man page for more details. - # dbus = true - - # Daemonize process. Fork to background after initialization. Causes issues with certain (badly-written) drivers. - # daemon = false - - # Specify the backend to use: `xrender`, `glx`, or `xr_glx_hybrid`. - backend = "glx"; - - # Enable/disable VSync. - vsync = true; - - log-level = "info"; - - ################################# - # ADVANCED # - ################################# - - # Set settings for specific window types. See Wiki for more information - # Below is an example of how to disabled shadows on Firefox/Librewolf menus, - # and also make sure they are considered focused so that they cannot be affected by inactive window settings. - # - # wintypes: - # { - # utility = { shadow = false; focus = true; }; - # popup_menu = { shadow = false; focus = true; }; - # }; - ''; -} diff --git a/modules/home/opt/wayland/default.nix b/modules/home/opt/wayland/default.nix index 06357099..bbe0748b 100644 --- a/modules/home/opt/wayland/default.nix +++ b/modules/home/opt/wayland/default.nix @@ -1,6 +1 @@ -{ - imports = [ - ./hyprland - ./swayfx - ]; -} +{ imports = [ ./hyprland ]; } diff --git a/modules/home/opt/wayland/programs/default.nix b/modules/home/opt/wayland/programs/default.nix index 41a53c40..3f1ba045 100644 --- a/modules/home/opt/wayland/programs/default.nix +++ b/modules/home/opt/wayland/programs/default.nix @@ -3,6 +3,5 @@ ./anyrun ./kanshi ./hyprlock - ./swaylock ]; } diff --git a/modules/home/opt/wayland/programs/swaylock/default.nix b/modules/home/opt/wayland/programs/swaylock/default.nix deleted file mode 100644 index a174c426..00000000 --- a/modules/home/opt/wayland/programs/swaylock/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -{ - config = lib.mkIf (config.default.lock == "swaylock") { - programs.swaylock = { - enable = true; - package = pkgs.swaylock-effects; - settings = - let - xcolors = config.colorscheme.palette; - in - { - clock = true; - indicator = true; - indicator-radius = 200; - indicator-thickness = 20; - line-uses-inside = true; - line-uses-ring = false; - ignore-empty-password = true; - show-failed-attempts = false; - font = "Dosis"; - timestr = "%I:%M %p"; - datestr = "%d / %m / %y"; - fade-in = "0.1"; - effect-blur = "20x5"; - - ring-color = "#${xcolors.background}33"; - line-color = "#${xcolors.background}66"; - inside-color = "#${xcolors.background}66"; - inside-ver-color = "#${xcolors.background}66"; - inside-wrong-color = "#${xcolors.background}66"; - inside-clear-color = "#${xcolors.background}66"; - line-clear-color = "#${xcolors.background}66"; - line-wrong-color = "#${xcolors.background}66"; - text-color = "#${xcolors.foreground}CC"; - text-caps-lock-color = "#${xcolors.foreground}CC"; - text-ver-color = "#${xcolors.foreground}CC"; - text-clear-color = "#${xcolors.foreground}CC"; - text-wrong-color = "#${xcolors.color1}CC"; - ring-wrong-color = "#${xcolors.color1}CC"; - key-hl-color = "#${xcolors.color4}CC"; - line-ver-color = "#${xcolors.color4}CC"; - ring-ver-color = "#${xcolors.color4}CC"; - ring-clear-color = "#${xcolors.color4}CC"; - bs-hl-color = "#${xcolors.color4}CC"; - }; - }; - }; -} diff --git a/modules/home/opt/wayland/swayfx/default.nix b/modules/home/opt/wayland/swayfx/default.nix deleted file mode 100644 index 263ee73c..00000000 --- a/modules/home/opt/wayland/swayfx/default.nix +++ /dev/null @@ -1,259 +0,0 @@ -{ - config, - lib, - pkgs, - inputs, - ... -}: -lib.mkIf config.modules.swayfx.enable { - home = { - packages = with pkgs; [ - autotiling-rs - cliphist - dbus - libnotify - libcanberra-gtk3 - wf-recorder - brightnessctl - pamixer - slurp - glib - grim - gtk3 - hyprpicker - swaysome - wlprop - wl-clipboard - wl-screenrec - wlr-randr - wtype - sassc - satty - xdg-utils - ydotool - wlr-randr - ]; - }; - - systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ]; - wayland.windowManager.sway = with config.colorscheme.palette; { - enable = true; - systemd.enable = true; - xwayland = true; - package = inputs.swayfx.packages.${pkgs.system}.default; - extraConfig = '' - ## SWAYFX CONFIG - corner_radius 14 - shadows on - shadow_offset 0 0 - shadow_blur_radius 20 - shadow_color #000000BB - - default_dim_inactive 0.2 - - layer_effects "notif" blur enable; shadows enable; corner_radius 20 - layer_effects "osd" blur enable; shadows enable; corner_radius 20 - layer_effects "work" shadows enable - layer_effects "panel" shadows enable - layer_effects "calendarbox"shadows enable; corner_radius 12 - for_window [app_id="spad"] move scratchpad, resize set width 900 height 600 - for_window [class="discord"] move scratchpad, resize set width 900 height 600 - for_window [class="obsidian"] move scratchpad - for_window [app_id="smusicpad"] move scratchpad, resize set width 850 height 550 - - set $bg-color #${mbg} - set $inactive-bg-color #${darker} - set $text-color #${foreground} - set $inactive-text-color #${foreground} - set $urgent-bg-color #${color9} - - # window colors - # border background text indicator - client.focused $bg-color $bg-color $text-color $bg-color - client.unfocused $inactive-bg-color $inactive-bg-color $inactive-text-color $inactive-bg-color - client.focused_inactive $inactive-bg-color $inactive-bg-color $inactive-text-color $inactive-bg-color - client.urgent $urgent-bg-color $urgent-bg-color $text-color $urgent-bg-color - - font pango:Iosevka Nerd Font 12 - # titlebar_separator enable - # titlebar_padding 6 - # title_align center - default_border none - default_floating_border normal 2 - - exec_always --no-startup-id xrdb -merge ~/.Xresources & - exec_always discord & - exec_always --no-startup-id copyq & - exec_always --no-startup-id kanshi & - exec_always --no-startup-id nm-applet & - exec --no-startup-id ags & - exec_always --no-startup-id swaysome init 0 & - exec_always --no-startup-id mpDris2 & - exec_always --no-startup-id autotiling-rs & - - output * bg ${config.wallpaper} fill - ''; - config = { - terminal = "wezterm"; - menu = "ags -t launcher"; - modifier = "Mod4"; - - keycodebindings = - let - cfg = config.wayland.windowManager.sway.config; - mod = cfg.modifier; - left = "43"; # h - down = "44"; # j - up = "45"; # k - right = "46"; # l - in - { - "${mod}+${left}" = "focus left"; - "${mod}+${down}" = "focus down"; - "${mod}+${up}" = "focus up"; - "${mod}+${right}" = "focus right"; - - "${mod}+Shift+${left}" = "move left"; - "${mod}+Shift+${down}" = "move down"; - "${mod}+Shift+${up}" = "move up"; - "${mod}+Shift+${right}" = "move right"; - }; - - keybindings = - let - cfg = config.wayland.windowManager.sway.config; - mod = cfg.modifier; - screenshot_satty = ''grim -g "$(slurp)" - | satty --early-exit -f - --copy-command wl-copy --fullscreen --output-filename ~/Pictures/Screenshots/satty-$(date '+%Y%m%d-%H:%M:%S').png''; - in - { - "${mod}+Shift+s" = "exec ${screenshot_satty}"; - "${mod}+Ctrl+s" = "exec ~/.local/bin/captureWindow"; - - "XF86MonBrightnessUp" = "exec 'brightnessctl s 5+'"; - "XF86MonBrightnessDown" = "exec 'brightnessctl s 5-'"; - - "XF86AudioRaiseVolume" = "exec 'pamixer -u ; pamixer -i 5'"; - "XF86AudioLowerVolume" = "exec 'pamixer -u ; pamixer -d 5'"; - "XF86AudioMute" = "exec 'pamixer -t'"; - - "${mod}+Return" = "exec ${cfg.terminal}"; - "${mod}+Shift+q" = "reload"; - "${mod}+d" = "exec ${cfg.menu}"; - "${mod}+Shift+p" = "exec rofi-rbw --no-help --clipboarder wl-copy"; - "${mod}+p" = "exec ags -t panel"; - "${mod}+Shift+t" = "exec ags -t work"; - "${mod}+b" = "exec ags -t dock"; - - "${mod}+v" = "exec 'swayscratch spad'"; - "${mod}+z" = "exec 'swayscratch smusicpad'"; - - "${mod}+Left" = "focus left"; - "${mod}+Down" = "focus down"; - "${mod}+Up" = "focus up"; - "${mod}+Right" = "focus right"; - - "${mod}+Shift+Left" = "move left"; - "${mod}+Shift+Down" = "move down"; - "${mod}+Shift+Up" = "move up"; - "${mod}+Shift+Right" = "move right"; - - "${mod}+Shift+b" = "splith"; - "${mod}+Shift+v" = "splitv"; - "${mod}+f" = "fullscreen"; - "${mod}+a" = "focus parent"; - - "${mod}+s" = "layout stacking"; - "${mod}+w" = "layout tabbed"; - "${mod}+e" = "layout toggle split"; - - "${mod}+Shift+space" = "floating toggle"; - "${mod}+space" = "focus mode_toggle"; - - # Change focus between workspaces - "${mod}+1" = "exec swaysome focus 1"; - "${mod}+2" = "exec swaysome focus 2"; - "${mod}+3" = "exec swaysome focus 3"; - "${mod}+4" = "exec swaysome focus 4"; - "${mod}+5" = "exec swaysome focus 5"; - "${mod}+6" = "exec swaysome focus 6"; - "${mod}+7" = "exec swaysome focus 7"; - "${mod}+8" = "exec swaysome focus 8"; - "${mod}+9" = "exec swaysome focus 9"; - "${mod}+0" = "exec swaysome focus 0"; - - # Move containers between workspaces - "${mod}+Shift+1" = "exec swaysome move 1"; - "${mod}+Shift+2" = "exec swaysome move 2"; - "${mod}+Shift+3" = "exec swaysome move 3"; - "${mod}+Shift+4" = "exec swaysome move 4"; - "${mod}+Shift+5" = "exec swaysome move 5"; - "${mod}+Shift+6" = "exec swaysome move 6"; - "${mod}+Shift+7" = "exec swaysome move 7"; - "${mod}+Shift+8" = "exec swaysome move 8"; - "${mod}+Shift+9" = "exec swaysome move 9"; - "${mod}+Shift+0" = "exec swaysome move 0"; - - "${mod}+Alt+1" = "exec swaysome focus-group 1"; - "${mod}+Alt+2" = "exec swaysome focus-group 2"; - "${mod}+Alt+3" = "exec swaysome focus-group 3"; - "${mod}+Alt+4" = "exec swaysome focus-group 4"; - "${mod}+Alt+5" = "exec swaysome focus-group 5"; - "${mod}+Alt+6" = "exec swaysome focus-group 6"; - "${mod}+Alt+7" = "exec swaysome focus-group 7"; - "${mod}+Alt+8" = "exec swaysome focus-group 8"; - "${mod}+Alt+9" = "exec swaysome focus-group 9"; - "${mod}+Alt+0" = "exec swaysome focus-group 0"; - - "${mod}+Alt+Shift+1" = "exec swaysome move-to-group 1"; - "${mod}+Alt+Shift+2" = "exec swaysome move-to-group 2"; - "${mod}+Alt+Shift+3" = "exec swaysome move-to-group 3"; - "${mod}+Alt+Shift+4" = "exec swaysome move-to-group 4"; - "${mod}+Alt+Shift+5" = "exec swaysome move-to-group 5"; - "${mod}+Alt+Shift+6" = "exec swaysome move-to-group 6"; - "${mod}+Alt+Shift+7" = "exec swaysome move-to-group 7"; - "${mod}+Alt+Shift+8" = "exec swaysome move-to-group 8"; - "${mod}+Alt+Shift+9" = "exec swaysome move-to-group 9"; - "${mod}+Alt+Shift+0" = "exec swaysome move-to-group 0"; - - "${mod}+o" = "exec swaysome next-output"; - "${mod}+Shift+o" = "exec swaysome prev-output"; - - "${mod}+Alt+o" = "exec swaysome workspace-group-next-output"; - "${mod}+Alt+Shift+o" = "exec swaysome workspace-group-prev-output"; - - "${mod}+Shift+minus" = "move scratchpad"; - "${mod}+minus" = "scratchpad show"; - - "${mod}+Shift+c" = "kill"; - "${mod}+Shift+e" = "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'"; - - "${mod}+r" = "mode resize"; - }; - input = { - "type:touchpad" = { - tap = "enabled"; - natural_scroll = "enabled"; - }; - "*" = { - xkb_layout = "us"; - xkb_options = "compose:rctrl,caps:escape"; - }; - }; - - gaps = { - bottom = 5; - horizontal = 5; - vertical = 5; - inner = 5; - left = 5; - outer = 5; - right = 5; - top = 5; - smartBorders = "off"; - smartGaps = false; - }; - - bars = [ ]; - }; - }; -}