diff --git a/assets/wallpapers/abstract-swirls.jpg b/assets/wallpapers/abstract-swirls.jpg
new file mode 100644
index 0000000..0948796
Binary files /dev/null and b/assets/wallpapers/abstract-swirls.jpg differ
diff --git a/assets/wallpapers/artificial-valley.jpg b/assets/wallpapers/artificial-valley.jpg
new file mode 100644
index 0000000..f6e317b
Binary files /dev/null and b/assets/wallpapers/artificial-valley.jpg differ
diff --git a/assets/wallpapers/asian-village.png b/assets/wallpapers/asian-village.png
new file mode 100644
index 0000000..1ed2b3a
Binary files /dev/null and b/assets/wallpapers/asian-village.png differ
diff --git a/assets/wallpapers/astronaut.png b/assets/wallpapers/astronaut.png
new file mode 100644
index 0000000..0f273fc
Binary files /dev/null and b/assets/wallpapers/astronaut.png differ
diff --git a/assets/wallpapers/atlantis.webp b/assets/wallpapers/atlantis.webp
new file mode 100644
index 0000000..0762f39
Binary files /dev/null and b/assets/wallpapers/atlantis.webp differ
diff --git a/assets/wallpapers/basement.webp b/assets/wallpapers/basement.webp
new file mode 100644
index 0000000..8a9c55b
Binary files /dev/null and b/assets/wallpapers/basement.webp differ
diff --git a/assets/wallpapers/biking-sunset.jpg b/assets/wallpapers/biking-sunset.jpg
new file mode 100644
index 0000000..7b8c2a4
Binary files /dev/null and b/assets/wallpapers/biking-sunset.jpg differ
diff --git a/assets/wallpapers/blue-landscape.png b/assets/wallpapers/blue-landscape.png
new file mode 100644
index 0000000..ce56f4e
Binary files /dev/null and b/assets/wallpapers/blue-landscape.png differ
diff --git a/assets/wallpapers/bsod.webp b/assets/wallpapers/bsod.webp
new file mode 100644
index 0000000..c5ecbc9
Binary files /dev/null and b/assets/wallpapers/bsod.webp differ
diff --git a/assets/wallpapers/c4-spring-sakura-sky.jpg b/assets/wallpapers/c4-spring-sakura-sky.jpg
new file mode 100644
index 0000000..1af672c
Binary files /dev/null and b/assets/wallpapers/c4-spring-sakura-sky.jpg differ
diff --git a/assets/wallpapers/cabin-2.jpg b/assets/wallpapers/cabin-2.jpg
new file mode 100644
index 0000000..2f1ab89
Binary files /dev/null and b/assets/wallpapers/cabin-2.jpg differ
diff --git a/assets/wallpapers/cabin-3.webp b/assets/wallpapers/cabin-3.webp
new file mode 100644
index 0000000..19044e6
Binary files /dev/null and b/assets/wallpapers/cabin-3.webp differ
diff --git a/assets/wallpapers/cabin.webp b/assets/wallpapers/cabin.webp
new file mode 100644
index 0000000..aa41fd9
Binary files /dev/null and b/assets/wallpapers/cabin.webp differ
diff --git a/assets/wallpapers/car-1.png b/assets/wallpapers/car-1.png
new file mode 100644
index 0000000..b58eeb9
Binary files /dev/null and b/assets/wallpapers/car-1.png differ
diff --git a/assets/wallpapers/cartoon-castle.webp b/assets/wallpapers/cartoon-castle.webp
new file mode 100644
index 0000000..aed218c
Binary files /dev/null and b/assets/wallpapers/cartoon-castle.webp differ
diff --git a/assets/wallpapers/castle.png b/assets/wallpapers/castle.png
new file mode 100644
index 0000000..a37f90a
Binary files /dev/null and b/assets/wallpapers/castle.png differ
diff --git a/assets/wallpapers/castle.webp b/assets/wallpapers/castle.webp
new file mode 100644
index 0000000..f113d13
Binary files /dev/null and b/assets/wallpapers/castle.webp differ
diff --git a/assets/wallpapers/city-horizon.jpg b/assets/wallpapers/city-horizon.jpg
new file mode 100644
index 0000000..0836f1d
Binary files /dev/null and b/assets/wallpapers/city-horizon.jpg differ
diff --git a/assets/wallpapers/city-on-water.jpg b/assets/wallpapers/city-on-water.jpg
new file mode 100644
index 0000000..c1caef0
Binary files /dev/null and b/assets/wallpapers/city-on-water.jpg differ
diff --git a/assets/wallpapers/city.png b/assets/wallpapers/city.png
new file mode 100644
index 0000000..a3ffe31
Binary files /dev/null and b/assets/wallpapers/city.png differ
diff --git a/assets/wallpapers/cliff-path.jpg b/assets/wallpapers/cliff-path.jpg
new file mode 100644
index 0000000..68f3e62
Binary files /dev/null and b/assets/wallpapers/cliff-path.jpg differ
diff --git a/assets/wallpapers/coffee-shop.png b/assets/wallpapers/coffee-shop.png
new file mode 100644
index 0000000..0dd858e
Binary files /dev/null and b/assets/wallpapers/coffee-shop.png differ
diff --git a/assets/wallpapers/coffee-shop.webp b/assets/wallpapers/coffee-shop.webp
new file mode 100644
index 0000000..f9ec6d1
Binary files /dev/null and b/assets/wallpapers/coffee-shop.webp differ
diff --git a/assets/wallpapers/cottages-river.png b/assets/wallpapers/cottages-river.png
new file mode 100644
index 0000000..cf345c2
Binary files /dev/null and b/assets/wallpapers/cottages-river.png differ
diff --git a/assets/wallpapers/crane.png b/assets/wallpapers/crane.png
new file mode 100644
index 0000000..0772387
Binary files /dev/null and b/assets/wallpapers/crane.png differ
diff --git a/assets/wallpapers/dark-forest.jpg b/assets/wallpapers/dark-forest.jpg
new file mode 100644
index 0000000..e6a61e7
Binary files /dev/null and b/assets/wallpapers/dark-forest.jpg differ
diff --git a/assets/wallpapers/deer-glade.jpg b/assets/wallpapers/deer-glade.jpg
new file mode 100644
index 0000000..4e06e74
Binary files /dev/null and b/assets/wallpapers/deer-glade.jpg differ
diff --git a/assets/wallpapers/degirled.png b/assets/wallpapers/degirled.png
new file mode 100644
index 0000000..b1a0942
Binary files /dev/null and b/assets/wallpapers/degirled.png differ
diff --git a/assets/wallpapers/desolate-city-2.jpg b/assets/wallpapers/desolate-city-2.jpg
new file mode 100644
index 0000000..ffed9df
Binary files /dev/null and b/assets/wallpapers/desolate-city-2.jpg differ
diff --git a/assets/wallpapers/desolate-city.jpg b/assets/wallpapers/desolate-city.jpg
new file mode 100644
index 0000000..6146b07
Binary files /dev/null and b/assets/wallpapers/desolate-city.jpg differ
diff --git a/assets/wallpapers/diner-lonely-road.jpg b/assets/wallpapers/diner-lonely-road.jpg
new file mode 100644
index 0000000..18c9ddf
Binary files /dev/null and b/assets/wallpapers/diner-lonely-road.jpg differ
diff --git a/assets/wallpapers/dominik-mayer-12.jpg b/assets/wallpapers/dominik-mayer-12.jpg
new file mode 100644
index 0000000..5373c40
Binary files /dev/null and b/assets/wallpapers/dominik-mayer-12.jpg differ
diff --git a/assets/wallpapers/dominik-mayer-15.jpg b/assets/wallpapers/dominik-mayer-15.jpg
new file mode 100644
index 0000000..a40dbd1
Binary files /dev/null and b/assets/wallpapers/dominik-mayer-15.jpg differ
diff --git a/assets/wallpapers/dominik-mayer-17.jpg b/assets/wallpapers/dominik-mayer-17.jpg
new file mode 100644
index 0000000..51902f6
Binary files /dev/null and b/assets/wallpapers/dominik-mayer-17.jpg differ
diff --git a/assets/wallpapers/dominik-mayer-18.png b/assets/wallpapers/dominik-mayer-18.png
new file mode 100644
index 0000000..6d64595
Binary files /dev/null and b/assets/wallpapers/dominik-mayer-18.png differ
diff --git a/assets/wallpapers/dominik-mayer-19.jpg b/assets/wallpapers/dominik-mayer-19.jpg
new file mode 100644
index 0000000..925e0b5
Binary files /dev/null and b/assets/wallpapers/dominik-mayer-19.jpg differ
diff --git a/assets/wallpapers/dominik-mayer-2.jpg b/assets/wallpapers/dominik-mayer-2.jpg
new file mode 100644
index 0000000..8c77b8e
Binary files /dev/null and b/assets/wallpapers/dominik-mayer-2.jpg differ
diff --git a/assets/wallpapers/dominik-mayer-22.jpg b/assets/wallpapers/dominik-mayer-22.jpg
new file mode 100644
index 0000000..14823a7
Binary files /dev/null and b/assets/wallpapers/dominik-mayer-22.jpg differ
diff --git a/assets/wallpapers/dominik-mayer-23.jpg b/assets/wallpapers/dominik-mayer-23.jpg
new file mode 100644
index 0000000..ad2058d
Binary files /dev/null and b/assets/wallpapers/dominik-mayer-23.jpg differ
diff --git a/assets/wallpapers/dominik-mayer-24.jpg b/assets/wallpapers/dominik-mayer-24.jpg
new file mode 100644
index 0000000..c92c0a5
Binary files /dev/null and b/assets/wallpapers/dominik-mayer-24.jpg differ
diff --git a/assets/wallpapers/dominik-mayer-25.jpg b/assets/wallpapers/dominik-mayer-25.jpg
new file mode 100644
index 0000000..1d54f77
Binary files /dev/null and b/assets/wallpapers/dominik-mayer-25.jpg differ
diff --git a/assets/wallpapers/dominik-mayer-4.jpg b/assets/wallpapers/dominik-mayer-4.jpg
new file mode 100644
index 0000000..9f94a58
Binary files /dev/null and b/assets/wallpapers/dominik-mayer-4.jpg differ
diff --git a/assets/wallpapers/dominik-mayer-6.jpg b/assets/wallpapers/dominik-mayer-6.jpg
new file mode 100644
index 0000000..c44f005
Binary files /dev/null and b/assets/wallpapers/dominik-mayer-6.jpg differ
diff --git a/assets/wallpapers/dominik-mayer-8.jpg b/assets/wallpapers/dominik-mayer-8.jpg
new file mode 100644
index 0000000..37e4323
Binary files /dev/null and b/assets/wallpapers/dominik-mayer-8.jpg differ
diff --git a/assets/wallpapers/flower-branch.png b/assets/wallpapers/flower-branch.png
new file mode 100644
index 0000000..5f07136
Binary files /dev/null and b/assets/wallpapers/flower-branch.png differ
diff --git a/assets/wallpapers/flower.jpg b/assets/wallpapers/flower.jpg
new file mode 100644
index 0000000..281de49
Binary files /dev/null and b/assets/wallpapers/flower.jpg differ
diff --git a/assets/wallpapers/greenbus.jpg b/assets/wallpapers/greenbus.jpg
new file mode 100644
index 0000000..db3435c
Binary files /dev/null and b/assets/wallpapers/greenbus.jpg differ
diff --git a/assets/wallpapers/keyboard-2.webp b/assets/wallpapers/keyboard-2.webp
new file mode 100644
index 0000000..ada778b
Binary files /dev/null and b/assets/wallpapers/keyboard-2.webp differ
diff --git a/assets/wallpapers/keyboard.webp b/assets/wallpapers/keyboard.webp
new file mode 100644
index 0000000..82858fc
Binary files /dev/null and b/assets/wallpapers/keyboard.webp differ
diff --git a/assets/wallpapers/knights-template.webp b/assets/wallpapers/knights-template.webp
new file mode 100644
index 0000000..0a0cfc6
Binary files /dev/null and b/assets/wallpapers/knights-template.webp differ
diff --git a/assets/wallpapers/old-computer.webp b/assets/wallpapers/old-computer.webp
new file mode 100644
index 0000000..4503611
Binary files /dev/null and b/assets/wallpapers/old-computer.webp differ
diff --git a/assets/wallpapers/oversized-cat.jpg b/assets/wallpapers/oversized-cat.jpg
new file mode 100644
index 0000000..d73dd74
Binary files /dev/null and b/assets/wallpapers/oversized-cat.jpg differ
diff --git a/assets/wallpapers/passion.webp b/assets/wallpapers/passion.webp
new file mode 100644
index 0000000..2af21fc
Binary files /dev/null and b/assets/wallpapers/passion.webp differ
diff --git a/assets/wallpapers/pixel-car.webp b/assets/wallpapers/pixel-car.webp
new file mode 100644
index 0000000..fa48ce7
Binary files /dev/null and b/assets/wallpapers/pixel-car.webp differ
diff --git a/assets/wallpapers/storm.webp b/assets/wallpapers/storm.webp
new file mode 100644
index 0000000..cb4a686
Binary files /dev/null and b/assets/wallpapers/storm.webp differ
diff --git a/assets/wallpapers/sushi.webp b/assets/wallpapers/sushi.webp
new file mode 100644
index 0000000..bce2e3c
Binary files /dev/null and b/assets/wallpapers/sushi.webp differ
diff --git a/assets/wallpapers/train-sideview.webp b/assets/wallpapers/train-sideview.webp
new file mode 100644
index 0000000..37944d9
Binary files /dev/null and b/assets/wallpapers/train-sideview.webp differ
diff --git a/assets/wallpapers/train-station.webp b/assets/wallpapers/train-station.webp
new file mode 100644
index 0000000..ab9f8ac
Binary files /dev/null and b/assets/wallpapers/train-station.webp differ
diff --git a/assets/wallpapers/windows-xp.webp b/assets/wallpapers/windows-xp.webp
new file mode 100644
index 0000000..e6c3d37
Binary files /dev/null and b/assets/wallpapers/windows-xp.webp differ
diff --git a/modules/features/layers/development.nix b/modules/features/layers/development.nix
index 6050395..47207cf 100644
--- a/modules/features/layers/development.nix
+++ b/modules/features/layers/development.nix
@@ -1,4 +1,4 @@
-{ self, inputs, ... }:
+{ self, inputs, config, ... }:
 {
   flake.nixosModules.development =
     { pkgs, lib, ... }:
@@ -11,11 +11,14 @@
           opencode
           direnv
           nix-direnv
+          htop
         ];
         programs.zoxide = {
           enable = true;
           enableZshIntegration = true;
         };
+        # make ZSH shut up about zshrc
+        hjem.users.${config.username}.files.".zshrc".text = "";
         programs.zsh = {
           enable = true;
 
diff --git a/modules/features/niri.nix b/modules/features/niri.nix
index 2801863..f008870 100644
--- a/modules/features/niri.nix
+++ b/modules/features/niri.nix
@@ -21,6 +21,14 @@
 
         # Set wallpaper destination explicitly
         wallpaper-destinations = [ "Pictures/Wallpapers" ];
+
+        xdg.mime.defaultApplications = {
+          "text/html" = "librewolf";
+          "x-scheme-handler/http" = "librewolf";
+          "x-scheme-handler/https" = "librewolf";
+          "x-scheme-handler/about" = "librewolf";
+          "x-scheme-handler/unknown" = "librewolf";
+        };
       };
     };
 
@@ -41,7 +49,19 @@
           ];
           xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite;
           input.keyboard = {
-            xkb.layout = "us";
+            xkb = {
+              layout = "us";
+              options = "compose:ralt,ctrl:nocaps";
+            };
+          };
+
+          input.touchpad = {
+            tap = {};
+            natural-scroll = {};
+          };
+
+          "output \"eDP-1\"" = {
+            scale = 1.0;
           };
 
           layout = {
@@ -56,7 +76,7 @@
           binds = {
             "Mod+R".spawn-sh = "${lib.getExe self'.packages.myNoctalia} ipc call launcher toggle";
             "Mod+Shift+W".spawn-sh = "librewolf";
-            "Mod+Return".spawn-sh = lib.getExe pkgs.kitty;
+            "Mod+Return".spawn-sh = lib.getExe self'.packages.kitty;
             "Mod+Shift+C".close-window = null;
 
             # workspace binds
@@ -96,6 +116,8 @@
             {
               matches = [
                 { app-id = "zed"; }
+                { app-id = "librewolf"; }
+                { app-id = "vesktop"; }
               ];
               default-column-width = {
                 proportion = 1.0;
diff --git a/modules/hosts/laptop/configuration.nix b/modules/hosts/laptop/configuration.nix
index 5787e06..d62ef5f 100644
--- a/modules/hosts/laptop/configuration.nix
+++ b/modules/hosts/laptop/configuration.nix
@@ -10,7 +10,8 @@
         self.nixosModules.pipewire
         self.nixosModules.development
         self.nixosModules.librewolf
-        self.nixosModules.hyprland
+        #self.nixosModules.hyprland
+        self.nixosModules.niri
         self.nixosModules.user
       ];
 
@@ -47,9 +48,8 @@
         fastfetch
         wget
         git
-        kitty
+        self.packages.${pkgs.stdenv.hostPlatform.system}.kitty
         wofi
-        firefox
         waybar
         wl-clipboard
         ripgrep
@@ -68,6 +68,7 @@
         gimp3
         chatterino7
         mumble
+        vesktop
         (element-desktop.override {
           commandLineArgs = "--password-store=gnome-libsecret";
         })
diff --git a/modules/packages/kitty/default.nix b/modules/packages/kitty/default.nix
new file mode 100644
index 0000000..d89f073
--- /dev/null
+++ b/modules/packages/kitty/default.nix
@@ -0,0 +1,16 @@
+{ self, inputs, ... }:
+{
+  perSystem =
+    { pkgs, ... }:
+    {
+      packages.kitty = pkgs.symlinkJoin {
+        name = "kitty";
+        buildInputs = [ pkgs.makeWrapper ];
+        paths = [ pkgs.kitty ];
+        postBuild = ''
+          wrapProgram $out/bin/kitty \
+            --append-flags "-c ${./kitty.conf}"
+        '';
+      };
+    };
+}
diff --git a/modules/packages/kitty/kitty.conf b/modules/packages/kitty/kitty.conf
new file mode 100644
index 0000000..0c81f27
--- /dev/null
+++ b/modules/packages/kitty/kitty.conf
@@ -0,0 +1,93 @@
+confirm_os_window_close 0
+
+font_family      MartianMono Nerd Font
+bold_font        auto
+italic_font      MartianMono Nerd Font Italic
+bold_italic_font MartianMono Nerd Font Bold Italic
+font_size        12.0
+
+# CATPPUCCIN MOCHA
+# vim:ft=kitty
+
+## name:     Catppuccin Kitty Mocha
+## author:   Catppuccin Org
+## license:  MIT
+## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf
+## blurb:    Soothing pastel theme for the high-spirited!
+
+
+
+# The basic colors
+foreground              #cdd6f4
+background              #1e1e2e
+selection_foreground    #1e1e2e
+selection_background    #f5e0dc
+
+# Cursor colors
+cursor                  #f5e0dc
+cursor_text_color       #1e1e2e
+
+# Scrollbar colors
+scrollbar_handle_color  #9399b2
+scrollbar_track_color   #45475a
+
+# URL color when hovering with mouse
+url_color               #f5e0dc
+
+# Kitty window border colors
+active_border_color     #b4befe
+inactive_border_color   #6c7086
+bell_border_color       #f9e2af
+
+# OS Window titlebar colors
+wayland_titlebar_color system
+macos_titlebar_color system
+
+# Tab bar colors
+active_tab_foreground   #11111b
+active_tab_background   #cba6f7
+inactive_tab_foreground #cdd6f4
+inactive_tab_background #181825
+tab_bar_background      #11111b
+
+# Colors for marks (marked text in the terminal)
+mark1_foreground #1e1e2e
+mark1_background #b4befe
+mark2_foreground #1e1e2e
+mark2_background #cba6f7
+mark3_foreground #1e1e2e
+mark3_background #74c7ec
+
+# The 16 terminal colors
+
+# black
+color0 #45475a
+color8 #585b70
+
+# red
+color1 #f38ba8
+color9 #f38ba8
+
+# green
+color2  #a6e3a1
+color10 #a6e3a1
+
+# yellow
+color3  #f9e2af
+color11 #f9e2af
+
+# blue
+color4  #89b4fa
+color12 #89b4fa
+
+# magenta
+color5  #f5c2e7
+color13 #f5c2e7
+
+# cyan
+color6  #94e2d5
+color14 #94e2d5
+
+# white
+color7  #bac2de
+color15 #a6adc8