bunch of walls, wrap kitty, touch zshrc

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;
 

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;

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";
         })

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}"
+        '';
+      };
+    };
+}

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