diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index a95efb9..bfcb509 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -42,6 +42,34 @@ size = 24; }; + # gtk = { + # enable = true; + # theme = { + # name = "Orchis-Dark"; + # package = pkgs.orchis-theme; + # }; + # iconTheme = { + # name = "Adwaita"; + # package = pkgs.gnome.adwaita-icon-theme; + # }; + # cursorTheme = { + # name = "Adwaita"; + # package = pkgs.gnome.adwaita-icon-theme; + # }; + # font = { + # name = "JetBrainsMono Nerd Font"; + # size = 11; + # }; + # }; + + # home.pointerCursor = { + # gtk.enable = true; + # # x11.enable = true; + # package = pkgs.bibata-cursors; + # name = "Bibata-Modern-Classic"; + # size = 16; + # }; + dconf = { enable = true; settings = { @@ -57,7 +85,7 @@ source = "~/nixos-config/modules/home/hyprland/displays.conf"; "debug:disable_scale_checks" = true; - monitor = "eDP-1, 2256x1504@60, 0x0, 1.5"; + monitor = "eDP-1, 2256x1504@60, 0x0, 1.5"; # this works as I only have one computer using eDP-1 as a display, I could also add LVDS or DP-1 since that'd also be machine-specific. # autostart exec-once = [ @@ -123,6 +151,7 @@ master = { special_scale_factor = 1; + # no_gaps_when_only = true; # Returns errors for some reason }; decoration = { @@ -198,8 +227,6 @@ "$mainMod, G, togglegroup," "SUPER, N, changegroupactive, f" "SUPER, P, changegroupactive, b" - "$mainMod, Tab, changegroupactive, f" - "$mainMod SHIFT, Tab, changegroupactive, b" # clipboard manager "$mainMod SHIFT, V, exec, cliphist list | bemenu -l 5 --ignorecase | cliphist decode | wl-copy" @@ -338,7 +365,6 @@ "float,title:^(branchdialog)$" "float,title:^(Confirm to replace files)$" "float,title:^(File Operation Progress)$" - "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0" ]; }; diff --git a/modules/home/hyprland/scripts.nix b/modules/home/hyprland/scripts.nix index 4ebbc4a..6aca500 100644 --- a/modules/home/hyprland/scripts.nix +++ b/modules/home/hyprland/scripts.nix @@ -19,5 +19,24 @@ done ''; }; + "/home/${username}/.local/bin/setbg" = { + executable = true; + text = '' + #!/usr/bin/env bash + + magick convert "$1" ~/.local/share/bg.png + swww img ~/.local/share/bg.png --transition-type fade + ''; + }; + "/home/${username}/.local/bin/walp" = { + executable = true; + text = '' + #!/usr/bin/env bash + + which swiv &>/dev/null && SIV=swiv || SIV=nsxiv # todo: switch to swiv, but that is not packaged for Nix yet. + $SIV -t ~/Pictures/wallpapers/others/* + ''; + }; }; + } diff --git a/modules/home/scripts/scripts.nix b/modules/home/scripts/scripts.nix index 417d193..a999f8f 100644 --- a/modules/home/scripts/scripts.nix +++ b/modules/home/scripts/scripts.nix @@ -1,7 +1,5 @@ { pkgs, ... }: let - setbg = pkgs.writeScriptBin "setbg" (builtins.readFile ./scripts/setbg); - walp = pkgs.writeScriptBin "walp" (builtins.readFile ./scripts/walp); runbg = pkgs.writeShellScriptBin "runbg" (builtins.readFile ./scripts/runbg.sh); notes = pkgs.writeShellScriptBin "notes" (builtins.readFile ./scripts/notes.sh); grabtext = pkgs.writeShellScriptBin "grabtext" (builtins.readFile ./scripts/grabtext.sh); @@ -14,8 +12,6 @@ let in { home.packages = with pkgs; [ - setbg - walp runbg notes grabtext diff --git a/modules/home/scripts/scripts/setbg b/modules/home/scripts/scripts/setbg deleted file mode 100644 index c0e7277..0000000 --- a/modules/home/scripts/scripts/setbg +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -magick convert "$1" ~/.local/share/bg.png -swww img ~/.local/share/bg.png --transition-type fade diff --git a/modules/home/scripts/scripts/walp b/modules/home/scripts/scripts/walp deleted file mode 100644 index 17a1153..0000000 --- a/modules/home/scripts/scripts/walp +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -which swiv &>/dev/null && SIV=swiv || SIV=nsxiv # todo: switch to swiv, but that is not packaged for Nix yet. -$SIV -t ~/Pictures/wallpapers/others/*