3 files changed, 78 insertions, 15 deletions

diff --git a/hosts/mantis/configuration.nix b/hosts/mantis/configuration.nix
index c774eef..d21a7b1 100644
--- a/hosts/mantis/configuration.nix
+++ b/hosts/mantis/configuration.nix
@@ -4,13 +4,16 @@
 
 {
   imports =
-    [ # Include the results of the hardware scan.
+    [
+      # Include the results of the hardware scan.
       ./hardware-configuration.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelParams = [ "i915.force_probe=4650" ];
 
   networking.hostName = "mantis";
   time.timeZone = "Europe/London";
@@ -19,12 +22,30 @@
     prompt
     better-text-objs
     vim-colors-plain
+    niri
   ];
 
+  nixpkgs.config = {
+    "2bwm".patches = [
+      ../../patches/2bwm/nerd-patch.diff
+    ];
+
+    st = {
+      conf = builtins.readFile ../../programs/st/config.h;
+      extraLibs = with pkgs; [ harfbuzz ];
+      patches = [
+        ../../patches/st/xres.diff
+        ../../patches/st/bright.diff
+        ../../patches/st/ligatures.diff
+      ];
+    };
+  };
+
+  programs.niri.enable = true;
 
   users.users.op = {
     isNormalUser = true;
-    extraGroups = [ "wheel" ];
+    extraGroups = [ "wheel" "docker" ];
     packages = with pkgs; [
       qutebrowser
       tree
@@ -33,17 +54,49 @@
     home = "/home/op";
   };
 
-  environment.systemPackages = with pkgs; [
-    man-pages
-    man-pages-posix
-    (lib.hiPrio pkgs.bashInteractive_5)
-  ];
+  environment = {
+    systemPackages = with pkgs; [
+      man-pages
+      man-pages-posix
+      (lib.hiPrio pkgs.bashInteractive_5)
+      _2bwm
+    ];
+    variables = {
+      QT_SCALE_FACTOR_ROUNDING_POLICY = "RoundPreferFloor";
+    };
+  };
 
   services = {
-      openssh.enable = true;
-      tailscale.enable = true;
+    openssh = {
+      enable = true;
+      settings = {
+        X11Forwarding = true;
+        PrintMotd = true;
+      };
+    };
+    tailscale.enable = true;
+    libinput.enable = true;
+    xserver = {
+      enable = true;
+      displayManager.startx.enable = true;
+    };
   };
 
+  hardware.opengl.extraPackages = [
+    pkgs.vpl-gpu-rt
+  ];
+
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+
+
+  virtualisation.docker.enable = true;
+
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
   # This option defines the first version of NixOS you have installed on this particular machine,
diff --git a/hosts/mantis/hardware-configuration.nix b/hosts/mantis/hardware-configuration.nix
index 3f04a4a..bebdb21 100644
--- a/hosts/mantis/hardware-configuration.nix
+++ b/hosts/mantis/hardware-configuration.nix
@@ -5,7 +5,8 @@
 
 {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
@@ -14,19 +15,20 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/efd94de4-c3fa-4a3b-98f9-66ccfb8479b9";
+    {
+      device = "/dev/disk/by-uuid/efd94de4-c3fa-4a3b-98f9-66ccfb8479b9";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/5BBB-E6FE";
+    {
+      device = "/dev/disk/by-uuid/5BBB-E6FE";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/65faea2e-c2ce-4ec2-8aca-e09e5073676b"; }
-    ];
+    [{ device = "/dev/disk/by-uuid/65faea2e-c2ce-4ec2-8aca-e09e5073676b"; }];
 
   # 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
diff --git a/hosts/mantis/home.nix b/hosts/mantis/home.nix
index 84a365f..bcdb0ee 100644
--- a/hosts/mantis/home.nix
+++ b/hosts/mantis/home.nix
@@ -24,14 +24,15 @@
     vim
     weechat
     firefox
+    thunderbird
     qutebrowser
     unzip
     tmux
-    xclip
     ripgrep
     miniserve
     pfetch
     st
+    rxvt-unicode
     cmus
     tree
     w3m
@@ -44,9 +45,12 @@
     pavucontrol
     bc
     killall
+    signal-desktop
+    alsa-utils
 
     wget
     curl
+    mosh
 
     imagemagick
     ffmpeg-full
@@ -63,6 +67,10 @@
     xinput_calibrator
     libinput
 
+    # wayland stuff
+    wl-clipboard-rs
+    swaybg
+
     nixpkgs-fmt
 
   ] ++ (import ../../scripts { inherit pkgs; });