changes to hyprland config, commented out broken custom package

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

View file

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

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,14 +50,15 @@ 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
@ -67,11 +68,11 @@ in
"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
@ -149,6 +150,5 @@ in
"SUPER, mouse:272, movewindow" "SUPER, mouse:272, movewindow"
"SUPER, mouse:273, resizewindow" "SUPER, mouse:273, resizewindow"
]; ];
}; };
} }

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"

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;

View file

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

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 = {

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";

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB