wip: various changes to modularization and laptop

hosts/doloro-laptop/home.nix

@@ -6,39 +6,23 @@
   ...
 }:
 {
-  # imports = [
-  #   ../../modules/hyprland/home.nix
-  #   ../../modules/quickshell/home.nix
-  #   ../../modules/chromium/home.nix
-  #   #./modules/neovim/home.nix
-  #   ../../modules/stylix/home.nix
-  #   ../../modules/nixvim/home.nix
-  #   ../../modules/tmux/home.nix
-  #   ../../modules/theme/home.nix
-  #   # ./modules/spicetify/home.nix
-  #   ../../modules/obs/home.nix
-  #   ../../modules/blender/home.nix
-  #   ../../modules/fish/home.nix
-  #   ../../modules/ytm/home.nix
-  #   ../../overlays.nix
-  # ];
   modules = {
     Hyprland.enable = true;
     quickshell.enable = true;
     # chromium.enable = true;
-    wivrn.enable = true;
+    wivrn.enable = false;
     helium.enable = true;
     nixvim.enable = true;
     helix.enable = false;
     stylix.enable = true;
     tmux.enable = true;
     theme.enable = true;
-    obs.enable = true;
+    obs.enable = false;
-    blender.enable = true;
+    blender.enable = false;
-    bottles.enable = true;
+    bottles.enable = false;
     fish.enable = true;
     youtube-music.enable = true;
-    unityhub.enable = true;
+    unityhub.enable = false;
     direnv.enable = true;
     git.enable = true;
     rsRPC.enable = true;
@@ -61,6 +45,12 @@
     };
   };
   xdg.mimeApps.enable = true;
+  wayland.windowManager.hyprland.settings = {
+    monitor = [
+      "HDMI-A-1, 1920x1080@60, 0x0, 1"
+      "DP-3, 1920x1080@144, 1920x0, 1"
+    ];
+  };
 
   # This value determines the Home Manager release that your configuration is
   # compatible with. This helps avoid breakage when a new Home Manager release
@@ -78,9 +68,6 @@
     vim
     telegram-desktop
     vesktop
-    # (pkgs.discord.override { withVencord = true; })
-    # webcord-vencord
-    # spotify
     pavucontrol
     lazygit
     btop

hosts/doloro-laptop/laptop.nix

@@ -0,0 +1,29 @@
+{ ... }:
+{
+  services.tlp = {
+    enable = true;
+    extraConfig = ''
+      CPU_SCALING_GOVERNOR_ON_BAT=power_save
+      CPU_SCALING_GOVERNOR_ON_AC=performance
+      PCIE_ASPM_ON_AC=performance
+      PCIE_ASPM_ON_BAT=powersave
+    '';
+    settings = {
+      START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge
+      STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
+    };
+  };
+  powerManagement.powertop.enable = true;
+  services.thermald.enable = true;
+  services.upower = {
+    enable = true;
+  };
+  services.logind.extraConfig = {
+    HandlePowerKey = "hibernate"; # Hibernate when the power button is pressed
+    HandleLidSwitch = "hibernate"; # Hibernate when the lid is closed
+  };
+  systemd.sleep = {
+    hibernate = true;
+    hybridSleep = true;
+  };
+}

hosts/doloro-laptop/nixos.nix

@@ -16,6 +16,7 @@ in
 {
   imports = [
     inputs.sops-nix.nixosModules.sops
+    ./laptop.nix
   ];
   modules = {
     fish.enable = true;
@@ -24,6 +25,7 @@ in
     steam.enable = false;
     Hyprland.enable = true;
     wivrn.enable = false;
+    fonts.enable = true;
   };
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
@@ -37,7 +39,8 @@ in
   networking.networkmanager.enable = true;
 
   # Set your time zone.
-  time.timeZone = "Europe/London";
+  # time.timeZone = "Europe/London";
+  services.automatic-timezoned.enable = true;
 
   nix.settings = {
     substituters = [
@@ -59,6 +62,16 @@ in
   };
   hardware.graphics = {
     enable = true;
+    extraPackages = with pkgs; [
+      # Required for modern Intel GPUs (Xe iGPU and ARC)
+      intel-media-driver # VA-API (iHD) userspace
+      vpl-gpu-rt # oneVPL (QSV) runtime
+
+      # Optional (compute / tooling):
+      intel-compute-runtime # OpenCL (NEO) + Level Zero for Arc/Xe
+      # NOTE: 'intel-ocl' also exists as a legacy package; not recommended for Arc/Xe.
+      # libvdpau-va-gl       # Only if you must run VDPAU-only apps
+    ];
   };
   services.openssh = {
     enable = true;

hosts/doloro/home.nix

@@ -48,6 +48,19 @@
   home.username = "doloro";
   home.homeDirectory = "/home/doloro";
 
+  wayland.windowManager.hyprland.settings = {
+    monitor = [
+      "HDMI-A-1, 1920x1080@60, 0x0, 1"
+      "DP-3, 1920x1080@144, 1920x0, 1"
+    ];
+    exec-once = [
+      "hyprctl dispatch workspace 2" # shit solution to get quickshell on the right monitor
+    ];
+  };
+  workspace = [
+    "name:2, monitor:DP-3"
+  ];
+
   services = {
     gpg-agent = {
       enable = true;
@@ -89,39 +102,6 @@
     gcr
     qbittorrent
   ];
-  # sops.age.keyFile = "/home/doloro/.config/sops/age/key.txt";
-
-  # Home Manager is pretty good at managing dotfiles. The primary way to manage
-  # plain files is through 'home.file'.
-  home.file = {
-    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
-    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
-    # # symlink to the Nix store copy.
-    # ".screenrc".source = dotfiles/screenrc;
-
-    # # You can also set the file content immediately.
-    # ".gradle/gradle.properties".text = ''
-    #   org.gradle.console=verbose
-    #   org.gradle.daemon.idletimeout=3600000
-    # '';
-  };
-
-  # Home Manager can also manage your environment variables through
-  # 'home.sessionVariables'. These will be explicitly sourced when using a
-  # shell provided by Home Manager. If you don't want to manage your shell
-  # through Home Manager then you have to manually source 'hm-session-vars.sh'
-  # located at either
-  #
-  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  /etc/profiles/per-user/doloro/etc/profile.d/hm-session-vars.sh
-  #
   home.sessionVariables = {
     EDITOR = "nvim";
   };
@@ -130,8 +110,8 @@
       enable = true;
     };
   };
+
   xdg.configFile."mimeapps.list".force = true;
-  # Let Home Manager install and manage itself.
 
   programs = {
     ssh = {

hosts/doloro/nixos.nix

@@ -24,6 +24,7 @@ in
     steam.enable = true;
     Hyprland.enable = true;
     wivrn.enable = true;
+    fonts.enable = true;
   };
 
   # Use the systemd-boot EFI boot loader.
@@ -174,29 +175,29 @@ in
     package = config.boot.kernelPackages.nvidiaPackages.latest;
   };
 
-  fonts = {
+  # fonts = {
-    enableDefaultPackages = true;
+  #   enableDefaultPackages = true;
-    packages =
+  #   packages =
-      with pkgs;
+  #     with pkgs;
-      [
+  #     [
-        nerd-fonts.jetbrains-mono
+  #       nerd-fonts.jetbrains-mono
-        material-design-icons
+  #       material-design-icons
-        material-symbols
+  #       material-symbols
-        googlesans-code
+  #       googlesans-code
-        nerd-fonts.caskaydia-cove
+  #       nerd-fonts.caskaydia-cove
-        nerd-fonts.noto
+  #       nerd-fonts.noto
-        noto-fonts-cjk-sans
+  #       noto-fonts-cjk-sans
-        noto-fonts-cjk-serif
+  #       noto-fonts-cjk-serif
-      ]
+  #     ]
-      ++ [
+  #     ++ [
-        (inputs.font-patcher.lib.patchFont {
+  #       (inputs.font-patcher.lib.patchFont {
-          font = "${pkgs.googlesans-code}/share/fonts/googlesans-code/GoogleSansCode[wght].ttf";
+  #         font = "${pkgs.googlesans-code}/share/fonts/googlesans-code/GoogleSansCode[wght].ttf";
-          name = "Google Sans Code Nerd Font";
+  #         name = "Google Sans Code Nerd Font";
-          inherit system;
+  #         inherit system;
-        })
+  #       })
-      ];
+  #     ];
-    fontDir.enable = true;
+  #   fontDir.enable = true;
-  };
+  # };
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
   programs.nix-ld.enable = true;
   programs.nix-ld.libraries = with pkgs; [

modules/fonts/nixos.nix

@@ -0,0 +1,38 @@
+{
+  inputs,
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+let
+  cfg = config.modules.fonts;
+in
+{
+  options.modules.fonts = {
+    enable = lib.mkEnableOption "fonts";
+  };
+  config.fonts = lib.mkIf cfg.enable {
+    enableDefaultPackages = true;
+    packages =
+      with pkgs;
+      [
+        nerd-fonts.jetbrains-mono
+        material-design-icons
+        material-symbols
+        googlesans-code
+        nerd-fonts.caskaydia-cove
+        nerd-fonts.noto
+        noto-fonts-cjk-sans
+        noto-fonts-cjk-serif
+      ]
+      ++ [
+        (inputs.font-patcher.lib.patchFont {
+          font = "${pkgs.googlesans-code}/share/fonts/googlesans-code/GoogleSansCode[wght].ttf";
+          name = "Google Sans Code Nerd Font";
+          inherit system;
+        })
+      ];
+    fontDir.enable = true;
+  };
+}

modules/hyprland/settings.nix

@@ -11,13 +11,6 @@
     hyprcursor.enable = true;
   };
   wayland.windowManager.hyprland.settings = {
-    monitor = [
-      "HDMI-A-1, 1920x1080@60, 0x0, 1"
-      "DP-3, 1920x1080@144, 1920x0, 1"
-    ];
-    exec-once = [
-      "hyprctl dispatch workspace 2" # shit solution to get quickshell on the right monitor
-    ];
     env = [
       "XCURSOR_THEME,BreezeX-RosePine-Linux"
       "XCURSOR_SIZE,24"