diff --git a/config.nix b/config.nix index aed79dc..aa982f0 100644 --- a/config.nix +++ b/config.nix @@ -9,8 +9,7 @@ font = "JetBrainsMono Nerd Font"; size = "18"; shell = "fish"; # or zsh - aliases = { - }; + aliases = {}; }; allowUnfree = true; }; @@ -35,10 +34,10 @@ }; Hyprland = { monitors = [ - "DP-1, highres@165,0x1080,auto" - "DP-2, highres@highrr, 0x0,auto" - # "HDMI-A-1, preferred, 20000x20000,1" - "HDMI-A-1, disabled" + "DP-1, highres@165,0x1080,1,vrr,1" + "DP-2, highres@highrr,0x0,1" + "HDMI-A-1, 1920x1080@120, 20000x20000,1" + # "HDMI-A-1, disabled" ]; }; Git = { diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix index 306d7a8..cd575e1 100644 --- a/hosts/hakase/configuration.nix +++ b/hosts/hakase/configuration.nix @@ -12,7 +12,7 @@ ./hardware-configuration.nix ../../modules/default/desktop.nix ../../modules/default/dev.nix - ../../modules/default/appimage.nix + ../../modules/default/remote.nix ]; environment.systemPackages = with pkgs; [ diff --git a/modules/home/remote.nix b/modules/home/remote.nix new file mode 100644 index 0000000..efd2ab2 --- /dev/null +++ b/modules/home/remote.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ../../packages/moondeck-buddy/appimage.nix + ../../packages/sunshine/default.nix + ]; +} diff --git a/packages/hyprland/config/execs.nix b/packages/hyprland/config/execs.nix index afcbfae..36d3a4b 100644 --- a/packages/hyprland/config/execs.nix +++ b/packages/hyprland/config/execs.nix @@ -9,9 +9,12 @@ "[workspace 20 silent] kitty --single-instance --hold fastfetch" "[workspace 20 silent] firefox" "[workspace 1] kitty --single-instance --hold fastfetch" - "matugen image /home/${myConfig.essentials.Username}/Pictures/Wallpapers/ultrawide-nixos-default.png" "hyprctl setcursor Bibata-Modern-Ice 24" + "solaar -w hide" + "matugen image /home/${myConfig.essentials.Username}/Pictures/Wallpapers/ultrawide-nixos-default.png" + "sunshine" + "moondeck-buddy" ]; }; } diff --git a/packages/hyprland/config/rules.nix b/packages/hyprland/config/rules.nix index e69de29..cce3f4d 100644 --- a/packages/hyprland/config/rules.nix +++ b/packages/hyprland/config/rules.nix @@ -0,0 +1,16 @@ +{ + config, + pkgs, + myConfig, + ... +}: { + wayland.windowManager.hyprland.settings = { + workspace = [ + "1, monitor:DP-1, default:true" + "2, monitor:DP-1" + "3, monitor:DP-1" + "4, monitor:DP-1" + "5, monitor:DP-1" + ]; + }; +} diff --git a/packages/hyprland/home.nix b/packages/hyprland/home.nix index 33bf06b..de02d31 100644 --- a/packages/hyprland/home.nix +++ b/packages/hyprland/home.nix @@ -2,6 +2,7 @@ imports = [ ./config/binds.nix ./config/execs.nix + ./config/rules.nix ]; home.file.".config/hypr/scripts/wsaction.fish" = { diff --git a/packages/sunshine/default.nix b/packages/sunshine/home.nix similarity index 100% rename from packages/sunshine/default.nix rename to packages/sunshine/home.nix