Squash merge modularization into main

hosts/doloro-laptop/home.nix

@@ -6,39 +6,27 @@
   ...
 }:
 {
-  # 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;
+    kitty.enable = true;
     helix.enable = false;
     stylix.enable = true;
     tmux.enable = true;
     theme.enable = true;
-    obs.enable = true;
-    blender.enable = true;
-    bottles.enable = true;
+    obs = {
+      enable = true;
+      autostart = false;
+    };
+    blender.enable = false;
+    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 +49,16 @@
     };
   };
   xdg.mimeApps.enable = true;
+  wayland.windowManager.hyprland.settings = {
+    monitor = [
+      "eDP-1, 2880x1800@120, 0x0, 2"
+    ];
+    input = {
+      kb_layout = "gb";
+      follow_mouse = 2;
+      sensitivity = 0;
+    };
+  };
 
   # 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 +76,6 @@
     vim
     telegram-desktop
     vesktop
-    # (pkgs.discord.override { withVencord = true; })
-    # webcord-vencord
-    # spotify
     pavucontrol
     lazygit
     btop

hosts/doloro-laptop/laptop.nix

@@ -0,0 +1,38 @@
+{ pkgs, lib, ... }:
+let
+
+in
+{
+  services.tlp = {
+    enable = true;
+    settings = {
+      CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+      PCIE_ASPM_ON_BAT = "powersave";
+      CPU_SCALING_GOVERNOR_ON_AC = "balanced";
+      PCIE_ASPM_ON_AC = "balanced";
+      START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge
+      STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
+    };
+  };
+  # services.tuned.enable = true;
+  services.thermald.enable = true;
+  services.upower = {
+    enable = true;
+  };
+  # boot.kernelParams = [ "mem_sleep_default=deep" ];
+  services.logind.settings.Login = {
+    HandleLidSwitch = "suspend-then-hibernate";
+    HandleLidSwitchExternalPower = "ignore";
+    HandleLidSwitchDocked = "ignore";
+  };
+  systemd.sleep.extraConfig = ''
+        HibernateDelaySec=30min
+    		SuspendEstimationSec=120
+  '';
+
+  # one of "ignore", "poweroff", "reboot", "halt", "kexec", "suspend", "hibernate", "hybrid-sleep", "suspend-then-hibernate", "lock"
+  powerManagement = {
+    enable = true;
+    powertop.enable = true;
+  };
+}

hosts/doloro-laptop/nixos.nix

@@ -16,6 +16,7 @@ in
 {
   imports = [
     inputs.sops-nix.nixosModules.sops
+    ./laptop.nix
   ];
   modules = {
     fish.enable = true;
@@ -24,11 +25,12 @@ 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;
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelPackages = pkgs.linuxPackages_6_12; # Hibernate works on 6.12 but not on latest
 
   networking.hostName = "doloro-nixos-laptop"; # Define your hostname.
   security.rtkit.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,11 @@ in
   };
   hardware.graphics = {
     enable = true;
+    extraPackages = with pkgs; [
+      intel-media-driver # VA-API (iHD) userspace
+      # vpl-gpu-rt # oneVPL (QSV) runtime
+      intel-compute-runtime # OpenCL (NEO) + Level Zero for Arc/Xe
+    ];
   };
   services.openssh = {
     enable = true;
@@ -70,9 +78,6 @@ in
   users.users.root.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBaa6Z5qtBSLEz+A4fQGYPfkOISsRQlmKkVbcx2zxML7"
   ];
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
   # Select internationalisation properties.
   # i18n.defaultLocale = "en_US.UTF-8";
@@ -85,17 +90,6 @@ in
   # Enable the X11 windowing system.
   services.xserver.enable = true;
 
-  # Configure keymap in X11
-  # services.xserver.xkb.layout = "us";
-  # services.xserver.xkb.options = "eurosign:e,caps:escape";
-
-  # Enable CUPS to print documents.
-  # services.printing.enable = true;
-
-  # Enable sound.
-  # services.pulseaudio.enable = true;
-  # OR
-
   sops = {
     defaultSopsFile = builtins.toPath "${nix-meow.flakeRoot}/secrets/users.yaml";
     secrets = {
@@ -107,6 +101,7 @@ in
       };
     };
   };
+
   services.pipewire = {
     enable = true;
     pulse.enable = true;
@@ -122,9 +117,13 @@ in
     packages = with pkgs; [
       tree
     ];
-    # initialPassword = "sex";
     hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path;
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBaa6Z5qtBSLEz+A4fQGYPfkOISsRQlmKkVbcx2zxML7" # pc public key
+    ];
+    # initialPassword = "sex";
   };
+  users.mutableUsers = false;
 
   # programs.firefox.enable = true;