diff --git a/home/ooks/ookst480s.nix b/home/ooks/ookst480s.nix index 365ba7b..071e183 100644 --- a/home/ooks/ookst480s.nix +++ b/home/ooks/ookst480s.nix @@ -8,6 +8,6 @@ ./standard ]; - colorscheme = inputs.nix-colors.colorSchemes.everforest; + colorscheme = inputs.nix-colors.colorSchemes.gruvbox-dark-soft; } \ No newline at end of file diff --git a/home/ooks/opt/desktop/hyprland/binds.nix b/home/ooks/opt/desktop/hyprland/binds.nix index 1e218e7..fffeaf4 100644 --- a/home/ooks/opt/desktop/hyprland/binds.nix +++ b/home/ooks/opt/desktop/hyprland/binds.nix @@ -3,7 +3,7 @@ let light = "${pkgs.light}/bin/light"; notifysend = "${pkgs.libnotify}/bin/notify-send"; - pamixer = "${pkgs.pamixer}/bin/pamixer"; + #pamixer = "${pkgs.pamixer}/bin/pamixer"; brightnessScript = pkgs.writeShellScriptBin "brightness" '' #!/bin/sh @@ -50,105 +50,105 @@ in volume = "${volumeScript}/bin/volume"; spotify = "${terminal} -e spotify_player"; - - makoctl = "${config.services.mako.package}/bin/makoctl"; + spotifyctl = "${pkgs.spotify-player}/bin/spotify_player"; + + #makoctl = "${config.services.mako.package}/bin/makoctl"; password = "${pkgs._1password-gui}/bin/1password --enable-features=UseOzonePlatform --ozone-platform=wayland"; - playerctl = "${config.services.playerctld.package}/bin/playerctl"; - playerctld = "${config.services.playerctld.package}/bin/playerctld"; - pactl = "${pkgs.pulseaudio}/bin/pactl"; + #playerctl = "${config.services.playerctld.package}/bin/playerctl"; + #playerctld = "${config.services.playerctld.package}/bin/playerctld"; + #pactl = "${pkgs.pulseaudio}/bin/pactl"; in [ # Program Launch - "SUPER,b,exec,${browser}" - "SUPER,return,exec,${terminal}" - "SUPER,e,exec,${editor}" - "SUPER,m,exec,${spotify}" - "SUPERSHIFT,P,exec,${password}" + "SUPER, b, exec, ${browser}" + "SUPER, return, exec, ${terminal}" + "SUPER, e, exec, ${editor}" + "SUPER, m, exec, ${spotify}" + "SUPERSHIFT, P, exec, ${password}" - # Media + # Spotify PLayer Controls - "SUPER,bracketright,exec,${playerctl} --player=spotify_player next" - "SUPER,bracketleft,exec,${playerctl} --player=spotify_player previous" - "SUPER,backslash,exec,${playerctl} --player=spotify_player play-pause" + "SUPER, bracketright, exec, ${spotifyctl} playback next" + "SUPER, bracketleft, exec, ${spotifyctl} playback previous" + "SUPER, backslash, exec, ${spotifyctl} playback play-pause" # Brightness - ",XF86MonBrightnessUp,exec,${bright} up" - ",XF86MonBrightnessDown,exec,${bright} down" + ",XF86MonBrightnessUp, exec, ${bright} up" + ",XF86MonBrightnessDown, exec, ${bright} down" # Volume - ",XF86AudioRaiseVolume,exec,${volume} up" - ",XF86AudioLowerVolume,exec,${volume} down" - ",XF86AudioMute,exec,${volume} mute" + ",XF86AudioRaiseVolume, exec, ${volume} up" + ",XF86AudioLowerVolume, exec, ${volume} down" + ",XF86AudioMute, exec, ${volume} mute" # Window Management - "SUPER,Q,killactive" - "SUPER,backspace,killactive" - "SUPERSHIFT ALT,delete,exit" - "SUPER,F,fullscreen" - "SUPER,Space,togglefloating" - "SUPER,P,pseudo" # dwindle - "SUPER,S,togglesplit" # dwindle + "SUPER, Q, killactive" + "SUPER, backspace, killactive" + "SUPERSHIFT ALT, delete, exit" + "SUPER, F, fullscreen" + "SUPER, Space, togglefloating" + "SUPER, P, pseudo" # dwindle + "SUPER, S, togglesplit" # dwindle # Focus - "SUPER,left,movefocus,l" - "SUPER,right,movefocus,r" - "SUPER,up,movefocus,u" - "SUPER,down,movefocus,d" + "SUPER, left, movefocus,l" + "SUPER, right, movefocus,r" + "SUPER, up, movefocus,u" + "SUPER, down, movefocus,d" # Move - "SUPERSHIFT,left,movewindow,l" - "SUPERSHIFT,right,movewindow,r" - "SUPERSHIFT,up,movewindow,u" - "SUPERSHIFT,down,movewindow,d" + "SUPERSHIFT, left, movewindow,l" + "SUPERSHIFT, right, movewindow,r" + "SUPERSHIFT, up, movewindow,u" + "SUPERSHIFT, down, movewindow,d" #Resize - "SUPER CTRL,left,resizeactive,-20 0" - "SUPERCTRL,right,resizeactive,20 0" - "SUPER CTRL,up,resizeactive, 0 -20" - "SUPERCTRL,down,resizeactive, 0 20" + "SUPER CTRL, left, resizeactive,-20 0" + "SUPERCTRL, right, resizeactive,20 0" + "SUPER CTRL, up, resizeactive,0 -20" + "SUPERCTRL, down, resizeactive,0 20" # Switch workspace - "SUPER,1,workspace,1" - "SUPER,2,workspace,2" - "SUPER,3,workspace,3" - "SUPER,4,workspace,4" - "SUPER,5,workspace,5" - "SUPER,6,workspace,6" - "SUPER,7,workspace,7" - "SUPER,8,workspace,8" - "SUPER,9,workspace,9" - "SUPER,0,workspace,10" - "SUPER,comma,workspace,e+1" - "SUPER,period,workspace,e-1" - "SUPER,tab,focusCurrentOrLast" + "SUPER, 1, workspace,1" + "SUPER, 2, workspace,2" + "SUPER, 3, workspace,3" + "SUPER, 4, workspace,4" + "SUPER, 5, workspace,5" + "SUPER, 6, workspace,6" + "SUPER, 7, workspace,7" + "SUPER, 8, workspace,8" + "SUPER, 9, workspace,9" + "SUPER, 0, workspace,10" + "SUPER, comma, workspace,e+1" + "SUPER, period, workspace,e-1" + "SUPER, tab, focusCurrentOrLast" # Move workspace - "SUPERSHIFT,1,movetoworkspace,1" - "SUPERSHIFT,2,movetoworkspace,2" - "SUPERSHIFT,3,movetoworkspace,3" - "SUPERSHIFT,4,movetoworkspace,4" - "SUPERSHIFT,5,movetoworkspace,5" - "SUPERSHIFT,6,movetoworkspace,6" - "SUPERSHIFT,7,movetoworkspace,7" - "SUPERSHIFT,8,movetoworkspace,8" - "SUPERSHIFT,9,movetoworkspace,9" - "SUPERSHIFT,0,movetoworkspace,10" + "SUPERSHIFT, 1, movetoworkspace,1" + "SUPERSHIFT, 2, movetoworkspace,2" + "SUPERSHIFT, 3, movetoworkspace,3" + "SUPERSHIFT, 4, movetoworkspace,4" + "SUPERSHIFT, 5, movetoworkspace,5" + "SUPERSHIFT, 6, movetoworkspace,6" + "SUPERSHIFT, 7, movetoworkspace,7" + "SUPERSHIFT, 8, movetoworkspace,8" + "SUPERSHIFT, 9, movetoworkspace,9" + "SUPERSHIFT, 0, movetoworkspace,10" ]; # ----- MOUSE KEYBINDS ----- # bindm = [ - "SUPER,mouse:272,movewindow" - "SUPER,mouse:273,resizewindow" + "SUPER, mouse:272, movewindow" + "SUPER, mouse:273, resizewindow" ]; - }; } diff --git a/home/ooks/opt/desktop/hyprland/default.nix b/home/ooks/opt/desktop/hyprland/default.nix index a466fc9..28c6984 100644 --- a/home/ooks/opt/desktop/hyprland/default.nix +++ b/home/ooks/opt/desktop/hyprland/default.nix @@ -36,7 +36,7 @@ active_opacity = 1.0; inactive_opacity = 1.0; fullscreen_opacity = 1.0; - rounding = 5; + rounding = 0; blur = { enabled = false; new_optimizations = true; @@ -81,7 +81,7 @@ exec = [ "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1" - "${pkgs.swaybg}/bin/swaybg -i ~/.dotfiles/nix/walls/everforest/megacity.png --mode fill" + "${pkgs.swaybg}/bin/swaybg -i ~/.dotfiles/nix/walls/gruvbox/gruvbox-grid.png --mode fill" ]; exec-once = [ "${pkgs._1password-gui}/bin/1password --silent" diff --git a/home/ooks/opt/desktop/standard/wayland/default.nix b/home/ooks/opt/desktop/standard/wayland/default.nix index 98821cf..8cb6d21 100644 --- a/home/ooks/opt/desktop/standard/wayland/default.nix +++ b/home/ooks/opt/desktop/standard/wayland/default.nix @@ -7,6 +7,7 @@ ./zathura.nix ./gammastep.nix ./cursor.nix + ./gimp.nix ]; xdg.mimeApps.enable = true; diff --git a/home/ooks/opt/desktop/standard/wayland/gimp.nix b/home/ooks/opt/desktop/standard/wayland/gimp.nix new file mode 100644 index 0000000..917b068 --- /dev/null +++ b/home/ooks/opt/desktop/standard/wayland/gimp.nix @@ -0,0 +1,4 @@ +{ pkgs }: { + + home.packages = with pkgs; [gimp]; +} diff --git a/home/ooks/opt/shell/default.nix b/home/ooks/opt/shell/default.nix index d1489b9..d452d51 100644 --- a/home/ooks/opt/shell/default.nix +++ b/home/ooks/opt/shell/default.nix @@ -8,7 +8,7 @@ ./starship.nix ./joshuto ./helix - ./live-buds-cli.nix +# ./live-buds-cli.nix ]; home.packages = with pkgs; [ bc # Calculator @@ -29,6 +29,7 @@ progress killall gcc + wget ]; programs = { diff --git a/home/ooks/opt/shell/fish.nix b/home/ooks/opt/shell/fish.nix index dcbf4b2..ed23391 100644 --- a/home/ooks/opt/shell/fish.nix +++ b/home/ooks/opt/shell/fish.nix @@ -2,8 +2,7 @@ let inherit (lib) mkIf; hasPackage = pname: lib.any (p: p ? pname && p.pname == pname) config.home.packages; - hasRipgrep = hasPackage "ripgrep"; - hasExa = hasPackage "exa"; + hasEza = hasPackage "eza"; hasNeovim = config.programs.neovim.enable; hasKitty = config.programs.kitty.enable; hasTre = hasPackage "tre-command"; @@ -31,7 +30,7 @@ in tree = mkIf hasTre "tre"; - ls = mkIf hasExa "exa"; + ls = mkIf hasEza "eza"; vim = mkIf hasNeovim "nvim"; diff --git a/walls/gruvbox/gruvbox_grid.png b/walls/gruvbox/gruvbox_grid.png new file mode 100644 index 0000000..f1c9640 Binary files /dev/null and b/walls/gruvbox/gruvbox_grid.png differ