fHEADmaster

5 files changed, 61 insertions, 18 deletions

diff --git a/hosts/cloud/sortug/mail.nix b/hosts/cloud/sortug/mail.nix
index 68a960a..443e959 100644
--- a/hosts/cloud/sortug/mail.nix
+++ b/hosts/cloud/sortug/mail.nix
@@ -6,7 +6,7 @@
   # services.dovecot2.sieve.extensions = ["fileinto"];
   mailserver = {
     enable = true;
-    stateVersion = 1;
+    stateVersion = 3;
     fqdn = "mail.sortug.com";
     domains = ["sortug.com" "yago.onl"];
     # workaround
diff --git a/hosts/editors.nix b/hosts/editors.nix
index 78d0fdd..2128d90 100644
--- a/hosts/editors.nix
+++ b/hosts/editors.nix
@@ -7,9 +7,10 @@
   environment.variables.F = "hx";
   environment.systemPackages = with pkgs; [
     neovim
-    #inputs.helix.packages.${pkgs.system}.helix
-    nodePackages.prettier
+    # inputs.helix.packages.${pkgs.system}.helix
     helix
+    # for json formatting on helix
+    nodePackages.prettier
     vscode-langservers-extracted
     nil
     alejandra
diff --git a/hosts/local/master/hardware-configuration.nix b/hosts/local/master/hardware-configuration.nix
index 8439f01..a20ea6e 100644
--- a/hosts/local/master/hardware-configuration.nix
+++ b/hosts/local/master/hardware-configuration.nix
@@ -7,14 +7,12 @@
   pkgs,
   modulesPath,
   ...
-}: let
-  rtl8188gu = config.boot.kernelPackages.callPackage ./rtl8188gu.nix {};
-in {
+}: {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "sd_mod"];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
@@ -30,18 +28,15 @@ in {
     options = ["fmask=0077" "dmask=0077"];
   };
 
+  # fileSystems."/home/y/sata" =
+  #   { device = "/dev/disk/by-uuid/1f689125-e290-4904-9046-f67b51d05c6b";
+  #     fsType = "ext4";
+  #   };
+
   swapDevices = [
     {device = "/dev/disk/by-uuid/e34d7981-458b-462a-b551-007bce4f40f9";}
   ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/hosts/local/master/hw.nix b/hosts/local/master/hw.nix
new file mode 100644
index 0000000..8439f01
--- /dev/null
+++ b/hosts/local/master/hw.nix
@@ -0,0 +1,47 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: let
+  rtl8188gu = config.boot.kernelPackages.callPackage ./rtl8188gu.nix {};
+in {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/3f1343f2-1ba3-4c57-b95e-bb808d3dffd3";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/C676-FD24";
+    fsType = "vfat";
+    options = ["fmask=0077" "dmask=0077"];
+  };
+
+  swapDevices = [
+    {device = "/dev/disk/by-uuid/e34d7981-458b-462a-b551-007bce4f40f9";}
+  ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix
index 1fb5865..bf940f6 100644
--- a/hosts/pkgs.nix
+++ b/hosts/pkgs.nix
@@ -71,7 +71,7 @@
       claude-code
       codex
       nushell
-      # gemini-cli
+      # inputs.gemini-cli.packages.x86_64-linux.default
     ]
     ++ lib.optionals pkgs.stdenv.isLinux [
       # linuxKernel.packages.linux_latest_libre.cpupower
@@ -93,8 +93,8 @@
       appimage-run
       # disk automount
       udiskie
-      nodejs
-      bun
+      # nodejs
+      # bun
       # /mac
     ]
     ++ lib.optionals pkgs.stdenv.isDarwin [