home/desktop/default.nix

@@ -1,17 +1,8 @@
-{ pkgs, zen-browser, ... }:
+{ zen-browser, ... }:
 {
-
-  home.packages = [
-    pkgs.adwaita-icon-theme
-    pkgs.brightnessctl
-    pkgs.pamixer
-    pkgs.rofi-wayland
-    pkgs.wtype
-  ];
-
   imports = [
     zen-browser.homeModules.beta
-    ./hyprland
+    ./hypr
   ];
 
   programs.zen-browser = {

home/desktop/hypr/default.nix

@@ -1,75 +1,24 @@
-{ ... }:
+{ pkgs, ... }:
 {
+  home.packages = [
+    pkgs.wtype
+    pkgs.rofi-wayland
+    pkgs.brightnessctl
+    pkgs.pamixer
+  ];
+
   programs.kitty.enable = true;
 
   wayland.windowManager.hyprland = {
     enable = true;
-
     settings = {
 
-      misc = {
+      monitor = [ ",preferred,auto,1.2" ];
-        disable_hyprland_logo = true;
-        background_color = "0x2E3440";
-      };
 
-      general = {
+      xwayland.force_zero_scaling = true;
-        border_size = 2;
-        "col.active_border" = "0xFF81A1C1";
-        "col.inactive_border" = "0xFF677691";
-      };
-
-      decoration = {
-        rounding = 15;
-        inactive_opacity = 0.75;
-        blur.enabled = false;
-        shadow.enabled = false;
-        border_part_of_window = true;
-      };
-
-      # The animations is taken from Omarchy, see:
-      # https://github.com/basecamp/omarchy/blob/master/default/hypr/looknfeel.conf
-      animations = {
-        enabled = true;
-
-        bezier = [
-          "easeOutQuint,0.23,1,0.32,1"
-          "easeInOutCubic,0.65,0.05,0.36,1"
-          "linear,0,0,1,1"
-          "almostLinear,0.5,0.5,0.75,1.0"
-          "quick,0.15,0,0.1,1"
-        ];
-
-        animation = [
-          "global, 1, 10, default"
-          "border, 1, 5.39, easeOutQuint"
-          "windows, 1, 4.79, easeOutQuint"
-          "windowsIn, 1, 4.1, easeOutQuint, popin 87%"
-          "windowsOut, 1, 1.49, linear, popin 87%"
-          "fadeIn, 1, 1.73, almostLinear"
-          "fadeOut, 1, 1.46, almostLinear"
-          "fade, 1, 3.03, quick"
-          "layers, 1, 3.81, easeOutQuint"
-          "layersIn, 1, 4, easeOutQuint, fade"
-          "layersOut, 1, 1.5, linear, fade"
-          "fadeLayersIn, 1, 1.79, almostLinear"
-          "fadeLayersOut, 1, 1.39, almostLinear"
-          "workspaces, 0, 0, ease"
-        ];
-      };
-
-      monitor = [ ",preferred,auto,1" ];
 
       gestures.workspace_swipe = true;
 
-      cursor = {
-        enable_hyprcursor = false;
-      };
-
-      env = [
-        "XCURSOR_THEME,Adwaita"
-        "XCURSOR_SIZE,24"
-      ];
-
       input = {
         kb_options = "altwin:swap_alt_win";
 

home/fonts/default.nix

@@ -2,7 +2,7 @@
 with pkgs;
 [
   iosevka
-  nerd-fonts.sauce-code-pro
   source-sans
+  source-code-pro
   source-serif
 ]

hosts/thinkpad/keyboard.nix

@@ -1,12 +1,4 @@
-{ pkgs, ... }:
 {
-
-  # Disable internal keyboard when external (Voyager) is connected
-  services.udev.extraRules = ''
-    ACTION=="add",    SUBSYSTEM=="input", KERNEL=="event*", ENV{DEVLINKS}=="*usb-ZSA_Technology_Labs_Voyager-event-kbd*", RUN+="${pkgs.kmod}/bin/modprobe -r atkbd"
-    ACTION=="remove", SUBSYSTEM=="input", KERNEL=="event*", ENV{DEVLINKS}=="*usb-ZSA_Technology_Labs_Voyager-event-kbd*", RUN+="${pkgs.kmod}/bin/modprobe atkbd"
-  '';
-
   services.kanata = {
     enable = true;
     keyboards = {

system/nixos/default.nix

@@ -1,17 +1,6 @@
 { pkgs, ... }:
 {
-
+  fonts.packages = import ../../home/fonts { inherit pkgs; };
-  fonts = {
-    packages = import ../../home/fonts { inherit pkgs; };
-    fontconfig = {
-      enable = true;
-      defaultFonts = {
-        serif = [ "Source Serif 4" ];
-        sansSerif = [ "Source Sans 3" ];
-        monospace = [ "SauceCodePro Nerd Font" ];
-      };
-    };
-  };
 
   programs.fish.enable = true;
   environment.shells = [ pkgs.fish ];