fix: Update incorrect option defaults and add semicolons
Change-Id: I6d0be31dcef568b96005b4f97c82bc85c93477fe
Reviewed-on: https://git.clicks.codes/c/Chimera/NixFiles/+/735
Reviewed-by: Skyler Grey <minion@clicks.codes>
Tested-by: Skyler Grey <minion@clicks.codes>
diff --git a/homes/x86_64-linux/coded@shorthair/default.nix b/homes/x86_64-linux/coded@shorthair/default.nix
index 5d8cfbd..5d9c4a5 100644
--- a/homes/x86_64-linux/coded@shorthair/default.nix
+++ b/homes/x86_64-linux/coded@shorthair/default.nix
@@ -56,23 +56,65 @@
touchpad.enable = true;
input.touchpad.scrolling.natural = true;
- hyprland = {
+ niri = {
enable = true;
- monitors = [
- "DP-1,1920x1080@165,0x0,1"
- "DP-2,1920x1080@165,1920x0,1"
- "HDMI-A-1,3840x2160@60,0x-2160,1"
- ];
- };
-
- hyprland.hyprpaper = {
- splash = {
- enable = true;
- offset = -0.6;
+ monitors = {
+ "DP-1" = {
+ mode = {
+ width = 1920;
+ height = 1080;
+ refresh = 165.;
+ };
+ position = {
+ x = 0;
+ y = 0;
+ };
+ variable-refresh-rate = true;
+ };
+ "DP-2" = {
+ mode = {
+ width = 1920;
+ height = 1080;
+ refresh = 165.;
+ };
+ position = {
+ x = 1920;
+ y = 0;
+ };
+ variable-refresh-rate = true;
+ };
+ "HDMI-A-1" = {
+ mode = {
+ width = 3840;
+ height = 2160;
+ refresh = 60.;
+ };
+ position = {
+ x = 0;
+ y = -2160;
+ };
+ };
};
};
+ # hyprland = {
+ # enable = true;
+
+ # monitors = [
+ # "DP-1,1920x1080@165,0x0,1"
+ # "DP-2,1920x1080@165,1920x0,1"
+ # "HDMI-A-1,3840x2160@60,0x-2160,1"
+ # ];
+ # };
+
+ # hyprland.hyprpaper = {
+ # splash = {
+ # enable = true;
+ # offset = -0.6;
+ # };
+ # };
+
browser.firefox = {
enable = true;
extensions = {
diff --git a/modules/home/wayland/default.nix b/modules/home/wayland/default.nix
index 3ea8d65..be4965a 100644
--- a/modules/home/wayland/default.nix
+++ b/modules/home/wayland/default.nix
@@ -24,10 +24,10 @@
default = "us";
};
variant = lib.mkOption {
- type = lib.types.nullOr lib.types.str;
+ type = lib.types.str;
description = "Keyboard layout variants, comma seperated";
example = "dvorak";
- default = null;
+ default = "";
};
};
diff --git a/modules/home/wayland/niri/default.nix b/modules/home/wayland/niri/default.nix
index 0695273..d6066cd 100644
--- a/modules/home/wayland/niri/default.nix
+++ b/modules/home/wayland/niri/default.nix
@@ -256,6 +256,7 @@
{ proportion = 1. / 3.; }
{ proportion = 1. / 2.; }
{ proportion = 2. / 3.; }
+ { proportion = 9. / 10.; }
]; # TODO: clicks to PR a docs update for niri-flake
};