diff --git a/.scripts/bin/extract.sh b/.scripts/bin/extract.sh index e54e0de6..91921439 100755 --- a/.scripts/bin/extract.sh +++ b/.scripts/bin/extract.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash - +# yanked from NotAShelf SAVEIFS=$IFS IFS="$(printf '\n\t')" diff --git a/hosts/cnix/hardware-configuration.nix b/hosts/cnix/hardware-configuration.nix index 572454b4..ec9a0a87 100644 --- a/hosts/cnix/hardware-configuration.nix +++ b/hosts/cnix/hardware-configuration.nix @@ -12,12 +12,6 @@ availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; kernelModules = []; 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"]; extraModulePackages = []; diff --git a/modules/home/wm/hyprland/cnst/inputs.nix b/modules/home/wm/hyprland/cnst/inputs.nix index 132a0ce9..b8925f51 100644 --- a/modules/home/wm/hyprland/cnst/inputs.nix +++ b/modules/home/wm/hyprland/cnst/inputs.nix @@ -16,10 +16,26 @@ in { }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { - monitor = [ - "DP-3, 2560x1440@240, auto, auto, bitdepth, 10" - "eDP-1,1920x1200@60.02,auto,1" - ]; + # monitor = [ + # "DP-3, 2560x1440@240, auto, auto, bitdepth, 10" + # "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 = [ "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" ]; diff --git a/modules/options/monitors/default.nix b/modules/options/monitors/default.nix index cbccd2b7..51efe0bd 100644 --- a/modules/options/monitors/default.nix +++ b/modules/options/monitors/default.nix @@ -30,6 +30,11 @@ in { type = types.int; default = 60; }; + bitDepth = mkOption { + type = types.nullOr types.int; + default = null; + example = 10; + }; position = mkOption { type = types.str; default = "auto"; diff --git a/users/cnst/modules.nix b/users/cnst/modules.nix index ad90a458..6cd6804d 100644 --- a/users/cnst/modules.nix +++ b/users/cnst/modules.nix @@ -5,9 +5,18 @@ width = 2560; height = 1440; refreshRate = 240; + bitDepth = 10; workspace = "1"; primary = true; } + { + name = "eDP-1"; + width = 1920; + height = 1200; + refreshRate = 60; + workspace = "1"; + primary = false; + } ]; home = { browsers = { diff --git a/users/toothpick/modules.nix b/users/toothpick/modules.nix index ab69abc2..0d8daecd 100644 --- a/users/toothpick/modules.nix +++ b/users/toothpick/modules.nix @@ -42,10 +42,13 @@ # enable = false; # }; }; - terminal = { + cli = { alacritty = { enable = true; }; + bash = { + enable = true; + }; foot = { enable = true; }; @@ -58,6 +61,9 @@ zellij = { enable = false; }; + zsh = { + enable = true; + }; }; userd = { blueman-applet = { @@ -66,18 +72,32 @@ copyq = { enable = true; }; + dconf = { + settings = { + color-scheme = "prefer-dark"; + }; + }; gpg = { enable = false; }; + gtk = { + enable = true; + }; mako = { enable = true; }; udiskie = { enable = true; }; + polkit = { + enable = true; + }; syncthing = { enable = false; }; + xdg = { + enable = true; + }; }; utils = { anyrun = {