40 files changed, 1360 insertions, 649 deletions
diff --git a/flake.lock b/flake.lock
index d485422..9faf5d0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,42 +20,21 @@
        "url": "https://git.peppe.rs/vim/better-text-objs"
      }
    },
-    "flaresolverr": {
+    "flake-parts": {
      "inputs": {
-        "flaresolverr-src": "flaresolverr-src",
+        "nixpkgs-lib": "nixpkgs-lib"
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "undetected-chromedriver-src": "undetected-chromedriver-src"
      },
      "locked": {
-        "lastModified": 1710267135,
+        "lastModified": 1727826117,
-        "narHash": "sha256-OPVcNqdxVoof8M887UQq6IVfPTqQVNXD3lu9HEd6pXU=",
+        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
-        "ref": "refs/heads/master",
+        "owner": "hercules-ci",
-        "rev": "ea3256ae93f22449c70f78123d8019d23a9d7ff6",
+        "repo": "flake-parts",
-        "revCount": 3,
+        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
-        "type": "git",
-        "url": "https://git.peppe.rs/flakes/flaresolverr"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.peppe.rs/flakes/flaresolverr"
-      }
-    },
-    "flaresolverr-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1709156333,
-        "narHash": "sha256-pf5sibZ9Vjc98UOVTEUlKrBoXXKiykrt+szXLbNJB3k=",
-        "owner": "FlareSolverr",
-        "repo": "FlareSolverr",
-        "rev": "fd773e59097c1aca4e08edc07c1ed30164f88bd3",
        "type": "github"
      },
      "original": {
-        "owner": "FlareSolverr",
+        "owner": "hercules-ci",
-        "ref": "v3.3.16",
+        "repo": "flake-parts",
-        "repo": "FlareSolverr",
        "type": "github"
      }
    },
@@ -66,11 +45,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1710532761,
+        "lastModified": 1730016908,
-        "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
+        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
+        "rev": "e83414058edd339148dc142a8437edb9450574c8",
        "type": "github"
      },
      "original": {
@@ -79,13 +58,72 @@
        "type": "github"
      }
    },
+    "niri": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "niri-stable": "niri-stable",
+        "niri-unstable": "niri-unstable",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable",
+        "xwayland-satellite-stable": "xwayland-satellite-stable",
+        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
+      },
+      "locked": {
+        "lastModified": 1730267238,
+        "narHash": "sha256-Qwr72PbHBmc88UeLtm7K6/PJ0cfJjq8p2R4lsHA4cWw=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "92d467d0c2dc8aeade9d858c95104b6a678cd9c0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "type": "github"
+      }
+    },
+    "niri-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1726304152,
+        "narHash": "sha256-4YDrKMwXGVOBkeaISbxqf24rLuHvO98TnqxWYfgiSeg=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "6a48728ffb1e638839b07f9ab2f06b2adb41dc61",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "ref": "v0.1.9",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "niri-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1730263923,
+        "narHash": "sha256-HFOXeh+WNtAwuV/KNtOSKXGnOoy465a/dud2zvtsCt8=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "d3e72245b003cbeed0810bf00c4a445b7c8a652a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1662714967,
+        "lastModified": 1730161780,
-        "narHash": "sha256-IOTq5tAGGmBFj7tQbkcyLE261JUeTUucEE3p0WLZ4qM=",
+        "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "1fec8fda86dac5701146c77d5f8a414b14ed1ff6",
+        "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8",
        "type": "github"
      },
      "original": {
@@ -96,11 +134,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1710534455,
+        "lastModified": 1730045389,
-        "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=",
+        "narHash": "sha256-4spSNTZ6h8Xmvrr9oqfuxc9jarasGj1QOcsgw8BfNd8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212",
+        "rev": "0fcb98acb6633445764dafe180e6833eb0f95208",
        "type": "github"
      },
      "original": {
@@ -110,6 +148,50 @@
        "type": "github"
      }
    },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1727825735,
+        "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1730137625,
+        "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1724748588,
+        "narHash": "sha256-NlpGA4+AIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "a6292e34000dc93d43bccf78338770c1c5ec8a99",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "prompt": {
      "inputs": {
        "nixpkgs": [
@@ -130,51 +212,87 @@
        "url": "https://git.peppe.rs/cli/prompt"
      }
    },
+    "readit": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1730847014,
+        "narHash": "sha256-ZnXEn7bUg43yeePXkG8THfCQTC7YmchigPnOx3pd0+w=",
+        "ref": "refs/heads/master",
+        "rev": "276f8e058d831429f171293e399f43c94719a504",
+        "revCount": 32,
+        "type": "git",
+        "url": "https://git.peppe.rs/web/readit"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.peppe.rs/web/readit"
+      }
+    },
    "root": {
      "inputs": {
        "better-text-objs": "better-text-objs",
-        "flaresolverr": "flaresolverr",
        "home-manager": "home-manager",
+        "niri": "niri",
        "nixos-hardware": "nixos-hardware",
        "nixpkgs": "nixpkgs",
        "prompt": "prompt",
+        "readit": "readit",
        "vim-colors-plain": "vim-colors-plain"
      }
    },
-    "undetected-chromedriver-src": {
+    "vim-colors-plain": {
-      "flake": false,
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
      "locked": {
-        "lastModified": 1708190030,
+        "lastModified": 1730272245,
-        "narHash": "sha256-Qe+GrsUPnhjJMDgjdUCloapjj0ggFlm/Dr42WLcmb1o=",
+        "narHash": "sha256-B5ADR+N8297uv9i6HazGaT/uSXM5aJ9RpXNnVQPQPQI=",
-        "owner": "ultrafunkamsterdam",
+        "owner": "oppiliappan",
-        "repo": "undetected-chromedriver",
+        "repo": "vim-colors-plain",
-        "rev": "0aa5fbe252370b4cb2b95526add445392cad27ba",
+        "rev": "d9b9c11a55ec5500c65d062490f60ea707eb46c8",
        "type": "github"
      },
      "original": {
-        "owner": "ultrafunkamsterdam",
+        "owner": "oppiliappan",
-        "repo": "undetected-chromedriver",
+        "repo": "vim-colors-plain",
        "type": "github"
      }
    },
-    "vim-colors-plain": {
+    "xwayland-satellite-stable": {
-      "inputs": {
+      "flake": false,
-        "nixpkgs": [
+      "locked": {
-          "nixpkgs"
+        "lastModified": 1718165778,
-        ]
+        "narHash": "sha256-dwF9nI54a6Fo9XU5s4qmvMXSgCid3YQVGxch00qEMvI=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "b6d281967cb0b7bf1dfdb8d0f597b517dc4aa5c5",
+        "type": "github"
      },
+      "original": {
+        "owner": "Supreeeme",
+        "ref": "v0.4",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-unstable": {
+      "flake": false,
      "locked": {
-        "lastModified": 1702647482,
+        "lastModified": 1730258684,
-        "narHash": "sha256-HLDqIfRjzb3YAdpjBW7iN2YCWWxSkTgu+MzKV5+H/WQ=",
+        "narHash": "sha256-E+69sdxUhPSNI8+JlTL6KKbNv5qVD3L1y8hdVO37A44=",
-        "ref": "refs/heads/master",
+        "owner": "Supreeeme",
-        "rev": "bfa854ec04e0dab4c69911595d0653a34f626f1d",
+        "repo": "xwayland-satellite",
-        "revCount": 58,
+        "rev": "b0ee6db9fa9901c675b3c7e952c2a8ce987a0f58",
-        "type": "git",
+        "type": "github"
-        "url": "https://git.peppe.rs/vim/vim-colors-plain"
      },
      "original": {
-        "type": "git",
+        "owner": "Supreeeme",
-        "url": "https://git.peppe.rs/vim/vim-colors-plain"
+        "repo": "xwayland-satellite",
+        "type": "github"
      }
    }
  },
diff --git a/flake.nix b/flake.nix
index 55ed146..aab11c1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,12 +2,12 @@
  description = "nerdypepper's nixos config";
  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = github:NixOS/nixpkgs/nixpkgs-unstable;
    nixos-hardware.url = "github:nixos/nixos-hardware";
    home-manager = {
-      url = "github:nix-community/home-manager";
+      url = github:nix-community/home-manager;
      inputs.nixpkgs.follows = "nixpkgs";
    };
@@ -22,15 +22,24 @@
    };
    vim-colors-plain = {
-      url = "git+https://git.peppe.rs/vim/vim-colors-plain";
+      url = "github:oppiliappan/vim-colors-plain";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    flaresolverr = {
+    # flaresolverr = {
-      url = "git+https://git.peppe.rs/flakes/flaresolverr";
+    #   url = "git+https://git.peppe.rs/flakes/flaresolverr";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
+    niri = {
+      url = "github:sodiboo/niri-flake";
      inputs.nixpkgs.follows = "nixpkgs";
    };
+    readit = {
+      url = "git+https://git.peppe.rs/web/readit";
+    };
  };
  outputs =
@@ -41,7 +50,9 @@
    , prompt
    , better-text-objs
    , vim-colors-plain
-    , flaresolverr
+      # , flaresolverr
+    , niri
+    , readit
    , ...
    } @ inputs: {
@@ -50,18 +61,20 @@
        prompt = prompt.overlay;
        better-text-objs = better-text-objs.overlay;
        vim-colors-plain = vim-colors-plain.overlay;
-        flaresolverr = flaresolverr.overlays.default;
+        # flaresolverr = flaresolverr.overlays.default;
+        niri = niri.overlays.niri;
      };
      formatter."x86_64-linux" = nixpkgs.legacyPackages."x86_64-linux".nixpkgs-fmt;
      nixosConfigurations = {
-        olive = nixpkgs.lib.nixosSystem {
+        myrtle = nixpkgs.lib.nixosSystem {
          system = "x86_64-linux";
          modules = [
            ({ config = { nix.registry.nixpkgs.flake = nixpkgs; }; })
            {
-              imports = [ ./hosts/olive/configuration.nix ];
+              imports = [ ./hosts/myrtle/configuration.nix ];
              _module.args.self = self;
            }
            home-manager.nixosModules.home-manager
@@ -69,48 +82,45 @@
              home-manager.useGlobalPkgs = true;
              home-manager.useUserPackages = true;
              home-manager.users.np = {
-                imports = [ ./home.nix ];
+                imports = [ ./hosts/myrtle/home.nix ];
                _module.args.self = self;
                _module.args.inputs = inputs;
                _module.args.theme = import ./theme;
+                _module.args.font = import ./font.nix;
              };
            }
+            nixos-hardware.nixosModules.asus-battery
          ];
        };
-        myrtle = nixpkgs.lib.nixosSystem {
+        mantis = nixpkgs.lib.nixosSystem {
          system = "x86_64-linux";
          modules = [
            ({ config = { nix.registry.nixpkgs.flake = nixpkgs; }; })
            {
-              imports = [ ./hosts/myrtle/configuration.nix ];
+              imports = [ ./hosts/mantis/configuration.nix ];
              _module.args.self = self;
            }
            home-manager.nixosModules.home-manager
            {
              home-manager.useGlobalPkgs = true;
              home-manager.useUserPackages = true;
-              home-manager.users.np = {
+              home-manager.users.op = {
-                imports = [ ./home.nix ];
+                imports = [ ./hosts/mantis/home.nix ];
                _module.args.self = self;
                _module.args.inputs = inputs;
                _module.args.theme = import ./theme;
                _module.args.font = import ./font.nix;
              };
            }
-            nixos-hardware.nixosModules.asus-battery
-          ];
-        };
-        mantis = nixpkgs.lib.nixosSystem {
+            # {
-          system = "x86_64-linux";
+            #   imports = [niri.nixosModules.niri];
-          modules = [
+            #   nixpkgs.overlays = [niri.overlays.niri];
-            ({ config = { nix.registry.nixpkgs.flake = nixpkgs; }; })
+            #   programs.niri.enable = true;
-            {
+            #   programs.niri.config = builtins.readFile ./hosts/mantis/niri-config.kdl;
-              imports = [ ./hosts/mantis/configuration.nix ];
+            # }
-              _module.args.self = self;
-            }
-            flaresolverr.nixosModules.default
          ];
        };
@@ -122,7 +132,8 @@
              imports = [ ./hosts/laurel/configuration.nix ];
              _module.args.self = self;
            }
-            flaresolverr.nixosModules.default
+            # flaresolverr.nixosModules.default
+            readit.nixosModules.default
          ];
        };
diff --git a/font.nix b/font.nix
index 74afcdd..17b3978 100644
--- a/font.nix
+++ b/font.nix
@@ -1,3 +1,3 @@
 {
-  name = "Nerd Input";
+  name = "InputMono";
 }
diff --git a/hosts/laurel/configuration.nix b/hosts/laurel/configuration.nix
index a2559ae..e824853 100644
--- a/hosts/laurel/configuration.nix
+++ b/hosts/laurel/configuration.nix
@@ -33,9 +33,9 @@
  };
  # Enable sound.
-  sound.enable = true;
+  # sound.enable = true;
  hardware.pulseaudio.enable = true;
-  hardware.opengl = {
+  hardware.graphics = {
    enable = true;
    extraPackages = with pkgs; [
      intel-media-driver
@@ -63,7 +63,7 @@
  users.users.op = {
    isNormalUser = true;
-    extraGroups = [ "wheel" "tty" ];
+    extraGroups = [ "wheel" "tty" "syncthing" ];
    home = "/home/op";
    openssh.authorizedKeys.keys = [
      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG4oThdAy5wQtzCarxDPuzWX6ImYw0c1QfkF0+wZNE6o np@myrtle"
@@ -77,7 +77,7 @@
  };
  services.invidious = {
-    enable = true;
+    enable = false;
    port = 3333;
    domain = "tube.laurel";
    settings = {
@@ -114,18 +114,6 @@
    };
  };
-  services.podgrab = {
-    enable = true;
-    port = 3434;
-  };
-  services.nginx.virtualHosts."podcast.laurel" = {
-    listen = [{ port = 80; addr = "0.0.0.0"; }];
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:${builtins.toString config.services.podgrab.port}";
-      proxyWebsockets = true;
-    };
-  };
  services.miniflux = {
    enable = true;
    adminCredentialsFile = "/etc/miniflux/admin";
@@ -152,7 +140,7 @@
  };
  services.matrix-conduit = {
-    enable = true;
+    enable = false;
    settings = {
      global = {
        allow_encryption = true;
@@ -166,6 +154,75 @@
      };
    };
  };
+  services.mautrix-whatsapp = {
+    enable = false;
+    settings = {
+      homeserver = {
+        address = "http://localhost:6197";
+        domain = "oppi.li";
+      };
+      appservice = { };
+      bridge = {
+        encryption = {
+          allow = true;
+          default = true;
+          require = true;
+        };
+        history_sync = {
+          request_full_sync = true;
+        };
+        mute_bridging = true;
+        permissions = {
+          "*" = "user";
+        };
+        private_chat_portal_meta = true;
+        provisioning = {
+          shared_secret = "disable";
+        };
+      };
+    };
+  };
+  services.radicale = {
+    enable = true;
+    settings = {
+      server.hosts = [ "0.0.0.0:5232" ];
+      auth = {
+        type = "htpasswd";
+        htpasswd_filename = "/etc/radicale/users";
+        htpasswd_encryption = "bcrypt";
+      };
+    };
+  };
+  services.nginx.virtualHosts."radicale.laurel" = {
+    listen = [{ port = 80; addr = "0.0.0.0"; }];
+    locations."/" = {
+      proxyPass = "http://127.0.0.1:5232";
+    };
+  };
+  services.syncthing = {
+    enable = true;
+    dataDir = "/syncthing";
+  };
+  services.nginx.virtualHosts."sync.laurel" = {
+    listen = [{ port = 80; addr = "0.0.0.0"; }];
+    locations."/" = {
+      proxyPass = "http://127.0.0.1:8384";
+    };
+  };
+  services.readit = {
+    enable = true;
+    port = 9495;
+  };
+  services.nginx.virtualHosts."read.laurel" = {
+    listen = [{ port = 80; addr = "0.0.0.0"; }];
+    locations."/" = {
+      proxyPass = "http://127.0.0.1:9495";
+    };
+  };
  nix.settings.experimental-features = [ "nix-command" "flakes" ];
diff --git a/hosts/laurel/hardware-configuration.nix b/hosts/laurel/hardware-configuration.nix
index 142c4a7..cd34eae 100644
--- a/hosts/laurel/hardware-configuration.nix
+++ b/hosts/laurel/hardware-configuration.nix
@@ -20,6 +20,13 @@
      fsType = "ext4";
    };
+  fileSystems."/servarr" =
+    {
+      device = "/dev/sdb";
+      fsType = "ext4";
+    };
  fileSystems."/boot" =
    {
      device = "/dev/disk/by-uuid/FDC2-EFD1";
diff --git a/hosts/laurel/servarr.nix b/hosts/laurel/servarr.nix
index e300759..e9c06c4 100644
--- a/hosts/laurel/servarr.nix
+++ b/hosts/laurel/servarr.nix
@@ -1,8 +1,12 @@
-{ config, lib, pkgs, ... }:
+{ self, config, lib, pkgs, ... }:
 {
  imports = [ ];
+  nixpkgs.overlays = with self.overlays; [
+    #flaresolverr
+  ];
  users.groups."torrent".members = [
    "op"
    "sonarr"
@@ -96,6 +100,8 @@
    };
  };
+  services.flaresolverr.enable = true;
 }
diff --git a/hosts/mantis/configuration.nix b/hosts/mantis/configuration.nix
index 8f71964..d96f321 100644
--- a/hosts/mantis/configuration.nix
+++ b/hosts/mantis/configuration.nix
@@ -1,5 +1,3 @@
-# Edit this configuration file to define what should be installed on
-# your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 { config, lib, pkgs, self, ... }:
@@ -11,217 +9,94 @@
      ./hardware-configuration.nix
    ];
-  nixpkgs.overlays = with self.overlays; [
-    flaresolverr
-  ];
  # 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"; # Define your hostname.
+  networking.hostName = "mantis";
-  networking.wireless.iwd.enable = true; # Enables wireless support via wpa_supplicant.
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
  time.timeZone = "Europe/London";
-  i18n.defaultLocale = "en_US.UTF-8";
-  nixpkgs.config.packageOverrides = pkgs: {
+  nixpkgs.overlays = with self.overlays; [
-    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+    prompt
-  };
+    better-text-objs
+    vim-colors-plain
+  ];
-  # Enable sound.
+  nixpkgs.config = {
-  sound.enable = true;
+    "2bwm".patches = [
-  hardware.pulseaudio.enable = true;
+      ../../patches/2bwm/nerd-patch.diff
-  hardware.opengl = {
-    enable = true;
-    extraPackages = with pkgs; [
-      intel-media-driver
-      vaapiIntel
-      vaapiVdpau
-      libvdpau-va-gl
-      intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in)
    ];
+    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
+      ];
+    };
  };
-  # Define a user account. Don't forget to set a password with ‘passwd’.
  users.users.op = {
    isNormalUser = true;
-    extraGroups = [ "wheel" "tty" ];
+    extraGroups = [ "wheel" "docker" ];
-    packages = with pkgs; [ ];
+    packages = with pkgs; [
-    home = "/home/op";
+      qutebrowser
-    openssh.authorizedKeys.keys = [
+      tree
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILzFK/zY2ZaAftBfFPO+IJAgyD45pe0fXrpF81p8aNIl np@myrtle"
    ];
-  };
+    createHome = true;
-  users.groups."torrent".members = [
+    home = "/home/op";
-    "op"
-    "sonarr"
-    "radarr"
-    "bazarr"
-    "jackett"
-    "lidarr"
-    "jellyfin"
-    "transmission"
-  ];
-  environment.systemPackages = with pkgs; [
-    vim
-    wget
-    pkgs.jellyfin
-    pkgs.jellyfin-web
-    pkgs.jellyfin-ffmpeg
-    pkgs.htop
-    pkgs.ripgrep
-    pkgs.git
-  ];
-  services.openssh.enable = true;
-  services.nginx.enable = true;
-  services.tailscale.enable = true;
-  services.jellyfin = {
-    enable = true;
-    openFirewall = true;
-    group = "torrent";
-  };
-  services.nginx.virtualHosts."stream.mantis" = {
-    listen = [{ port = 80; addr = "0.0.0.0"; }];
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:8096";
-      proxyWebsockets = true;
-    };
-  };
-  services.navidrome = {
-    enable = true;
-    openFirewall = true;
-    settings = {
-      MusicFolder = "/servarr/lidarr/";
-      DataFolder = "/etc/navidrome/data";
-      CacheFolder = "/etc/navidrome/cache";
-      Address = "0.0.0.0";
-      Port = 4533;
-      AuthRequestLimit = 0;
-      EnableTranscodingConfig = true;
-    };
-  };
-  services.nginx.virtualHosts."music.mantis" = {
-    listen = [{ port = 80; addr = "0.0.0.0"; }];
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:4533";
-      proxyWebsockets = true;
-    };
-  };
-  services.transmission = {
-    enable = true;
-    openFirewall = true;
-    openRPCPort = true;
-    group = "torrent";
-    settings = {
-      download-dir = "/torrents";
-      incomplete-dir = "/.incomplete";
-      rpc-bind-address = "0.0.0.0";
-      rpc-whitelist = "127.0.0.1,10.0.0.1,192.168.*.*,100.64.*.*";
-    };
-  };
-  services.nginx.virtualHosts."torrent.mantis" = {
-    listen = [{ port = 80; addr = "0.0.0.0"; }];
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:9091";
-    };
  };
-  services.sonarr = {
+  environment = {
-    enable = true;
+    systemPackages = with pkgs; [
-    openFirewall = true;
+      man-pages
-    group = "torrent";
+      man-pages-posix
-  };
+      (lib.hiPrio pkgs.bashInteractive)
-  services.nginx.virtualHosts."sonarr.mantis" = {
+      _2bwm
-    listen = [{ port = 80; addr = "0.0.0.0"; }];
+    ];
-    locations."/" = {
+    variables = {
-      proxyPass = "http://127.0.0.1:8989";
+      QT_SCALE_FACTOR_ROUNDING_POLICY = "RoundPreferFloor";
+      NIXOS_OZONE_WL = "1";
    };
  };
-  services.radarr = {
+  services = {
-    enable = true;
+    openssh = {
-    openFirewall = true;
+      enable = true;
-    group = "torrent";
+      settings = {
-  };
+        X11Forwarding = true;
-  services.nginx.virtualHosts."radarr.mantis" = {
+        PrintMotd = true;
-    listen = [{ port = 80; addr = "0.0.0.0"; }];
+      };
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:7878";
    };
-  };
+    tailscale.enable = true;
+    libinput.enable = true;
-  services.bazarr = {
+    xserver = {
-    enable = true;
+      enable = true;
-    openFirewall = true;
+      displayManager.startx.enable = true;
-    group = "torrent";
-  };
-  services.nginx.virtualHosts."bazarr.mantis" = {
-    listen = [{ port = 80; addr = "0.0.0.0"; }];
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:6767";
    };
  };
-  services.jackett = {
+  hardware.graphics.extraPackages = [
-    enable = true;
+    pkgs.vpl-gpu-rt
-    openFirewall = true;
+  ];
-    group = "torrent";
-  };
-  services.nginx.virtualHosts."jackett.mantis" = {
-    listen = [{ port = 80; addr = "0.0.0.0"; }];
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:9117";
-    };
-  };
-  services.lidarr = {
+  services.pipewire = {
    enable = true;
-    openFirewall = true;
+    alsa.enable = true;
-    group = "torrent";
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
  };
-  services.nginx.virtualHosts."lidarr.mantis" = {
-    listen = [{ port = 80; addr = "0.0.0.0"; }];
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:8686";
-    };
-  };
-  services.flaresolverr.enable = true;
-  services.radicale = {
-    enable = true;
-    settings = {
-      server.hosts = [ "0.0.0.0:5232" ];
-      auth = {
-        type = "htpasswd";
-        htpasswd_filename = "/etc/radicale/users";
-        htpasswd_encryption = "bcrypt";
-      };
-    };
-  };
-  services.nginx.virtualHosts."radicale.mantis" = {
-    listen = [{ port = 80; addr = "0.0.0.0"; }];
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:5232";
-    };
-  };
+  virtualisation.docker.enable = true;
  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  # Copy the NixOS configuration file and link it from the resulting system
-  # (/run/current-system/configuration.nix). This is useful in case you
-  # accidentally delete configuration.nix.
-  # system.copySystemConfiguration = true;
  # This option defines the first version of NixOS you have installed on this particular machine,
  # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
  #
@@ -229,7 +104,8 @@
  # even if you've upgraded your system to a new NixOS release.
  #
  # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
-  # so changing it will NOT upgrade your system.
+  # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
+  # to actually do that.
  #
  # This value being lower than the current NixOS release does NOT mean your system is
  # out of date, out of support, or vulnerable.
@@ -238,7 +114,7 @@
  # and migrated your data accordingly.
  #
  # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 }
diff --git a/hosts/mantis/hardware-configuration.nix b/hosts/mantis/hardware-configuration.nix
index 6afcb08..bebdb21 100644
--- a/hosts/mantis/hardware-configuration.nix
+++ b/hosts/mantis/hardware-configuration.nix
@@ -9,31 +9,26 @@
      (modulesPath + "/installer/scan/not-detected.nix")
    ];
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
  boot.initrd.kernelModules = [ ];
  boot.kernelModules = [ "kvm-intel" ];
  boot.extraModulePackages = [ ];
  fileSystems."/" =
    {
-      device = "/dev/disk/by-uuid/e3eda8a2-b5fe-4458-988c-48579a7cc6c6";
+      device = "/dev/disk/by-uuid/efd94de4-c3fa-4a3b-98f9-66ccfb8479b9";
-      fsType = "ext4";
-    };
-  fileSystems."/servarr" =
-    {
-      device = "/dev/sdb";
      fsType = "ext4";
    };
  fileSystems."/boot" =
    {
-      device = "/dev/disk/by-uuid/A170-EC57";
+      device = "/dev/disk/by-uuid/5BBB-E6FE";
      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
    };
  swapDevices =
-    [{ device = "/dev/disk/by-uuid/61cb6a91-b916-40b9-b231-c04378629d90"; }];
+    [{ 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
@@ -41,7 +36,6 @@
  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
  networking.useDHCP = lib.mkDefault true;
  # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/hosts/mantis/home.nix b/hosts/mantis/home.nix
new file mode 100644
index 0000000..dfabeed
--- /dev/null
+++ b/hosts/mantis/home.nix
@@ -0,0 +1,103 @@
+{ config
+, pkgs
+, theme
+, self
+, ...
+}:
+{
+  imports = [
+    ../../programs
+    ../../services
+    ../../x
+    # ./mail.nix
+  ];
+  # programs.niri.enable = false;
+  # programs.niri.config = builtins.readFile ./niri-config.kdl;
+  home.stateVersion = "22.11";
+  home.username = "op";
+  home.homeDirectory = "/home/op";
+  home.extraOutputsToInstall = [ "man" ];
+  home.packages = with pkgs; [
+    # essentials
+    vim
+    weechat
+    firefox
+    thunderbird
+    qutebrowser
+    unzip
+    tmux
+    ripgrep
+    miniserve
+    pfetch
+    st
+    rxvt-unicode
+    cmus
+    tree
+    w3m
+    noto-fonts-emoji
+    fd
+    du-dust
+    jq
+    libnotify
+    inotify-tools
+    pavucontrol
+    bc
+    killall
+    signal-desktop
+    alsa-utils
+    wget
+    curl
+    mosh
+    imagemagick
+    ffmpeg-full
+    mpv
+    slop
+    maim
+    arandr
+    # monitoring
+    stress
+    powertop
+    # input
+    xinput_calibrator
+    libinput
+    # wayland stuff
+    xclip
+    # wl-clipboard-rs
+    # swaybg
+    nixpkgs-fmt
+  ] ++ (import ../../scripts { inherit pkgs; });
+  xdg = {
+    userDirs = {
+      enable = true;
+      desktop = "\$HOME/desktop";
+      documents = "\$HOME/docs";
+      download = "\$HOME/dloads";
+      music = "\$HOME/music";
+      pictures = "\$HOME/pics";
+      videos = "\$HOME/vids";
+    };
+  };
+  xsession = {
+    enable = true;
+    windowManager.command = "2bwm";
+    initExtra = ''
+      ${pkgs.hsetroot}/bin/hsetroot -solid "${theme.base00}"
+      xrdb -load $HOME/.Xresources
+    '';
+  };
+}
diff --git a/hosts/mantis/niri-config.kdl b/hosts/mantis/niri-config.kdl
new file mode 100644
index 0000000..c2641e3
--- /dev/null
+++ b/hosts/mantis/niri-config.kdl
@@ -0,0 +1,470 @@
+// This config is in the KDL format: https://kdl.dev
+// "/-" comments out the following node.
+// Check the wiki for a full description of the configuration:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Overview
+// Input device configuration.
+// Find the full list of options on the wiki:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Input
+input {
+    keyboard {
+        xkb {
+            // You can set rules, model, layout, variant and options.
+            // For more information, see xkeyboard-config(7).
+            // For example:
+            // layout "us,ru"
+            // options "grp:win_space_toggle,compose:ralt,ctrl:nocaps"
+        }
+    }
+    // Next sections include libinput settings.
+    // Omitting settings disables them, or leaves them at their default values.
+    touchpad {
+        // off
+        tap
+        // dwt
+        // dwtp
+        natural-scroll
+        // accel-speed 0.2
+        // accel-profile "flat"
+        // scroll-method "two-finger"
+        // disabled-on-external-mouse
+    }
+    mouse {
+        // off
+        // natural-scroll
+        // accel-speed 0.2
+        // accel-profile "flat"
+        // scroll-method "no-scroll"
+    }
+    // Uncomment this to make the mouse warp to the center of newly focused windows.
+    warp-mouse-to-focus
+    // Focus windows and outputs automatically when moving the mouse into them.
+    // focus-follows-mouse
+}
+// You can configure outputs by their name, which you can find
+// by running `niri msg outputs` while inside a niri instance.
+// The built-in laptop monitor is usually called "eDP-1".
+// Find more information on the wiki:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs
+// Remember to uncomment the node by removing "/-"!
+output "DP-1" {
+    // Uncomment this line to disable this output.
+    // off
+    // Resolution and, optionally, refresh rate of the output.
+    // The format is "<width>x<height>" or "<width>x<height>@<refresh rate>".
+    // If the refresh rate is omitted, niri will pick the highest refresh rate
+    // for the resolution.
+    // If the mode is omitted altogether or is invalid, niri will pick one automatically.
+    // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes.
+    // mode "[email protected]"
+    // You can use integer or fractional scale, for example use 1.5 for 150% scale.
+    // scale 2
+    // Transform allows to rotate the output counter-clockwise, valid values are:
+    // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
+    // transform "270"
+    // Position of the output in the global coordinate space.
+    // This affects directional monitor actions like "focus-monitor-left", and cursor movement.
+    // The cursor can only move between directly adjacent outputs.
+    // Output scale and rotation has to be taken into account for positioning:
+    // outputs are sized in logical, or scaled, pixels.
+    // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080,
+    // so to put another output directly adjacent to it on the right, set its x to 1920.
+    // If the position is unset or results in an overlap, the output is instead placed
+    // automatically.
+    // position x=1280 y=0
+}
+// Settings that influence how windows are positioned and sized.
+// Find more information on the wiki:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Layout
+layout {
+    // Set gaps around windows in logical pixels.
+    gaps 24
+    // When to center a column when changing focus, options are:
+    // - "never", default behavior, focusing an off-screen column will keep at the left
+    //   or right edge of the screen.
+    // - "always", the focused column will always be centered.
+    // - "on-overflow", focusing a column will center it if it doesn't fit
+    //   together with the previously focused column.
+    center-focused-column "never"
+    // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between.
+    preset-column-widths {
+        // Proportion sets the width as a fraction of the output width, taking gaps into account.
+        // For example, you can perfectly fit four windows sized "proportion 0.25" on an output.
+        // The default preset widths are 1/3, 1/2 and 2/3 of the output.
+        proportion 0.3333
+        proportion 0.6666
+        proportion 1.0
+        // Fixed sets the width in logical pixels exactly.
+        // fixed 1920
+    }
+    // You can change the default width of the new windows.
+    default-column-width { proportion 0.3333; }
+    // If you leave the brackets empty, the windows themselves will decide their initial width.
+    // default-column-width {}
+    // By default focus ring and border are rendered as a solid background rectangle
+    // behind windows. That is, they will show up through semitransparent windows.
+    // This is because windows using client-side decorations can have an arbitrary shape.
+    //
+    // If you don't like that, you should uncomment `prefer-no-csd` below.
+    // Niri will draw focus ring and border *around* windows that agree to omit their
+    // client-side decorations.
+    //
+    // Alternatively, you can override it with a window rule called
+    // `draw-border-with-background`.
+    // You can change how the focus ring looks.
+    focus-ring {
+        // Uncomment this line to disable the focus ring.
+        off
+        // How many logical pixels the ring extends out from the windows.
+        width 5
+        // Colors can be set in a variety of ways:
+        // - CSS named colors: "red"
+        // - RGB hex: "#rgb", "#rgba", "#rrggbb", "#rrggbbaa"
+        // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others.
+        // Color of the ring on the active monitor.
+        active-color "#555555"
+        // Color of the ring on inactive monitors.
+        inactive-color "#222"
+        // You can also use gradients. They take precedence over solid colors.
+        // Gradients are rendered the same as CSS linear-gradient(angle, from, to).
+        // The angle is the same as in linear-gradient, and is optional,
+        // defaulting to 180 (top-to-bottom gradient).
+        // You can use any CSS linear-gradient tool on the web to set these up.
+        //
+        // active-gradient from="#FF5370" to="#79ffe1" angle=45
+        // You can also color the gradient relative to the entire view
+        // of the workspace, rather than relative to just the window itself.
+        // To do that, set relative-to="workspace-view".
+        //
+        // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
+    }
+    // You can also add a border. It's similar to the focus ring, but always visible.
+    border {
+        // The settings are the same as for the focus ring.
+        // If you enable the border, you probably want to disable the focus ring.
+        // off
+ 
+        width 1.5
+        inactive-color "#333333"
+        active-color "#777777"
+        // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view"
+        // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
+    }
+    // Struts shrink the area occupied by windows, similarly to layer-shell panels.
+    // You can think of them as a kind of outer gaps. They are set in logical pixels.
+    // Left and right struts will cause the next window to the side to always be visible.
+    // Top and bottom struts will simply add outer gaps in addition to the area occupied by
+    // layer-shell panels and regular gaps.
+    struts {
+        left 24
+        right 24
+        // top 64
+        // bottom 64
+    }
+}
+// Add lines like this to spawn processes at startup.
+// Note that running niri as a session supports xdg-desktop-autostart,
+// which may be more convenient to use.
+// See the binds section below for more spawn examples.
+// spawn-at-startup "alacritty" "-e" "fish"
+spawn-at-startup "swaybg" "-i" "/home/op/dloads/leaves3.png" "-m" "tile"
+spawn-at-startup "dunst"
+// Uncomment this line to ask the clients to omit their client-side decorations if possible.
+// If the client will specifically ask for CSD, the request will be honored.
+// Additionally, clients will be informed that they are tiled, removing some rounded corners.
+// prefer-no-csd
+// You can change the path where screenshots are saved.
+// A ~ at the front will be expanded to the home directory.
+// The path is formatted with strftime(3) to give you the screenshot date and time.
+screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
+// You can also set this to null to disable saving screenshots to disk.
+// screenshot-path null
+// Animation settings.
+// The wiki explains how to configure individual animations:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Animations
+animations {
+    // Uncomment to turn off all animations.
+    // off
+    // Slow down all animations by this factor. Values below 1 speed them up instead.
+    // slowdown 3.0
+}
+// Window rules let you adjust behavior for individual windows.
+// Find more information on the wiki:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
+// Work around WezTerm's initial configure bug
+// by setting an empty default-column-width.
+window-rule {
+    // This regular expression is intentionally made as specific as possible,
+    // since this is the default config, and we want no false positives.
+    // You can get away with just app-id="wezterm" if you want.
+    match app-id=r#"^org\.wezfurlong\.wezterm$"#
+    default-column-width {}
+}
+// Example: block out two password managers from screen capture.
+// (This example rule is commented out with a "/-" in front.)
+/-window-rule {
+    match app-id=r#"^org\.keepassxc\.KeePassXC$"#
+    match app-id=r#"^org\.gnome\.World\.Secrets$"#
+    block-out-from "screen-capture"
+    // Use this instead if you want them visible on third-party screenshot tools.
+    // block-out-from "screencast"
+}
+binds {
+    // Keys consist of modifiers separated by + signs, followed by an XKB key name
+    // in the end. To find an XKB name for a particular key, you may use a program
+    // like wev.
+    //
+    // "Mod" is a special modifier equal to Super when running on a TTY, and to Alt
+    // when running as a winit window.
+    //
+    // Most actions that you can bind here can also be invoked programmatically with
+    // `niri msg action do-something`.
+    // Mod-Shift-/, which is usually the same as Mod-?,
+    // shows a list of important hotkeys.
+    Mod+Shift+Slash { show-hotkey-overlay; }
+    // Suggested binds for running programs: terminal, app launcher, screen locker.
+    Mod+Return { spawn "alacritty"; }
+    Mod+D { spawn "rofi" "-show" "combi"; }
+    Super+Alt+L { spawn "swaylock"; }
+    // You can also use a shell. Do this if you need pipes, multiple commands, etc.
+    // Note: the entire command goes as a single argument in the end.
+    // Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; }
+    // Example volume keys mappings for PipeWire & WirePlumber.
+    // The allow-when-locked=true property makes them work even when the session is locked.
+    XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"; }
+    XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; }
+    XF86AudioMute        allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
+    XF86AudioMicMute     allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
+    Mod+Q { close-window; }
+    Mod+Left  { focus-column-left; }
+    Mod+Down  { focus-window-down; }
+    Mod+Up    { focus-window-up; }
+    Mod+Right { focus-column-right; }
+    Mod+H     { focus-column-left; }
+    Mod+N     { focus-window-down; }
+    Mod+E     { focus-window-up; }
+    Mod+I     { focus-column-right; }
+    Mod+Shift+H  { move-column-left; }
+    Mod+Shift+N  { move-window-down; }
+    Mod+Shift+E  { move-window-up; }
+    Mod+Shift+I  { move-column-right; }
+    Mod+Ctrl+Shift+H  { consume-or-expel-window-left; }
+    Mod+Ctrl+Shift+I  { consume-or-expel-window-right; }
+    // Mod+Ctrl+H     { move-column-left; }
+    // Mod+Ctrl+N     { move-window-down; }
+    // Mod+Ctrl+E     { move-window-up; }
+    // Mod+Ctrl+I     { move-column-right; }
+    // Alternative commands that move across workspaces when reaching
+    // the first or last window in a column.
+    // Mod+J     { focus-window-or-workspace-down; }
+    // Mod+K     { focus-window-or-workspace-up; }
+    // Mod+Ctrl+J     { move-window-down-or-to-workspace-down; }
+    // Mod+Ctrl+K     { move-window-up-or-to-workspace-up; }
+    Mod+Shift+6        { focus-column-first; }
+    Mod+Shift+4        { focus-column-last; }
+    Mod+Ctrl+Home { move-column-to-first; }
+    Mod+Ctrl+End  { move-column-to-last; }
+    // Mod+Shift+Left  { focus-monitor-left; }
+    // Mod+Shift+Down  { focus-monitor-down; }
+    // Mod+Shift+Up    { focus-monitor-up; }
+    // Mod+Shift+Right { focus-monitor-right; }
+    // Mod+Shift+H     { focus-monitor-left; }
+    // Mod+Shift+J     { focus-monitor-down; }
+    // Mod+Shift+K     { focus-monitor-up; }
+    // Mod+Shift+L     { focus-monitor-right; }
+    // Mod+Shift+Ctrl+Left  { move-column-to-monitor-left; }
+    // Mod+Shift+Ctrl+Down  { move-column-to-monitor-down; }
+    // Mod+Shift+Ctrl+Up    { move-column-to-monitor-up; }
+    // Mod+Shift+Ctrl+Right { move-column-to-monitor-right; }
+    // Mod+Shift+Ctrl+H     { move-column-to-monitor-left; }
+    // Mod+Shift+Ctrl+J     { move-column-to-monitor-down; }
+    // Mod+Shift+Ctrl+K     { move-column-to-monitor-up; }
+    // Mod+Shift+Ctrl+L     { move-column-to-monitor-right; }
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Shift+Ctrl+Left  { move-window-to-monitor-left; }
+    // ...
+    // And you can also move a whole workspace to another monitor:
+    // Mod+Shift+Ctrl+Left  { move-workspace-to-monitor-left; }
+    // ...
+    // Mod+Page_Down      { focus-workspace-down; }
+    // Mod+Page_Up        { focus-workspace-up; }
+    // Mod+U              { focus-workspace-down; }
+    // Mod+I              { focus-workspace-up; }
+    // Mod+Ctrl+Page_Down { move-column-to-workspace-down; }
+    // Mod+Ctrl+Page_Up   { move-column-to-workspace-up; }
+    // Mod+Ctrl+U         { move-column-to-workspace-down; }
+    // Mod+Ctrl+I         { move-column-to-workspace-up; }
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Ctrl+Page_Down { move-window-to-workspace-down; }
+    // ...
+    // Mod+Shift+Page_Down { move-workspace-down; }
+    // Mod+Shift+Page_Up   { move-workspace-up; }
+    // Mod+Shift+U         { move-workspace-down; }
+    // Mod+Shift+I         { move-workspace-up; }
+    // You can bind mouse wheel scroll ticks using the following syntax.
+    // These binds will change direction based on the natural-scroll setting.
+    //
+    // To avoid scrolling through workspaces really fast, you can use
+    // the cooldown-ms property. The bind will be rate-limited to this value.
+    // You can set a cooldown on any bind, but it's most useful for the wheel.
+    Mod+WheelScrollDown      cooldown-ms=150 { focus-workspace-down; }
+    Mod+WheelScrollUp        cooldown-ms=150 { focus-workspace-up; }
+    Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; }
+    Mod+Ctrl+WheelScrollUp   cooldown-ms=150 { move-column-to-workspace-up; }
+    Mod+WheelScrollRight      { focus-column-right; }
+    Mod+WheelScrollLeft       { focus-column-left; }
+    Mod+Ctrl+WheelScrollRight { move-column-right; }
+    Mod+Ctrl+WheelScrollLeft  { move-column-left; }
+    // Usually scrolling up and down with Shift in applications results in
+    // horizontal scrolling; these binds replicate that.
+    Mod+Shift+WheelScrollDown      { focus-column-right; }
+    Mod+Shift+WheelScrollUp        { focus-column-left; }
+    Mod+Ctrl+Shift+WheelScrollDown { move-column-right; }
+    Mod+Ctrl+Shift+WheelScrollUp   { move-column-left; }
+    // Similarly, you can bind touchpad scroll "ticks".
+    // Touchpad scrolling is continuous, so for these binds it is split into
+    // discrete intervals.
+    // These binds are also affected by touchpad's natural-scroll, so these
+    // example binds are "inverted", since we have natural-scroll enabled for
+    // touchpads by default.
+    // Mod+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; }
+    // Mod+TouchpadScrollUp   { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; }
+    // You can refer to workspaces by index. However, keep in mind that
+    // niri is a dynamic workspace system, so these commands are kind of
+    // "best effort". Trying to refer to a workspace index bigger than
+    // the current workspace count will instead refer to the bottommost
+    // (empty) workspace.
+    //
+    // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on
+    // will all refer to the 3rd workspace.
+    Mod+1 { focus-workspace 1; }
+    Mod+2 { focus-workspace 2; }
+    Mod+3 { focus-workspace 3; }
+    Mod+4 { focus-workspace 4; }
+    Mod+5 { focus-workspace 5; }
+    Mod+6 { focus-workspace 6; }
+    Mod+7 { focus-workspace 7; }
+    Mod+8 { focus-workspace 8; }
+    Mod+9 { focus-workspace 9; }
+    Mod+Ctrl+1 { move-column-to-workspace 1; }
+    Mod+Ctrl+2 { move-column-to-workspace 2; }
+    Mod+Ctrl+3 { move-column-to-workspace 3; }
+    Mod+Ctrl+4 { move-column-to-workspace 4; }
+    Mod+Ctrl+5 { move-column-to-workspace 5; }
+    Mod+Ctrl+6 { move-column-to-workspace 6; }
+    Mod+Ctrl+7 { move-column-to-workspace 7; }
+    Mod+Ctrl+8 { move-column-to-workspace 8; }
+    Mod+Ctrl+9 { move-column-to-workspace 9; }
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Ctrl+1 { move-window-to-workspace 1; }
+    // Switches focus between the current and the previous workspace.
+    // Mod+Tab { focus-workspace-previous; }
+    Mod+Comma  { consume-window-into-column; }
+    Mod+Period  { expel-window-from-column; }
+    // There are also commands that consume or expel a single window to the side.
+    // Mod+BracketLeft  { consume-or-expel-window-left; }
+    // Mod+BracketRight { consume-or-expel-window-right; }
+    Mod+R { switch-preset-column-width; }
+    Mod+Shift+R { reset-window-height; }
+    Mod+F { maximize-column; }
+    Mod+Shift+F { fullscreen-window; }
+    Mod+C { center-column; }
+    // Finer width adjustments.
+    // This command can also:
+    // * set width in pixels: "1000"
+    // * adjust width in pixels: "-5" or "+5"
+    // * set width as a percentage of screen width: "25%"
+    // * adjust width as a percentage of screen width: "-10%" or "+10%"
+    // Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0,
+    // set-column-width "100" will make the column occupy 200 physical screen pixels.
+    Mod+G { set-column-width "+33.333%"; }
+    Mod+Shift+G { set-column-width "-33.333%"; }
+    // Finer height adjustments when in column with other windows.
+    Mod+Shift+Minus { set-window-height "-10%"; }
+    Mod+Shift+Equal { set-window-height "+10%"; }
+    // Actions to switch layouts.
+    // Note: if you uncomment these, make sure you do NOT have
+    // a matching layout switch hotkey configured in xkb options above.
+    // Having both at once on the same hotkey will break the switching,
+    // since it will switch twice upon pressing the hotkey (once by xkb, once by niri).
+    // Mod+Space       { switch-layout "next"; }
+    // Mod+Shift+Space { switch-layout "prev"; }
+    Print { screenshot; }
+    Ctrl+Print { screenshot-screen; }
+    Alt+Print { screenshot-window; }
+    // The quit action will show a confirmation dialog to avoid accidental exits.
+    Mod+Shift+Q { quit; }
+    // Powers off the monitors. To turn them back on, do any input like
+    // moving the mouse or pressing any other key.
+    Mod+Shift+P { power-off-monitors; }
+}
diff --git a/hosts/myrtle/configuration.nix b/hosts/myrtle/configuration.nix
index afec6b7..1f9dc21 100644
--- a/hosts/myrtle/configuration.nix
+++ b/hosts/myrtle/configuration.nix
@@ -94,7 +94,6 @@
  };
  hardware = {
-    opengl.driSupport = true;
    bluetooth = {
      enable = true;
      powerOnBoot = true;
@@ -128,12 +127,12 @@
  };
  services = {
+    libinput.enable = true;
    xserver = {
      enable = true;
      xkb.layout = "us";
      videoDrivers = [ "nvidia" ];
      displayManager.startx.enable = true;
-      libinput.enable = true;
      dpi = 192;
      screenSection = ''
        Option         "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}"
@@ -203,7 +202,7 @@
  '';
  virtualisation.docker.enable = true;
-  virtualisation.virtualbox.host.enable = true;
+  virtualisation.virtualbox.host.enable = false;
  users.extraGroups.vboxusers.members = [ "np" ];
  security.sudo = {
@@ -247,9 +246,9 @@
  };
  nix = {
-    package = pkgs.nixUnstable;
+    package = pkgs.nixVersions.latest;
    extraOptions = ''
-      experimental-features = nix-command flakes repl-flake
+      experimental-features = nix-command flakes
      warn-dirty = false
      keep-outputs = false
      keep-derivations = false
diff --git a/hosts/myrtle/home.nix b/hosts/myrtle/home.nix
new file mode 100644
index 0000000..2529b3e
--- /dev/null
+++ b/hosts/myrtle/home.nix
@@ -0,0 +1,133 @@
+{ config
+, pkgs
+, theme
+, self
+, ...
+}:
+{
+  imports = [
+    ../../programs
+    ../../services
+    ../../x
+    # ./mail.nix
+  ];
+  home.stateVersion = "22.11";
+  home.username = "np";
+  home.homeDirectory = "/home/np";
+  home.extraOutputsToInstall = [ "man" ];
+  home.packages = with pkgs; [
+    # essentials
+    vim
+    weechat
+    firefox
+    qutebrowser
+    unzip
+    tmux
+    xclip
+    ripgrep
+    miniserve
+    pfetch
+    st
+    cmus
+    tree
+    neomutt
+    w3m
+    noto-fonts-emoji
+    fd
+    du-dust
+    jq
+    libnotify
+    inotify-tools
+    pavucontrol
+    bc
+    signal-desktop
+    killall
+    httpie
+    thunderbird
+    calibre
+    gh
+    sonixd
+    # gaming
+    mgba
+    # sync
+    rtorrent
+    lftp
+    wget
+    curl
+    # graphics
+    krita
+    sxiv
+    imagemagick
+    ffmpeg-full
+    mpv
+    slop
+    maim
+    arandr
+    gimp
+    # graphics debug
+    cudatoolkit
+    pciutils
+    # monitoring
+    s-tui
+    nvtopPackages.full
+    lshw
+    stress
+    powertop
+    # input
+    xinput_calibrator
+    libinput
+    # meta
+    nixpkgs-review
+    nixpkgs-fmt
+    nix-prefetch-scripts
+    # work
+    slack
+    zoom-us
+    awscli2
+    kubectl
+  ] ++ (import ../../scripts { inherit pkgs; });
+  home.pointerCursor = {
+    name = "Vanilla-DMZ";
+    package = pkgs.vanilla-dmz;
+    x11.enable = true;
+  };
+  xdg = {
+    userDirs = {
+      enable = true;
+      desktop = "\$HOME/desktop";
+      documents = "\$HOME/docs";
+      download = "\$HOME/dloads";
+      music = "\$HOME/music";
+      pictures = "\$HOME/pics";
+      videos = "\$HOME/vids";
+    };
+  };
+  xsession = {
+    enable = true;
+    windowManager.command = "2bwm";
+    initExtra = ''
+      ${pkgs.hsetroot}/bin/hsetroot -solid "${theme.base00}"
+      xrdb -load $HOME/.Xresources
+      ${pkgs.picom}/bin/picom &
+      xrandr --setprovideroutputsource modesetting NVIDIA-0
+      xrandr --auto
+    '';
+  };
+}
diff --git a/hosts/olive/configuration.nix b/hosts/olive/configuration.nix
deleted file mode 100644
index 3d5d47f..0000000
--- a/hosts/olive/configuration.nix
+++ /dev/null
@@ -1,147 +0,0 @@
-{ config, pkgs, lib, self, ... }:
-{
-  imports =
-    [
-      ./hardware-configuration.nix
-      ../../services/suspend.nix
-    ];
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
-  networking = {
-    hostName = "olive";
-    wireless = {
-      iwd.enable = true;
-      interfaces = [ "wlan0" ];
-      environmentFile = "/home/np/.wireless.env";
-      networks = {
-        Sanic.psk = "@PSK_SANI@";
-        Gopalan.psk = "@PSK_GOPA@";
-        Srividhya.psk = "@PSK_SRIV@";
-        sage.psk = "@PSK_SAGE@";
-      };
-      extraConfig = ''
-        ctrl_interface=/run/wpa_supplicant
-        ctrl_interface_group=wheel
-      '';
-    };
-    useDHCP = false;
-    interfaces.wlan0.useDHCP = true;
-  };
-  networking.nameservers = [ "1.1.1.1" "1.0.0.1" ];
-  i18n.defaultLocale = "en_US.UTF-8";
-  time.timeZone = "Asia/Kolkata";
-  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
-      ];
-    };
-    # for zoom-us
-    allowUnfree = true;
-  };
-  nixpkgs.overlays = with self.overlays; [
-    statix
-    prompt
-  ];
-  environment.systemPackages = with pkgs; [
-    _2bwm
-    man-pages
-    man-pages-posix
-    (lib.hiPrio pkgs.bashInteractive_5)
-  ];
-  documentation = {
-    dev.enable = true;
-    man.generateCaches = true;
-  };
-  users.motd = with config; ''
-    Host       ${networking.hostName}
-    OS         NixOS ${system.nixos.release} (${system.nixos.codeName})
-    Version    ${system.nixos.version}
-    Kernel     ${boot.kernelPackages.kernel.version}
-  '';
-  programs = {
-    light.enable = true;
-    adb.enable = true;
-  };
-  sound.enable = true;
-  hardware = {
-    pulseaudio = {
-      enable = true;
-      package = pkgs.pulseaudioFull;
-      extraConfig = "load-module module-bluetooth-policy auto_switch=2";
-    };
-    bluetooth = {
-      enable = true;
-      powerOnBoot = true;
-    };
-  };
-  # Enable the X11 windowing system.
-  services.xserver = {
-    enable = true;
-    layout = "us";
-    displayManager.startx.enable = true;
-    libinput.enable = true;
-  };
-  services.batteryNotifier = {
-    enable = true;
-    notifyCapacity = 20;
-    suspendCapacity = 10;
-  };
-  services.udev.extraRules = builtins.readFile ./qmk.rules;
-  users.users.np = {
-    isNormalUser = true;
-    home = "/home/np";
-    extraGroups = [ "wheel" "users" "tty" "audio" "video" "input" "adbusers" "docker" ];
-  };
-  nix = {
-    package = pkgs.nixUnstable;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-      warn-dirty = false
-      keep-outputs = false
-      keep-derivations = false
-    '';
-    settings = {
-      trusted-users = [
-        "root"
-        "np"
-      ];
-    };
-  };
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "20.03"; # Did you read the comment?
-}
diff --git a/hosts/olive/hardware-configuration.nix b/hosts/olive/hardware-configuration.nix
deleted file mode 100644
index c2bff39..0000000
--- a/hosts/olive/hardware-configuration.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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, ... }:
-{
-  imports = [
-    "${modulesPath}/installer/scan/not-detected.nix"
-  ];
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usb_storage"
-    "sd_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/27a7c854-e674-411f-9d79-37084922c91d";
-    fsType = "ext4";
-  };
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/882C-54D5";
-    fsType = "vfat";
-  };
-  swapDevices = [ ];
-  nix.settings.max-jobs = lib.mkDefault 8;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-}
diff --git a/hosts/olive/qmk.rules b/hosts/olive/qmk.rules
deleted file mode 100644
index 57806f9..0000000
--- a/hosts/olive/qmk.rules
+++ /dev/null
@@ -1,74 +0,0 @@
-# Atmel DFU
-### ATmega16U2
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2fef", TAG+="uaccess"
-### ATmega32U2
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff0", TAG+="uaccess"
-### ATmega16U4
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff3", TAG+="uaccess"
-### ATmega32U4
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff4", TAG+="uaccess"
-### AT90USB64
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff9", TAG+="uaccess"
-### AT90USB162
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ffa", TAG+="uaccess"
-### AT90USB128
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ffb", TAG+="uaccess"
-# Input Club
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1c11", ATTRS{idProduct}=="b007", TAG+="uaccess"
-# STM32duino
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1eaf", ATTRS{idProduct}=="0003", TAG+="uaccess"
-# STM32 DFU
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", TAG+="uaccess"
-# BootloadHID
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05df", TAG+="uaccess"
-# USBAspLoader
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05dc", TAG+="uaccess"
-# ModemManager should ignore the following devices
-# Atmel SAM-BA (Massdrop)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
-# Caterina (Pro Micro)
-## pid.codes shared PID
-### Keyboardio Atreus 2 Bootloader
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="2302", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
-## Spark Fun Electronics
-### Pro Micro 3V3/8MHz
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9203", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
-### Pro Micro 5V/16MHz
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9205", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
-### LilyPad 3V3/8MHz (and some Pro Micro clones)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9207", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
-## Pololu Electronics
-### A-Star 32U4
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1ffb", ATTRS{idProduct}=="0101", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
-## Arduino SA
-### Leonardo
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0036", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
-### Micro
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0037", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
-## Adafruit Industries LLC
-### Feather 32U4
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000c", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
-### ItsyBitsy 32U4 3V3/8MHz
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000d", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
-### ItsyBitsy 32U4 5V/16MHz
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000e", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
-## dog hunter AG
-### Leonardo
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="2a03", ATTRS{idProduct}=="0036", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
-### Micro
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="2a03", ATTRS{idProduct}=="0037", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
-# hid_listen
-KERNEL=="hidraw*", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl"
-# hid bootloaders
-## QMK HID
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2067", TAG+="uaccess"
-## PJRC's HalfKay
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="0478", TAG+="uaccess"
diff --git a/patches/2bwm/nerd-patch.diff b/patches/2bwm/nerd-patch.diff
index 9e315be..cdb6a00 100644
--- a/patches/2bwm/nerd-patch.diff
+++ b/patches/2bwm/nerd-patch.diff
@@ -8,7 +8,7 @@ index 0985d2e..baa77f8 100644
 ///--Menus and Programs---///
 -static const char *menucmd[]   = { "", NULL };
 +// static const char *menucmd[]   = { "", NULL };
-+static const char *terminal[]   = { "st", NULL };
+static const char *terminal[]   = { "alacritty", NULL };
 +static const char *rofi_run[]   = { "rofi", "-show", "combi" };
 +static const char *rofi_window[]   = { "rofi", "-show", "window" };
 ///--Custom foo---///
diff --git a/programs/alacritty.nix b/programs/alacritty.nix
new file mode 100644
index 0000000..280c667
--- /dev/null
+++ b/programs/alacritty.nix
@@ -0,0 +1,63 @@
+{ config
+, pkgs
+, lib
+, theme
+, font
+, ...
+}:
+let
+  fontConfig = {
+    normal = { family = "${font.name}"; style = "Regular"; };
+    bold = { family = "${font.name}"; style = "Bold"; };
+    italic = { family = "${font.name}"; style = "Italic"; };
+    size = 10.0;
+  };
+in
+{
+  programs.alacritty = {
+    enable = true;
+    settings = {
+      env = {
+        TERM = "xterm-256color";
+      };
+      window = {
+        padding.x = 20;
+        padding.y = 20;
+        dynamic_padding = true;
+        decorations = "None";
+      };
+      font = fontConfig;
+      colors = {
+        primary = {
+          background = "${theme.base00}";
+          foreground = "${theme.base05}";
+        };
+        normal = {
+          black = "${theme.base00}";
+          red = "${theme.base08}";
+          green = "${theme.base0B}";
+          yellow = "${theme.base0A}";
+          blue = "${theme.base0D}";
+          magenta = "${theme.base0E}";
+          cyan = "${theme.base0C}";
+          white = "${theme.base05}";
+        };
+        bright = {
+          black = "${theme.base03}";
+          red = "${theme.base09}";
+          green = "${theme.base01}";
+          yellow = "${theme.base02}";
+          blue = "${theme.base04}";
+          magenta = "${theme.base06}";
+          cyan = "${theme.base0F}";
+          white = "${theme.base07}";
+        };
+      };
+    };
+  };
+}
diff --git a/programs/atuin.nix b/programs/atuin.nix
new file mode 100644
index 0000000..39e5d89
--- /dev/null
+++ b/programs/atuin.nix
@@ -0,0 +1,20 @@
+{
+  programs.atuin = {
+    enable = true;
+    enableBashIntegration = true;
+    flags = [
+      "--disable-up-arrow"
+    ];
+    settings = {
+      invert = true;
+      history_format = "{command}";
+      theme.name = "minimal";
+      style = "compact";
+      inline_height = 15;
+      prefers_reduced_motion = true;
+      show_help = false;
+      show_tabs = false;
+      enter_accept = true;
+    };
+  };
+}
diff --git a/programs/bash.nix b/programs/bash.nix
index 7d3c25e..d4a52f2 100644
--- a/programs/bash.nix
+++ b/programs/bash.nix
@@ -53,27 +53,15 @@
    ];
    sessionVariables = {
+      TERM = "alacritty";
-      PF_INFO = "ascii title os kernel uptime pkgs shell";
-      PF_SEP = " ";
-      PF_COL1 = 7;
-      PF_COL2 = 7;
-      PF_COL3 = 6;
-      PF_ALIGN = "9";
-      PF_ASCII = "nixos";
-      _JAVA_AWT_WM_NONREPARENTING = 1;
-      TERM = "xterm-256color-italic";
      EDITOR = "nvim";
      MANPAGER = "nvim +Man!";
      GPG_TTY = "\$(tty)";
    };
    initExtra = ''
      export PATH=$PATH:"$HOME/scripts"
-      export PROMPT_COMMAND="tmux refresh-client -S > /dev/null";
+      export PROMPT_COMMAND="tmux refresh-client -S &> /dev/null";
      export PS1="\n\001\e[0;36m\002λ\001\e[0m\002 ";
      export PS2="> ";
diff --git a/programs/default.nix b/programs/default.nix
index 70ded22..d7911cc 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -8,6 +8,7 @@
 {
  imports = [
+    ./atuin.nix
    ./bash.nix
    ./chromium.nix
    ./feh.nix
@@ -16,9 +17,11 @@
    ./htop.nix
    ./neovim.nix
    ./readline.nix
+    ./rofi.nix
+    ./alacritty.nix
    ./tmux.nix
    ./zathura.nix
-    ./rofi.nix
+    ./fuzzel.nix
  ];
  programs = {
@@ -48,5 +51,22 @@
    };
    gpg.enable = true;
    info.enable = true;
+    broot = {
+      enable = true;
+      enableBashIntegration = true;
+      settings = {
+        imports = [
+          "native-16.hjson"
+        ];
+        verbs = [
+          {
+            key = "enter";
+            working_dir = "{root}";
+            execution = ''$EDITOR +{line} {file}'';
+            leave_broot = true;
+          }
+        ];
+      };
+    };
  };
 }
diff --git a/programs/fuzzel.nix b/programs/fuzzel.nix
new file mode 100644
index 0000000..8a87911
--- /dev/null
+++ b/programs/fuzzel.nix
@@ -0,0 +1,42 @@
+{ config
+, pkgs
+, theme
+, font
+, ...
+}:
+with theme;
+let
+  fuzzelColor = themeColor: (builtins.replaceStrings [ "#" ] [ "" ] themeColor) + "ff";
+in
+{
+  programs.fuzzel = {
+    enable = true;
+    settings = {
+      main = {
+        font = "${font.name}:size=12";
+        prompt = "";
+        anchor = "top-left";
+        icons-enabled = "no";
+        fields = "filename,exec,name,generic";
+        horizontal-pad = 12;
+        vertical-pad = 12;
+      };
+      colors = {
+        background = "${fuzzelColor theme.base00}";
+        text = "${fuzzelColor theme.base02}";
+        match = "${fuzzelColor theme.base0C}";
+        selection = "${fuzzelColor theme.base00}";
+        selection-text = "${fuzzelColor theme.base05}";
+        selection-match = "${fuzzelColor theme.base0C}";
+        border = "${fuzzelColor theme.base02}";
+      };
+      border = {
+        width = 2;
+        radius = 0;
+      };
+    };
+  };
+}
diff --git a/programs/fzf.nix b/programs/fzf.nix
index 92ee4d0..c1e6bdb 100644
--- a/programs/fzf.nix
+++ b/programs/fzf.nix
@@ -8,6 +8,8 @@
      "--color bw"
      "--no-scrollbar"
      "--no-separator"
+      "--no-unicode"
+      "--pointer '>'"
    ];
    defaultCommand = "rg -L --files";
    changeDirWidgetCommand = "fd --type d";
diff --git a/programs/git.nix b/programs/git.nix
index e4b5e0f..d4fac67 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -19,7 +19,13 @@ with theme;
        syntax-theme = "none";
        zero-style = "8";
        navigate = "true";
+        line-numbers = "true";
        keep-plus-minus-markers = "true";
+        line-numbers-zero-style = "8";
+        line-numbers-left-style = "8";
+        line-numbers-right-style = "8";
+        line-numbers-minus-style = "${base08}";
+        line-numbers-plus-style = "${base0B}";
        decorations = {
          file-decoration-style = "none";
          whitespace-error-style = "22 reverse";
@@ -27,7 +33,7 @@ with theme;
          minus-emph-style = "${base08} bold";
          plus-style = "${base0B}";
          plus-emph-style = "${base0B} bold";
-          file-style = "7 italic";
+          file-style = "7 bold";
          hunk-header-style = "7";
          hunk-header-decoration-style = "8 ul";
        };
@@ -39,11 +45,6 @@ with theme;
        };
      };
    };
-    # difftastic = {
-    #   enable = true;
-    #   background = "dark";
-    #   display = "inline";
-    # };
    aliases = {
      co = "checkout";
      rb = "rebase";
@@ -67,6 +68,7 @@ with theme;
        enabled = true;
        autoUpdate = true;
      };
+      merge.conflictstyle = "diff3";
    };
  };
 }
diff --git a/programs/init.vim b/programs/init.vim
index c62f419..e7a70c1 100644
--- a/programs/init.vim
+++ b/programs/init.vim
@@ -55,6 +55,8 @@ set dir=/tmp
 syntax on
+set nocursorline
+set notermguicolors
 set omnifunc=syntaxcomplete#Complete
 set completefunc=LanguageClient#complete
 set list
@@ -76,6 +78,7 @@ set path+=**
 set backspace=indent,eol,start
 set hidden
 set wildmenu
+set pumheight=8
 set complete=.,w,b,i,u,t,
 set background=dark
 set mouse=a
@@ -83,7 +86,7 @@ set conceallevel=0
 set nonumber
 set grepprg=rg\ --vimgrep\ --no-heading
 set grepformat=%f:%l:%c:%m,%f:%l:%m
-set cmdheight=2
+set cmdheight=1
 set shortmess+=c
 set updatetime=300
 set signcolumn=yes
@@ -97,7 +100,7 @@ let g:netrw_banner=0
 let g:netrw_browsex_viewer="xdg-open"
 let g:netrw_winsize=30
-colorscheme plain
+colorscheme agila
 set shiftwidth=4     " indent = 4 spaces
 set expandtab
@@ -129,35 +132,25 @@ cab bfd bufdo
 " man pages
 let g:ft_man_open_mode = 'tab'
-let g:gitgutter_override_sign_column_highlight = 0
-let g:gitgutter_sign_added                     = '+'
-let g:gitgutter_sign_modified                  = '~'
-let g:gitgutter_sign_removed                   = '-'
-let g:gitgutter_sign_removed_first_line        = '-'
-let g:gitgutter_sign_modified_removed          = '~'
 let g:fzf_colors =
-            \ { 'fg':      ['fg', 'Noise'],
+            \ { 'fg':    ['fg', 'Normal'],
-            \ 'bg':      ['bg', 'Noise'],
+            \ 'bg':      ['bg', 'Normal'],
-            \ 'hl':      ['fg', 'Statement'],
+            \ 'hl':      ['fg', 'Normal'],
-            \ 'fg+':     ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
+            \ 'fg+':     ['fg', 'StatusLine'],
-            \ 'bg+':     ['bg', 'CursorLine', 'CursorColumn'],
+            \ 'bg+':     ['bg', 'Normal'],
-            \ 'hl+':     ['fg', 'Statement'],
+            \ 'hl+':     ['fg', 'Normal'],
+            \ 'gutter':  ['bg', 'Normal'],
            \ 'info':    ['fg', 'PreProc'],
            \ 'border':  ['fg', 'Ignore'],
            \ 'prompt':  ['fg', 'Conditional'],
-            \ 'pointer': ['fg', 'Exception'],
+            \ 'pointer': ['fg', 'Directory'],
            \ 'marker':  ['fg', 'Keyword'],
            \ 'spinner': ['fg', 'Label'],
            \ 'header':  ['fg', 'Comment'] }
 let g:fzf_layout = { 'down': '40%' }
 let g:fzf_preview_window = []
-highlight GitGutterAdd    ctermfg=8
+let g:rustfmt_autosave = 0
-highlight GitGutterChange ctermfg=8
-highlight GitGutterDelete ctermfg=8
-let g:rustfmt_autosave = 1
 let g:latex_view_general_viewer = "zathura"
 let g:vimtex_view_method = "zathura"
@@ -177,4 +170,5 @@ require 'lsp'
 require 'treesitter'
 require 'completions'
 require 'leap'
+require 'clipboard'
 EOF
diff --git a/programs/neovim.nix b/programs/neovim.nix
index 08a1ada..6a09ba4 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -42,7 +42,9 @@
      # syntax
      rust-vim
      haskell-vim
+      typescript-vim
      vim-nix
+      vim-javascript
      # handy
      tabular
diff --git a/programs/readline.nix b/programs/readline.nix
index 8afdd82..c4d5046 100644
--- a/programs/readline.nix
+++ b/programs/readline.nix
@@ -8,6 +8,7 @@
    enable = true;
    bindings = {
      "\\C-o" = ''"tmux-fzf\n"'';
+      "\\C-b" = ''"br\n"'';
      "\\t" = "menu-complete";
      "\\e[Z" = "menu-complete-backward";
    };
diff --git a/programs/rofi.nix b/programs/rofi.nix
index 8ce77bf..b6105fc 100644
--- a/programs/rofi.nix
+++ b/programs/rofi.nix
@@ -35,17 +35,15 @@ let
    inputbar.children = [ "entry" ];
-    element.padding = 10;
    entry = {
-      padding = 10;
      placeholder = "type to filter";
    };
    listview.border = 0;
    scrollbar.handle-width = 0;
    window = {
      padding = 40;
-      width = 800;
+      width = 600;
-      height = 600;
+      height = 400;
      border = mkLiteral "3px solid";
      border-color = mkLiteral theme.base01;
    };
@@ -53,11 +51,12 @@ let
 in
 {
  programs.rofi = {
+    package = pkgs.rofi-wayland;
    enable = true;
-    font = "${font.name} 21";
+    font = "${font.name} 12";
-    location = "top-left";
+    location = "center";
-    xoffset = 20;
+    # xoffset = 40;
-    yoffset = 20;
+    # yoffset = 40;
    cycle = true;
    theme = rofi-theme;
    extraConfig = {
@@ -65,8 +64,8 @@ in
      combi-modes = mkLiteral "[ window, run ]";
      # window = mkLiteral ''{ display-name: "[w]"; }'';
      # run = mkLiteral ''{ display-name: "[r]"; }'';
-      kb-clear-line = "Control+c";
+      # kb-clear-line = "Control+u";
-      kb-remove-word-back = "Control+w";
+      # kb-remove-word-back = "Control+w";
    };
  };
 }
diff --git a/programs/st/config.h b/programs/st/config.h
index c9fca58..d6402f9 100644
--- a/programs/st/config.h
+++ b/programs/st/config.h
@@ -27,7 +27,7 @@ char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
 char *vtiden = "\033[?6c";
 /* Kerning / character bounding-box multipliers */
-static float cwscale = 0.9;
+static float cwscale = 1.0;
 static float chscale = 1.0;
 /*
@@ -46,7 +46,7 @@ int allowaltscreen = 1;
 /* allow certain non-interactive (insecure) window operations such as:
   setting the clipboard text */
-int allowwindowops = 0;
+int allowwindowops = 1;
 /*
 * draw latency range in ms - from new content/keypress/etc until drawing.
diff --git a/programs/tmux.nix b/programs/tmux.nix
index 43778dd..10cbf5f 100644
--- a/programs/tmux.nix
+++ b/programs/tmux.nix
@@ -28,12 +28,15 @@ let
  date-bst = date-tz "Europe/London";
  date-hel = date-tz "Europe/Helsinki";
+  copy = "${pkgs.wl-clipboard-rs}/bin/wl-copy";
+  paste = "${pkgs.wl-clipboard-rs}/bin/wl-paste";
  # plugins
  thumbs = {
    plugin = pkgs.tmuxPlugins.tmux-thumbs;
    extraConfig = ''
      set -g @thumbs-key F
-      set -g @thumbs-command 'echo -n {} | xclip -i -sel p -f | xclip -i -sel c'
+      set -g @thumbs-command 'echo -n {} | ${copy}'
      set -g @thumbs-fg-color white
      set -g @thumbs-hint-bg-color yellow
      set -g @thumbs-hint-fg-color black
@@ -65,7 +68,7 @@ in
    plugins = [ thumbs ];
    prefix = "C-t";
    keyMode = "vi";
-    terminal = "xterm-256color-italic";
+    terminal = "alacritty";
    extraConfig = ''
      bind r source-file ~/.config/tmux/tmux.conf
@@ -112,9 +115,10 @@ in
      bind-key -r ">" swap-window -d -t +1
      bind-key -T copy-mode-vi v send-keys -X begin-selection
-      bind-key -T copy-mode-vi y send-keys -X copy-pipe "xclip -i -sel p -f | xclip -i -sel c "
+      bind-key -T copy-mode-vi y send-keys -X copy-pipe "${copy}"
      bind-key -T copy-mode-vi r send-keys -X rectangle-toggle
-      bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "xclip -i -sel p -f | xclip -i -sel c "
+      bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "${copy}"
+      set -s set-clipboard on
      bind P paste-buffer
      set-window-option -g allow-rename off
@@ -138,7 +142,7 @@ in
      # status left
      set -g  status-left-length 70
      set -g  status-left "#[fg=colour7]#(bat -q)  "
-      set -ag status-left "#[fg=colour15]#(${cmus-np}/bin/cmus-np) #[fg=colour8]#(${cmus-status}/bin/cmus-status)"
+      # set -ag status-left "#[fg=colour15]#(${cmus-np}/bin/cmus-np) #[fg=colour8]#(${cmus-status}/bin/cmus-status)"
      # include pwd and branch in pane border
      set -g pane-border-status top
diff --git a/scripts/battery.nix b/scripts/battery.nix
index 87b6cff..3aed4f9 100644
--- a/scripts/battery.nix
+++ b/scripts/battery.nix
@@ -17,6 +17,12 @@ pkgs.writeScriptBin name
    bat_status=""
    bat_status=$( cat /sys/class/power_supply/BAT0/capacity )
+    if [ -z $bat_status ]; then 
+      echo -ne "#[fg=color2]${symbol} #[fg=colour8]$HOSTNAME"
+      exit 0
+    fi
    charging_status=$( cat /sys/class/power_supply/BAT0/status )
    health() {
diff --git a/scripts/default.nix b/scripts/default.nix
index c7a485c..59b1ca5 100644
--- a/scripts/default.nix
+++ b/scripts/default.nix
@@ -64,6 +64,11 @@ let
    ${pkgs.xorg.xinput}/bin/xinput set-prop "${touchscreen}" --type=float "Coordinate Transformation Matrix" ${portait-transform}
    ${pkgs.xorg.xinput}/bin/xinput set-prop "${stylus}" --type=float "Coordinate Transformation Matrix" ${portait-transform}
  '';
+  portrait2 = pkgs.writeScriptBin "portrait2" ''
+    ${pkgs.xorg.xrandr}/bin/xrandr -o right
+    ${pkgs.xorg.xinput}/bin/xinput set-prop "${touchscreen}" --type=float "Coordinate Transformation Matrix" ${portait-transform}
+    ${pkgs.xorg.xinput}/bin/xinput set-prop "${stylus}" --type=float "Coordinate Transformation Matrix" ${portait-transform}
+  '';
  landscape = pkgs.writeScriptBin "landscape" ''
    ${pkgs.xorg.xrandr}/bin/xrandr -o normal
    ${pkgs.xorg.xinput}/bin/xinput set-prop "${touchscreen}" --type=float "Coordinate Transformation Matrix" ${landscape-transform}
@@ -82,6 +87,7 @@ in
  battery
  tmux-fzf
  portrait
+  portrait2
  landscape
  nvidia-offload
  m2m
diff --git a/scripts/up.nix b/scripts/up.nix
index c4f7c7a..0217b6b 100644
--- a/scripts/up.nix
+++ b/scripts/up.nix
@@ -13,10 +13,10 @@ pkgs.writeScriptBin name
        if [ -f "$1" ]; then
            ext="''${1##*.}"
            id="$id.$ext"
-            scp "$1" ferrn:~/www/nerd/uploads/"$id"
+            scp "$1" kombu:/var/www/uploads/"$id"
-            echo "https://u.peppe.rs/$id"
+            echo "https://cdn.oppi.li/$id"
-            echo "https://u.peppe.rs/$id" | ${xclip} -selection clipboard
+            echo "https://cdn.oppi.li/$id" | ${xclip} -selection clipboard
-            echo "https://u.peppe.rs/$id" | ${xclip} -i
+            echo "https://cdn.oppi.li/$id" | ${xclip} -i
        else
            echo "file does not exist"
        fi
diff --git a/services/default.nix b/services/default.nix
index bef7c85..a45f53a 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -1,6 +1,7 @@
 { config
 , pkgs
 , theme
+, font
 , ...
 }:
@@ -24,5 +25,4 @@
      pinentryPackage = pkgs.pinentry-tty;
    };
  };
 }
diff --git a/services/sxhkd.nix b/services/sxhkd.nix
index d8678af..fab1316 100644
--- a/services/sxhkd.nix
+++ b/services/sxhkd.nix
@@ -10,8 +10,8 @@ let
      ${pkgs.libnotify}/bin/notify-send ${text} -h int:value:${value} -h string:synchronous:volume -h string:hlcolor:"${theme.base0C}"
    '';
  volume = pkgs.writeScriptBin "volume" ''
-    ${pkgs.alsaUtils}/bin/amixer $@
+    ${pkgs.alsa-utils}/bin/amixer $@
-    v=$(${pkgs.alsaUtils}/bin/amixer sget Master | ${pkgs.gawk}/bin/awk -F"[][%]" '/Left:/ {print $2}')
+    v=$(${pkgs.alsa-utils}/bin/amixer sget Master | ${pkgs.gawk}/bin/awk -F"[][%]" '/Left:/ {print $2}')
    ${progress "volume" "$v"}
  '';
@@ -19,14 +19,21 @@ in
 {
  services.sxhkd = {
    enable = true;
-    keybindings = {
+    keybindings =
-      "super + slash" = "${pkgs.light}/bin/light -A 2";
+      let
-      "super + shift + slash" = "${pkgs.light}/bin/light -U 2";
+        vol_up = "${volume}/bin/volume sset Master 2%+";
-      "super + semicolon" = "${volume}/bin/volume sset Master 2%+";
+        vol_down = "${volume}/bin/volume sset Master 2%-";
-      "super + shift + semicolon" = "${volume}/bin/volume sset Master 2%-";
+      in
-      "super + ctrl  + space" = "${pkgs.dunst}/bin/dunstctl close";
+      {
-      "super + shift + space" = "${pkgs.dunst}/bin/dunstctl history-pop";
+        "super + slash" = "${pkgs.light}/bin/light -A 2";
-      "super + ctrl  + shift + space" = "${pkgs.dunst}/bin/dunstctl close-all";
+        "super + shift + slash" = "${pkgs.light}/bin/light -U 2";
-    };
+        "super + semicolon" = vol_up;
+        "super + shift + semicolon" = vol_down;
+        "XF86AudioRaiseVolume" = vol_up;
+        "XF86AudioLowerVolume" = vol_down;
+        "super + ctrl  + space" = "${pkgs.dunst}/bin/dunstctl close";
+        "super + shift + space" = "${pkgs.dunst}/bin/dunstctl history-pop";
+        "super + ctrl  + shift + space" = "${pkgs.dunst}/bin/dunstctl close-all";
+      };
  };
 }
diff --git a/theme/default.nix b/theme/default.nix
index b3af086..7e1108b 100644
--- a/theme/default.nix
+++ b/theme/default.nix
@@ -2,5 +2,7 @@ let
  day = import ./day.nix;
  night = import ./night.nix;
  gruvbox = import ./gruvbox.nix;
+  tomorrow-night = import ./tomorrow-night.nix;
+  material-darker = import ./material-darker.nix;
 in
-night
+material-darker
diff --git a/theme/material-darker.nix b/theme/material-darker.nix
new file mode 100644
index 0000000..ded97fe
--- /dev/null
+++ b/theme/material-darker.nix
@@ -0,0 +1,18 @@
+{
+  base00 = "#111111";
+  base01 = "#202020";
+  base02 = "#242424";
+  base03 = "#393939";
+  base04 = "#4A4A4A";
+  base05 = "#CCCCCC";
+  base06 = "#EEFFFF";
+  base07 = "#FFFFFF";
+  base08 = "#cc6666";
+  base09 = "#de935f";
+  base0A = "#f0c674";
+  base0B = "#b5bd68";
+  base0C = "#8abeb7";
+  base0D = "#81a2be";
+  base0E = "#b294bb";
+  base0F = "#a3685a";
+}
diff --git a/theme/tomorrow-night.nix b/theme/tomorrow-night.nix
new file mode 100644
index 0000000..93552b3
--- /dev/null
+++ b/theme/tomorrow-night.nix
@@ -0,0 +1,18 @@
+{
+  base00 = "#1d1f21";
+  base01 = "#282a2e";
+  base02 = "#373b41";
+  base03 = "#969896";
+  base04 = "#b4b7b4";
+  base05 = "#c5c8c6";
+  base06 = "#e0e0e0";
+  base07 = "#ffffff";
+  base08 = "#cc6666";
+  base09 = "#de935f";
+  base0A = "#f0c674";
+  base0B = "#b5bd68";
+  base0C = "#8abeb7";
+  base0D = "#81a2be";
+  base0E = "#b294bb";
+  base0F = "#a3685a";
+}
diff --git a/x/default.nix b/x/default.nix
index 0b48175..d262ce7 100644
--- a/x/default.nix
+++ b/x/default.nix
@@ -9,6 +9,6 @@
    ./2bwm.nix
    ./xft.nix
    ./rxvt.nix
-    ./xlock.nix
+    # ./xlock.nix
  ];
 }
diff --git a/x/rxvt.nix b/x/rxvt.nix
index b5401ab..98f2ab7 100644
--- a/x/rxvt.nix
+++ b/x/rxvt.nix
@@ -31,9 +31,9 @@ with theme;
    "*color15" = base07;
    "*.cursorBlink" = "on";
-    "URxvt.font" = "xft:${font.name}:size=11:style=Medium";
+    "URxvt.font" = "xft:scientifica:size=11:style=Medium";
-    "URxvt.italicFont" = "xft:${font.name}:size=11:style=Medium";
+    "URxvt.italicFont" = "xft:scientifica:size=11:style=Medium";
-    "URxvt.boldFont" = "xft:${font.name}:size=11:style=Medium";
+    "URxvt.boldFont" = "xft:scientifica:size=11:style=Medium";
    "*font" = "${font.name}:size=11:style=Regular";
    "*italicFont" = "${font.name}:size=11:style=Italic";
    "*boldFont" = "${font.name}:size=11:style=Bold";
diff --git a/x/xft.nix b/x/xft.nix
index 32a1957..5d886bb 100644
--- a/x/xft.nix
+++ b/x/xft.nix
@@ -11,6 +11,6 @@
    "Xft.hintstyle" = "hintslight";
    "Xft.hinting" = true;
    "Xft.rgba" = "rgb";
-    "Xft.dpi" = 192;
+    "Xft.dpi" = 160;
  };
 }