misc general changes / nixpkgs break fixes

systems/msi/default.nix

@@ -1,12 +1,48 @@
-{ pkgs, ... }: {
+{ config, pkgs, ... }: {
   imports = [
     ./hardware.nix
-    ./mullvad.nix
     ./hyprland
     ./mcontrolcenter.nix
   ];
 
+  services.timesyncd.enable = true;
+
+  services.sshd.enable = true;
+
   system.stateVersion = "23.11";
   networking.hostName = "msi";
   time.timeZone = "America/Vancouver";
+  programs.noisetorch.enable = true;
+
+  home-manager.users.${config.main-user} = {
+    home.packages = with pkgs; [
+      osu-lazer-bin
+    ];
+
+    services.blueman-applet.enable = true;
+  };
+
+  networking = {
+    firewall.allowedTCPPorts = [
+      40921 # bittorrent
+      49775 # slsk
+    ];
+    #nat.externalInterface = [ "wlp4s0" ];
+  };
+
+  users.users.${config.main-user}.extraGroups = [ "docker" ];
+  virtualisation.docker.enable = true;
+
+
+  boot.extraModulePackages = with config.boot.kernelPackages; [
+    v4l2loopback
+  ];
+  boot.extraModprobeConfig = ''
+    options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
+  '';
+
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+
+  hardware.bluetooth.enable = true;
+  services.blueman.enable = true;
 }

systems/msi/hardware-configuration.nix

@@ -1,6 +1,6 @@
-# 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.
+# zfs:
+# sudo zfs create -o mountpoint=legacy -o canmount=off -o atime=off -o compression=zstd -o sync=disabled -o casesensitivity=sensitive -o exec=on -o setuid=off -o xattr=sa -o devices=off pool/games
+# sudo zfs create -o mountpoint=legacy -o canmount=off -o atime=off -o compression=zstd -o sync=disabled -o casesensitivity=sensitive -o exec=on -o setuid=off -o xattr=sa -o devices=off pool/torrents
 { config, lib, pkgs, modulesPath, ... }:
 
 {
@@ -13,6 +13,11 @@
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
+  boot.supportedFilesystems = [ "zfs" ];
+  networking.hostId = "fd4421b3";
+  systemd.services.zfs-mount.enable = false;
+  services.zfs.autoScrub.enable = true;
+
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/c9cb1730-c0d1-4a2e-a092-12dfa7098476";
       fsType = "ext4";
@@ -23,6 +28,21 @@
       fsType = "vfat";
     };
 
+  fileSystems."/pool/games" = {
+    fsType = "zfs";
+    device = "pool/games";
+  };
+
+  fileSystems."/pool/torrents" = {
+    fsType = "zfs";
+    device = "pool/torrents";
+  };
+
+  fileSystems."/pool/music" = {
+    fsType = "zfs";
+    device = "pool/music";
+  };
+
   swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

systems/msi/hardware.nix

@@ -1,18 +1,22 @@
 { pkgs, ... }: {
   imports = [ ./hardware-configuration.nix ];
 
-  hardware.opengl = {
+  environment.variables = {
+    VDPAU_DRIVER = "radeonsi";
+    QT_MEDIA_BACKED = "gstreamer"; # ffmpeg can't choose between vdpau and vaapi for some reason
+  };
+
+  hardware.graphics = {
     enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
+    #driSupport = true;
+    enable32Bit = true;
 
     extraPackages = with pkgs; [
-      rocm-opencl-icd
       amdvlk
     ];
 
-    extraPackages32 = with pkgs; [
-      driversi686Linux.amdvlk
+    extraPackages32 = with pkgs.driversi686Linux; [
+      amdvlk
     ];
   };
 }

systems/msi/hyprland/default.nix

@@ -1,6 +1,7 @@
 { impurity, ... }: {
   hyprland-session = {
-    prerun = "export WLR_DRM_DEVICES=/dev/dri/card1:/dev/dri/card2";
+    prerun = "export AQ_DRM_DEVICES=/dev/dri/card1:/dev/dri/card2";
     extraConfig = "source = ${impurity.link ./hyprland.conf}";
+    extraConfigStatic = "source = ${./hyprland.conf}";
   };
 }

systems/msi/hyprland/hyprland.conf

@@ -21,4 +21,7 @@ workspace = 16, monitor:eDP-1
 workspace = 17, monitor:eDP-1
 workspace = 18, monitor:eDP-1
 workspace = 19, monitor:eDP-1
-workspace = 20, monitor:eDP-1
+workspace = 20, monitor:eDP-1
+
+workspace = name:lock_DP-1, monitor:DP-1
+workspace = name:lock_eDP-1, monitor:eDP-1