i3 updates

hosts/common/features/display/x11.nix

@@ -5,18 +5,9 @@
     desktopManager = {
       gnome.enable = true;
     };
-    xserver.windowManager = {
-      i3 = {
-        enable = true;
-        extraPackages = with pkgs; [
-          dmenu
-          i3status
-        ];
-      };
-    };
+    xserver.windowManager.i3.enable = true;
     sysprof.enable = true;
     gnome = {
-      evolution-data-server.enable = true;
       glib-networking.enable = true;
       gnome-keyring.enable = true;
       gnome-online-accounts.enable = true;

hosts/desktop/default.nix

@@ -38,9 +38,14 @@
 
   programs.zsh.enable = true;
 
-  # environment.variables = {
-  #   GDK_SCALE = 2;
-  # };
+  services.xserver.displayManager.sessionCommands = ''
+    BOTTOM='HDMI-0'
+    TOP='DP-0'
+    RIGHT='DP-2'
+    touch /home/naps62/foo
+    ${pkgs.xorg.xrandr}/bin/xrandr --output $BOTTOM --primary --mode 3840x2160 --pos 0x0 --rotate normal --output $TOP --mode 3840x2160 --above $BOTTOM --rotate normal --output $RIGHT --mode 3840x2160 --pos 3840x-1680 --rotate left
+    ${pkgs.xorg.xrandr}/bin/xrandr --dpi 160
+  '';
 
   users.users.naps62 = {
     isNormalUser = true;

hosts/desktop/hardware-configuration.nix

@@ -1,63 +1,40 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [
-    "vmd"
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "thunderbolt"
-    "virtio-pci"
-  ];
+  boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" "virtio-pci" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/c8b56d56-3482-48d4-a8dd-825c4c2cf10e";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/1f8625f0-5e97-4679-9885-f7ef21d5351c";
+      fsType = "ext4";
+    };
 
-  boot.initrd.luks.devices = {
-    "luks-51347cdc-de81-4132-b21c-f1d089e387eb".device =
-      "/dev/disk/by-uuid/51347cdc-de81-4132-b21c-f1d089e387eb";
-    "luks-9ffb64c6-54c2-46f2-9df5-e42c33a52d1a".device =
-      "/dev/disk/by-uuid/9ffb64c6-54c2-46f2-9df5-e42c33a52d1a";
-  };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/AE7C-876F";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/D86A-A762";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/2c16b0a2-9b42-40d1-ada1-6b5e09525716"; }
     ];
-  };
-
-  swapDevices = [
-    { device = "/dev/mapper/luks-9ffb64c6-54c2-46f2-9df5-e42c33a52d1a"; }
-  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;