diff --git a/config/hyprland.nix b/config/hyprland.nix index 15dc274..8c0535b 100644 --- a/config/hyprland.nix +++ b/config/hyprland.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, config, browser, ... }: { home.file.".config/hypr/hyprland.conf".text = '' @@ -74,84 +74,84 @@ $mainMod = SUPER # Sound Control Keybinds bind = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ bind = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- -bind = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle -bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle +bind = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle +bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle # Brightness Control Keybinds bind = , XF86MonBrightnessDown, exec, brightnessctl set 5%- bind = , XF86MonBrightnessUp, exec, brightnessctl set +5% # System Application Keybinds -bind = $mainMod, Return, exec, kitty -bind = $mainMod SHIFT, Return, exec, rofi -show drun -bind = $mainMod SHIFT, W, exec, kitty -e amfora -bind = $mainMod SHIFT, S, exec, wallsetter -bind = $mainMod, W, exec, firefox -bind = $mainMod, E, exec, emopicker9000 -bind = $mainMod, S, exec, grim -g "$(slurp)" -bind = $mainMod, D, exec, discord -bind = $mainMod, O, exec, obs -bind = $mainMod, G, exec, gimp -bind = $mainMod SHIFT, G, exec, godot4 -bind = $mainMod, T, exec, thunar -bind = $mainMod, M, exec, ario +bind = $mainMod, Return, exec, kitty +bind = $mainMod SHIFT, Return, exec, rofi -show drun +bind = $mainMod SHIFT, W, exec, kitty -e amfora +bind = $mainMod SHIFT, S, exec, web-search +bind = $mainMod, W, exec, ${browser} +bind = $mainMod, E, exec, emopicker9000 +bind = $mainMod, S, exec, grim -g "$(slurp)" +bind = $mainMod, D, exec, discord +bind = $mainMod, O, exec, obs +bind = $mainMod, G, exec, gimp +bind = $mainMod SHIFT, G, exec, godot4 +bind = $mainMod, T, exec, thunar +bind = $mainMod, M, exec, ario # OBS Global Keybinds -bind = ALT, F1, pass, ^(com\.obsproject\.Studio)$ -bind = ALT, F2, pass, ^(com\.obsproject\.Studio)$ -bind = ALT, F3, pass, ^(com\.obsproject\.Studio)$ -bind = ALT, F4, pass, ^(com\.obsproject\.Studio)$ -bind = ALT, F5, pass, ^(com\.obsproject\.Studio)$ +bind = ALT, F1, pass, ^(com\.obsproject\.Studio)$ +bind = ALT, F2, pass, ^(com\.obsproject\.Studio)$ +bind = ALT, F3, pass, ^(com\.obsproject\.Studio)$ +bind = ALT, F4, pass, ^(com\.obsproject\.Studio)$ +bind = ALT, F5, pass, ^(com\.obsproject\.Studio)$ # Hyprland Keybinds -bind = $mainMod, Q, killactive, -bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod SHIFT, I, togglesplit, # dwindle -bind = $mainMod, F, fullscreen, -bind = $mainMod SHIFT, F, togglefloating, -bind = $mainMod SHIFT, C, exit, +bind = $mainMod, Q, killactive, +bind = $mainMod, P, pseudo, # dwindle +bind = $mainMod SHIFT, I, togglesplit, # dwindle +bind = $mainMod, F, fullscreen, +bind = $mainMod SHIFT, F, togglefloating, +bind = $mainMod SHIFT, C, exit, # Move window with mainMod + shift + arrow keys bind = $mainMod SHIFT, left, movewindow, l bind = $mainMod SHIFT, right, movewindow, r -bind = $mainMod SHIFT, up, movewindow, u +bind = $mainMod SHIFT, up, movewindow, u bind = $mainMod SHIFT, down, movewindow, d -bind = $mainMod SHIFT, h, movewindow, l -bind = $mainMod SHIFT, l, movewindow, r -bind = $mainMod SHIFT, k, movewindow, u -bind = $mainMod SHIFT, j, movewindow, d +bind = $mainMod SHIFT, h, movewindow, l +bind = $mainMod SHIFT, l, movewindow, r +bind = $mainMod SHIFT, k, movewindow, u +bind = $mainMod SHIFT, j, movewindow, d # Move focus with mainMod + arrow keys -bind = $mainMod, left, movefocus, l -bind = $mainMod, right, movefocus, r -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, d -bind = $mainMod, h, movefocus, l -bind = $mainMod, l, movefocus, r -bind = $mainMod, k, movefocus, u -bind = $mainMod, j, movefocus, d +bind = $mainMod, left, movefocus, l +bind = $mainMod, right, movefocus, r +bind = $mainMod, up, movefocus, u +bind = $mainMod, down, movefocus, d +bind = $mainMod, h, movefocus, l +bind = $mainMod, l, movefocus, r +bind = $mainMod, k, movefocus, u +bind = $mainMod, j, movefocus, d # Switch workspaces with mainMod + [0-6] -bind = $mainMod, 1, workspace, 1 -bind = $mainMod, 2, workspace, 2 -bind = $mainMod, 3, workspace, 3 -bind = $mainMod, 4, workspace, 4 -bind = $mainMod, 5, workspace, 5 -bind = $mainMod, 6, workspace, 6 -bind = $mainMod, 7, workspace, 7 -bind = $mainMod, 8, workspace, 8 -bind = $mainMod, 9, workspace, 9 -bind = $mainMod, 0, workspace, 10 +bind = $mainMod, 1, workspace, 1 +bind = $mainMod, 2, workspace, 2 +bind = $mainMod, 3, workspace, 3 +bind = $mainMod, 4, workspace, 4 +bind = $mainMod, 5, workspace, 5 +bind = $mainMod, 6, workspace, 6 +bind = $mainMod, 7, workspace, 7 +bind = $mainMod, 8, workspace, 8 +bind = $mainMod, 9, workspace, 9 +bind = $mainMod, 0, workspace, 10 # Move active window to a workspace with mainMod + SHIFT + [0-6] -bind = $mainMod SHIFT, 1, movetoworkspace, 1 -bind = $mainMod SHIFT, 2, movetoworkspace, 2 -bind = $mainMod SHIFT, 3, movetoworkspace, 3 -bind = $mainMod SHIFT, 4, movetoworkspace, 4 -bind = $mainMod SHIFT, 5, movetoworkspace, 5 -bind = $mainMod SHIFT, 6, movetoworkspace, 6 -bind = $mainMod SHIFT, 7, movetoworkspace, 7 -bind = $mainMod SHIFT, 8, movetoworkspace, 8 -bind = $mainMod SHIFT, 9, movetoworkspace, 9 -bind = $mainMod SHIFT, 0, movetoworkspace, 10 +bind = $mainMod SHIFT, 1, movetoworkspace, 1 +bind = $mainMod SHIFT, 2, movetoworkspace, 2 +bind = $mainMod SHIFT, 3, movetoworkspace, 3 +bind = $mainMod SHIFT, 4, movetoworkspace, 4 +bind = $mainMod SHIFT, 5, movetoworkspace, 5 +bind = $mainMod SHIFT, 6, movetoworkspace, 6 +bind = $mainMod SHIFT, 7, movetoworkspace, 7 +bind = $mainMod SHIFT, 8, movetoworkspace, 8 +bind = $mainMod SHIFT, 9, movetoworkspace, 9 +bind = $mainMod SHIFT, 0, movetoworkspace, 10 # Scroll through existing workspaces with mainMod + scroll -bind = $mainMod, mouse_down, workspace, e+1 -bind = $mainMod, mouse_up, workspace, e-1 +bind = $mainMod, mouse_down, workspace, e+1 +bind = $mainMod, mouse_up, workspace, e-1 # Move/resize windows with mainMod + LMB/RMB and dragging -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow +bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, mouse:273, resizewindow dwindle { pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below diff --git a/flake.nix b/flake.nix index 0b8baa9..86fd584 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,7 @@ theLocale = "en_US.UTF-8"; theTimezone = "America/Chicago"; theme = "gigavolt"; + browser= pkgs.firefox; pkgs = import nixpkgs { inherit system; @@ -39,6 +40,7 @@ home-manager.nixosModules.home-manager { home-manager.extraSpecialArgs = { inherit username; inherit gitUsername; inherit gitEmail; inherit theme; + inherit browser; inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme; }; home-manager.useGlobalPkgs = true; @@ -56,6 +58,7 @@ home-manager.nixosModules.home-manager { home-manager.extraSpecialArgs = { inherit username; inherit gitUsername; inherit gitEmail; inherit inputs; inherit theme; + inherit browser; inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme; }; home-manager.useGlobalPkgs = true; diff --git a/home.nix b/home.nix index 1fecfdb..bdb6dd2 100644 --- a/home.nix +++ b/home.nix @@ -1,6 +1,6 @@ { config, pkgs, inputs, username, gitUsername, gitEmail, gtkThemeFromScheme, - theme, ... }: + theme, browser, ... }: { # Home Manager Settings @@ -54,7 +54,7 @@ # Install Packages For The User home.packages = with pkgs; [ - neofetch lolcat cmatrix discord firefox htop btop libvirt + "${browser}" neofetch lolcat cmatrix discord htop btop libvirt swww polkit_gnome grim slurp lm_sensors unzip unrar gnome.file-roller libnotify swaynotificationcenter rofi-wayland imv v4l-utils ydotool wl-clipboard socat cowsay lsd pkg-config transmission-gtk mpv