user configs and monitor settings for hyprland

This commit is contained in:
cnst
2024-10-23 19:09:44 +02:00
parent 7a1b90bb91
commit cfab493b28
6 changed files with 56 additions and 12 deletions

View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# yanked from NotAShelf
SAVEIFS=$IFS SAVEIFS=$IFS
IFS="$(printf '\n\t')" IFS="$(printf '\n\t')"

View File

@@ -12,12 +12,6 @@
availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
kernelModules = []; kernelModules = [];
luks.devices."enc".device = "/dev/disk/by-uuid/1bda09f1-5b2c-4040-ab71-cee54a6df910"; luks.devices."enc".device = "/dev/disk/by-uuid/1bda09f1-5b2c-4040-ab71-cee54a6df910";
postDeviceCommands = lib.mkAfter ''
mkdir /mnt
mount -t btrfs /dev/mapper/enc /mnt
btrfs subvolume delete /mnt/root
btrfs subvolume snapshot /mnt/root-blank /mnt/root
'';
}; };
kernelModules = ["kvm-amd"]; kernelModules = ["kvm-amd"];
extraModulePackages = []; extraModulePackages = [];

View File

@@ -16,10 +16,26 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
monitor = [ # monitor = [
"DP-3, 2560x1440@240, auto, auto, bitdepth, 10" # "DP-3, 2560x1440@240, auto, auto, bitdepth, 10"
"eDP-1,1920x1200@60.02,auto,1" # "eDP-1,1920x1200@60.02,auto,1"
]; # ];
monitor = map (
m: "${m.name},${
if m.enabled
then "${toString m.width}x${toString m.height}@${toString m.refreshRate},${m.position},1${
if m.bitDepth != null
then ",bitdepth,${toString m.bitDepth}"
else ""
}"
else "disable"
}"
) (config.monitors);
workspace = map (
m: "name:${m.workspace},monitor:${m.name}"
) (lib.filter (m: m.enabled && m.workspace != null) config.monitors);
env = [ env = [
"QT_WAYLAND_DISABLE_WINDOWDECORATION,1" "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
]; ];

View File

@@ -30,6 +30,11 @@ in {
type = types.int; type = types.int;
default = 60; default = 60;
}; };
bitDepth = mkOption {
type = types.nullOr types.int;
default = null;
example = 10;
};
position = mkOption { position = mkOption {
type = types.str; type = types.str;
default = "auto"; default = "auto";

View File

@@ -5,9 +5,18 @@
width = 2560; width = 2560;
height = 1440; height = 1440;
refreshRate = 240; refreshRate = 240;
bitDepth = 10;
workspace = "1"; workspace = "1";
primary = true; primary = true;
} }
{
name = "eDP-1";
width = 1920;
height = 1200;
refreshRate = 60;
workspace = "1";
primary = false;
}
]; ];
home = { home = {
browsers = { browsers = {

View File

@@ -42,10 +42,13 @@
# enable = false; # enable = false;
# }; # };
}; };
terminal = { cli = {
alacritty = { alacritty = {
enable = true; enable = true;
}; };
bash = {
enable = true;
};
foot = { foot = {
enable = true; enable = true;
}; };
@@ -58,6 +61,9 @@
zellij = { zellij = {
enable = false; enable = false;
}; };
zsh = {
enable = true;
};
}; };
userd = { userd = {
blueman-applet = { blueman-applet = {
@@ -66,18 +72,32 @@
copyq = { copyq = {
enable = true; enable = true;
}; };
dconf = {
settings = {
color-scheme = "prefer-dark";
};
};
gpg = { gpg = {
enable = false; enable = false;
}; };
gtk = {
enable = true;
};
mako = { mako = {
enable = true; enable = true;
}; };
udiskie = { udiskie = {
enable = true; enable = true;
}; };
polkit = {
enable = true;
};
syncthing = { syncthing = {
enable = false; enable = false;
}; };
xdg = {
enable = true;
};
}; };
utils = { utils = {
anyrun = { anyrun = {