diff --git a/flake.nix b/flake.nix index 2b98635..4c1e450 100644 --- a/flake.nix +++ b/flake.nix @@ -46,6 +46,7 @@ hyprland = hyprland.packages.${prev.system}.hyprland; xdg-desktop-portal-hyprland = hyprland.packages.${prev.system}.xdg-desktop-portal-hyprland; ags = ags.packages.${prev.system}.default; + gbmonctl = prev.callPackage ./overlays/gbmonctl {}; }) ]; }); @@ -61,6 +62,7 @@ pkgs = legacyPackages.${system}; modules = [ ./modules/nixos/hid-fanatecff + ./modules/nixos/gbmonctl ./hosts/${hostname} kde2nix.nixosModules.plasma6 home-manager.nixosModules.home-manager diff --git a/home/desktops/hyprland/ags/assets/Lakeside-2-1.jpg b/home/desktops/hyprland/ags/assets/Lakeside-2-1.jpg deleted file mode 100644 index a9dee5e..0000000 Binary files a/home/desktops/hyprland/ags/assets/Lakeside-2-1.jpg and /dev/null differ diff --git a/home/desktops/hyprland/ags/assets/Lakeside-2-10.jpg b/home/desktops/hyprland/ags/assets/Lakeside-2-10.jpg deleted file mode 100644 index 942d209..0000000 Binary files a/home/desktops/hyprland/ags/assets/Lakeside-2-10.jpg and /dev/null differ diff --git a/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_Evening_UHD2.png b/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_Evening_UHD2.png new file mode 100644 index 0000000..e10f06e Binary files /dev/null and b/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_Evening_UHD2.png differ diff --git a/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_NoDeer_Evening_UHD2.png b/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_NoDeer_Evening_UHD2.png new file mode 100644 index 0000000..03714f8 Binary files /dev/null and b/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_NoDeer_Evening_UHD2.png differ diff --git a/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_NoDeer_UHD2.png b/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_NoDeer_UHD2.png new file mode 100644 index 0000000..1bcbdea Binary files /dev/null and b/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_NoDeer_UHD2.png differ diff --git a/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_Teal_NoDeer_UHD2.png b/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_Teal_NoDeer_UHD2.png new file mode 100644 index 0000000..2c3c4ac Binary files /dev/null and b/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_Teal_NoDeer_UHD2.png differ diff --git a/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_Teal_UHD2.png b/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_Teal_UHD2.png new file mode 100644 index 0000000..26cda7e Binary files /dev/null and b/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_Teal_UHD2.png differ diff --git a/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_UHD2.png b/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_UHD2.png new file mode 100644 index 0000000..e145b40 Binary files /dev/null and b/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/Lakeside_2019_UHD2.png differ diff --git a/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/lakeside_2019_midnight.png b/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/lakeside_2019_midnight.png new file mode 100644 index 0000000..45e94a7 Binary files /dev/null and b/home/desktops/hyprland/ags/assets/wallpapers/Lakeside/lakeside_2019_midnight.png differ diff --git a/home/desktops/hyprland/ags/js/themes.js b/home/desktops/hyprland/ags/js/themes.js index 1ddb8f1..382b1d3 100644 --- a/home/desktops/hyprland/ags/js/themes.js +++ b/home/desktops/hyprland/ags/js/themes.js @@ -12,7 +12,8 @@ export default [ "desktop.clock.enable": false, "bar.style": "separated", "bar.separators": false, - "desktop.wallpaper.img": WP + "Lakeside-2-1.jpg", + "desktop.wallpaper.img": + WP + "wallpapers/Lakeside/lakeside_2019_midnight.png", ...darkColors, }), Theme({ @@ -22,7 +23,8 @@ export default [ "desktop.clock.enable": false, "bar.style": "separated", "bar.separators": false, - "desktop.wallpaper.img": WP + "Lakeside-2-10.jpg", + "desktop.wallpaper.img": + WP + "wallpapers/Lakeside/Lakeside_2019_Teal_NoDeer_UHD2.png", ...lightColors, "theme.widget.bg": "$accent", "theme.widget.opacity": 64, diff --git a/home/desktops/hyprland/keybinds.nix b/home/desktops/hyprland/keybinds.nix index 08c40ae..2b1fd80 100644 --- a/home/desktops/hyprland/keybinds.nix +++ b/home/desktops/hyprland/keybinds.nix @@ -1,24 +1,20 @@ [ "SUPER,Q,killactive" "SUPER,T,exec,kitty" + "SUPER,TAB,exec,ags -t overview" "SUPER,C,togglespecialworkspace,calc" "SUPER_SHIFT,C,exec,hyprpicker" "SUPER_SHIFT,V,exec,slurp | grim -g - - | wl-copy" "SUPER,P,togglefloating," "SUPER,P,pin," "SUPER,D,fullscreen,1" - "SUPER,D,movetoworkspace,empty" "SUPER,V,fullscreen,0" - "SUPER,V,movetoworkspace,empty" "SUPER_SHIFT,up,movewindow,u" "SUPER_SHIFT,down,movewindow,d" "SUPER_SHIFT,left,movewindow,l" "SUPER_SHIFT,right,movewindow,r" - "SUPER_SHIFT,S,movetoworkspace,special:terminal" - "SUPER,S,togglespecialworkspace,terminal" - "SUPER,up,movefocus,u" "SUPER,down,movefocus,d" "SUPER,left,movefocus,l" @@ -31,9 +27,6 @@ "SUPER,mouse_up,workspace,r+1" "SUPER,mouse_down,workspace,r-1" - # just dump the window anywhere - "SUPER,x,movetoworkspacesilent,empty" - "SUPER,1,workspace,1" "SUPER,2,workspace,2" "SUPER,3,workspace,3" diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-1.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-1.jpg deleted file mode 100644 index a9dee5e..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-1.jpg and /dev/null differ diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-10.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-10.jpg deleted file mode 100644 index 942d209..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-10.jpg and /dev/null differ diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-11.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-11.jpg deleted file mode 100644 index ed717c5..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-11.jpg and /dev/null differ diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-12.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-12.jpg deleted file mode 100644 index b7fa429..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-12.jpg and /dev/null differ diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-13.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-13.jpg deleted file mode 100644 index 959d625..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-13.jpg and /dev/null differ diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-14.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-14.jpg deleted file mode 100644 index ecd2fe4..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-14.jpg and /dev/null differ diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-15.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-15.jpg deleted file mode 100644 index 9701075..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-15.jpg and /dev/null differ diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-16.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-16.jpg deleted file mode 100644 index 4893f6d..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-16.jpg and /dev/null differ diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-17.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-17.jpg deleted file mode 100644 index 2033b8d..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-17.jpg and /dev/null differ diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-2.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-2.jpg deleted file mode 100644 index a9dee5e..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-2.jpg and /dev/null differ diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-3.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-3.jpg deleted file mode 100644 index 91c0b6b..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-3.jpg and /dev/null differ diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-4.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-4.jpg deleted file mode 100644 index 8a8adc5..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-4.jpg and /dev/null differ diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-5.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-5.jpg deleted file mode 100644 index e42bbc4..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-5.jpg and /dev/null differ diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-6.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-6.jpg deleted file mode 100644 index 128dd8d..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-6.jpg and /dev/null differ diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-7.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-7.jpg deleted file mode 100644 index c8ba20b..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-7.jpg and /dev/null differ diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-8.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-8.jpg deleted file mode 100644 index 8a44cbb..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-8.jpg and /dev/null differ diff --git a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-9.jpg b/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-9.jpg deleted file mode 100644 index f3c9a2b..0000000 Binary files a/home/desktops/hyprland/wallpapers/Lakeside-2/Lakeside-2-9.jpg and /dev/null differ diff --git a/hosts/MONSTER/default.nix b/hosts/MONSTER/default.nix index 6606818..2411843 100644 --- a/hosts/MONSTER/default.nix +++ b/hosts/MONSTER/default.nix @@ -75,6 +75,7 @@ }; hardware.hid-fanatecff.enable = true; + hardware.gbmonctl.enable = true; hardware.sane = { enable = true; diff --git a/modules/nixos/gbmonctl/default.nix b/modules/nixos/gbmonctl/default.nix new file mode 100644 index 0000000..c1fc3f7 --- /dev/null +++ b/modules/nixos/gbmonctl/default.nix @@ -0,0 +1,25 @@ +{ + pkgs, + lib, + config, + ... +}: let + cfg = config.hardware.gbmonctl; +in + with lib; { + options.hardware.gbmonctl = { + enable = mkOption { + type = types.bool; + default = false; + description = lib.mkDoc '' + Enables a CLI tool to change monitor settings over USB to the Gigabyte M32U + + In theory any Gigabyte Monitor that uses a Realtek HID device (presumably the M28U also uses this) to control it over OSD sidekick should have the same protocol, but this is the only one I own. + ''; + }; + }; + config = lib.mkIf cfg.enable { + environment.systemPackages = [pkgs.gbmonctl]; + services.udev.packages = [pkgs.gbmonctl]; + }; + } diff --git a/overlays/gbmonctl/default.nix b/overlays/gbmonctl/default.nix new file mode 100644 index 0000000..0c9a76d --- /dev/null +++ b/overlays/gbmonctl/default.nix @@ -0,0 +1,29 @@ +{ + lib, + pkgs, + buildGoModule, + fetchFromGitHub, + hidapi, + udev, +}: +buildGoModule rec { + pname = "gbmonctl"; + version = "1d01a090"; + src = fetchFromGitHub { + owner = "kelvie"; + repo = "gbmonctl"; + rev = "1d01a9062966e4a3862f4dc51cc5c1f2728d9ea5"; + hash = "sha256-KeBdGtQWz9TBmk1HdXlkIs2r2aZ+EO8WhNaGbsFBBR8="; + }; + vendorHash = "sha256-cEqpEaX4eJ/6um9qbw/kzg9/vesOWmdiHzZ7IodVV9c="; + buildInputs = [hidapi udev]; + postInstall = '' + mkdir -p $out/bin $out/lib/udev/rules.d + echo 'KERNEL=="hidraw*", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="1100", MODE="0666", TAG+="uaccess"' \ + > $out/lib/udev/rules.d/99-gigabyte-monitor.rules + ''; + meta = with lib; { + description = "A CLI tool to change monitor settings over USB to the Gigabyte M32U"; + homepage = "https://github.com/kelvie/gbmonctl"; + }; +}