ooks/ooknet
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changes to hyprland config, commented out broken custom package

Browse source
This commit is contained in:
ooks-io 2023-10-08 19:33:16 +13:00
parent d100c2449f
commit 4c81139654
8 changed files with 77 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

2
home/ooks/ookst480s.nix
View file

@ -8,6 +8,6 @@
./standard ./standard
]; ];
colorscheme = inputs.nix-colors.colorSchemes.everforest; colorscheme = inputs.nix-colors.colorSchemes.gruvbox-dark-soft;
} }

130
home/ooks/opt/desktop/hyprland/binds.nix
View file

@ -3,7 +3,7 @@
let let
light = "${pkgs.light}/bin/light"; light = "${pkgs.light}/bin/light";
notifysend = "${pkgs.libnotify}/bin/notify-send"; notifysend = "${pkgs.libnotify}/bin/notify-send";
pamixer = "${pkgs.pamixer}/bin/pamixer"; #pamixer = "${pkgs.pamixer}/bin/pamixer";
brightnessScript = pkgs.writeShellScriptBin "brightness" '' brightnessScript = pkgs.writeShellScriptBin "brightness" ''
#!/bin/sh #!/bin/sh
@ -50,105 +50,105 @@ in
volume = "${volumeScript}/bin/volume"; volume = "${volumeScript}/bin/volume";
spotify = "${terminal} -e spotify_player"; spotify = "${terminal} -e spotify_player";
spotifyctl = "${pkgs.spotify-player}/bin/spotify_player";
makoctl = "${config.services.mako.package}/bin/makoctl";
#makoctl = "${config.services.mako.package}/bin/makoctl";
password = "${pkgs._1password-gui}/bin/1password --enable-features=UseOzonePlatform --ozone-platform=wayland"; password = "${pkgs._1password-gui}/bin/1password --enable-features=UseOzonePlatform --ozone-platform=wayland";
playerctl = "${config.services.playerctld.package}/bin/playerctl"; #playerctl = "${config.services.playerctld.package}/bin/playerctl";
playerctld = "${config.services.playerctld.package}/bin/playerctld"; #playerctld = "${config.services.playerctld.package}/bin/playerctld";
pactl = "${pkgs.pulseaudio}/bin/pactl"; #pactl = "${pkgs.pulseaudio}/bin/pactl";
in [ in [
# Program Launch # Program Launch
"SUPER,b,exec,${browser}" "SUPER, b, exec, ${browser}"
"SUPER,return,exec,${terminal}" "SUPER, return, exec, ${terminal}"
"SUPER,e,exec,${editor}" "SUPER, e, exec, ${editor}"
"SUPER,m,exec,${spotify}" "SUPER, m, exec, ${spotify}"
"SUPERSHIFT,P,exec,${password}" "SUPERSHIFT, P, exec, ${password}"
# Media # Spotify PLayer Controls
"SUPER,bracketright,exec,${playerctl} --player=spotify_player next" "SUPER, bracketright, exec, ${spotifyctl} playback next"
"SUPER,bracketleft,exec,${playerctl} --player=spotify_player previous" "SUPER, bracketleft, exec, ${spotifyctl} playback previous"
"SUPER,backslash,exec,${playerctl} --player=spotify_player play-pause" "SUPER, backslash, exec, ${spotifyctl} playback play-pause"
# Brightness # Brightness
",XF86MonBrightnessUp,exec,${bright} up" ",XF86MonBrightnessUp, exec, ${bright} up"
",XF86MonBrightnessDown,exec,${bright} down" ",XF86MonBrightnessDown, exec, ${bright} down"
# Volume # Volume
",XF86AudioRaiseVolume,exec,${volume} up" ",XF86AudioRaiseVolume, exec, ${volume} up"
",XF86AudioLowerVolume,exec,${volume} down" ",XF86AudioLowerVolume, exec, ${volume} down"
",XF86AudioMute,exec,${volume} mute" ",XF86AudioMute, exec, ${volume} mute"
# Window Management # Window Management
"SUPER,Q,killactive" "SUPER, Q, killactive"
"SUPER,backspace,killactive" "SUPER, backspace, killactive"
"SUPERSHIFT ALT,delete,exit" "SUPERSHIFT ALT, delete, exit"
"SUPER,F,fullscreen" "SUPER, F, fullscreen"
"SUPER,Space,togglefloating" "SUPER, Space, togglefloating"
"SUPER,P,pseudo" # dwindle "SUPER, P, pseudo" # dwindle
"SUPER,S,togglesplit" # dwindle "SUPER, S, togglesplit" # dwindle
# Focus # Focus
"SUPER,left,movefocus,l" "SUPER, left, movefocus,l"
"SUPER,right,movefocus,r" "SUPER, right, movefocus,r"
"SUPER,up,movefocus,u" "SUPER, up, movefocus,u"
"SUPER,down,movefocus,d" "SUPER, down, movefocus,d"
# Move # Move
"SUPERSHIFT,left,movewindow,l" "SUPERSHIFT, left, movewindow,l"
"SUPERSHIFT,right,movewindow,r" "SUPERSHIFT, right, movewindow,r"
"SUPERSHIFT,up,movewindow,u" "SUPERSHIFT, up, movewindow,u"
"SUPERSHIFT,down,movewindow,d" "SUPERSHIFT, down, movewindow,d"
#Resize #Resize
"SUPER CTRL,left,resizeactive,-20 0" "SUPER CTRL, left, resizeactive,-20 0"
"SUPERCTRL,right,resizeactive,20 0" "SUPERCTRL, right, resizeactive,20 0"
"SUPER CTRL,up,resizeactive, 0 -20" "SUPER CTRL, up, resizeactive,0 -20"
"SUPERCTRL,down,resizeactive, 0 20" "SUPERCTRL, down, resizeactive,0 20"
# Switch workspace # Switch workspace
"SUPER,1,workspace,1" "SUPER, 1, workspace,1"
"SUPER,2,workspace,2" "SUPER, 2, workspace,2"
"SUPER,3,workspace,3" "SUPER, 3, workspace,3"
"SUPER,4,workspace,4" "SUPER, 4, workspace,4"
"SUPER,5,workspace,5" "SUPER, 5, workspace,5"
"SUPER,6,workspace,6" "SUPER, 6, workspace,6"
"SUPER,7,workspace,7" "SUPER, 7, workspace,7"
"SUPER,8,workspace,8" "SUPER, 8, workspace,8"
"SUPER,9,workspace,9" "SUPER, 9, workspace,9"
"SUPER,0,workspace,10" "SUPER, 0, workspace,10"
"SUPER,comma,workspace,e+1" "SUPER, comma, workspace,e+1"
"SUPER,period,workspace,e-1" "SUPER, period, workspace,e-1"
"SUPER,tab,focusCurrentOrLast" "SUPER, tab, focusCurrentOrLast"
# Move workspace # Move workspace
"SUPERSHIFT,1,movetoworkspace,1" "SUPERSHIFT, 1, movetoworkspace,1"
"SUPERSHIFT,2,movetoworkspace,2" "SUPERSHIFT, 2, movetoworkspace,2"
"SUPERSHIFT,3,movetoworkspace,3" "SUPERSHIFT, 3, movetoworkspace,3"
"SUPERSHIFT,4,movetoworkspace,4" "SUPERSHIFT, 4, movetoworkspace,4"
"SUPERSHIFT,5,movetoworkspace,5" "SUPERSHIFT, 5, movetoworkspace,5"
"SUPERSHIFT,6,movetoworkspace,6" "SUPERSHIFT, 6, movetoworkspace,6"
"SUPERSHIFT,7,movetoworkspace,7" "SUPERSHIFT, 7, movetoworkspace,7"
"SUPERSHIFT,8,movetoworkspace,8" "SUPERSHIFT, 8, movetoworkspace,8"
"SUPERSHIFT,9,movetoworkspace,9" "SUPERSHIFT, 9, movetoworkspace,9"
"SUPERSHIFT,0,movetoworkspace,10" "SUPERSHIFT, 0, movetoworkspace,10"
]; ];
# ----- MOUSE KEYBINDS ----- # # ----- MOUSE KEYBINDS ----- #
bindm = [ bindm = [
"SUPER,mouse:272,movewindow" "SUPER, mouse:272, movewindow"
"SUPER,mouse:273,resizewindow" "SUPER, mouse:273, resizewindow"
]; ];
}; };
} }

4
home/ooks/opt/desktop/hyprland/default.nix
View file

@ -36,7 +36,7 @@
active_opacity = 1.0; active_opacity = 1.0;
inactive_opacity = 1.0; inactive_opacity = 1.0;
fullscreen_opacity = 1.0; fullscreen_opacity = 1.0;
rounding = 5; rounding = 0;
blur = { blur = {
enabled = false; enabled = false;
new_optimizations = true; new_optimizations = true;
@ -81,7 +81,7 @@
exec = [ exec = [
"${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1" "${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 = [ exec-once = [
"${pkgs._1password-gui}/bin/1password --silent" "${pkgs._1password-gui}/bin/1password --silent"

1
home/ooks/opt/desktop/standard/wayland/default.nix
View file

@ -7,6 +7,7 @@
./zathura.nix ./zathura.nix
./gammastep.nix ./gammastep.nix
./cursor.nix ./cursor.nix
./gimp.nix
]; ];
xdg.mimeApps.enable = true; xdg.mimeApps.enable = true;

4
home/ooks/opt/desktop/standard/wayland/gimp.nix Normal file
View file

@ -0,0 +1,4 @@
{ pkgs }: {
home.packages = with pkgs; [gimp];
}

3
home/ooks/opt/shell/default.nix
View file

@ -8,7 +8,7 @@
./starship.nix ./starship.nix
./joshuto ./joshuto
./helix ./helix
./live-buds-cli.nix # ./live-buds-cli.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
bc # Calculator bc # Calculator
@ -29,6 +29,7 @@
progress progress
killall killall
gcc gcc
wget
]; ];
programs = { programs = {

5
home/ooks/opt/shell/fish.nix
View file

@ -2,8 +2,7 @@
let let
inherit (lib) mkIf; inherit (lib) mkIf;
hasPackage = pname: lib.any (p: p ? pname && p.pname == pname) config.home.packages; hasPackage = pname: lib.any (p: p ? pname && p.pname == pname) config.home.packages;
hasRipgrep = hasPackage "ripgrep"; hasEza = hasPackage "eza";
hasExa = hasPackage "exa";
hasNeovim = config.programs.neovim.enable; hasNeovim = config.programs.neovim.enable;
hasKitty = config.programs.kitty.enable; hasKitty = config.programs.kitty.enable;
hasTre = hasPackage "tre-command"; hasTre = hasPackage "tre-command";
@ -31,7 +30,7 @@ in
tree = mkIf hasTre "tre"; tree = mkIf hasTre "tre";
ls = mkIf hasExa "exa"; ls = mkIf hasEza "eza";
vim = mkIf hasNeovim "nvim"; vim = mkIf hasNeovim "nvim";

BIN
walls/gruvbox/gruvbox_grid.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB