cleanup

etcnixos/common.nix

@@ -13,37 +13,32 @@
     ./declarative-nm.nix
 
     inputs.nixos-hardware.nixosModules.common-pc-ssd
-
   ];
 
   nix = {
-    #garbage collection and cleanup stuff
+    # garbage collection and cleanup stuff
     gc = {
       automatic = true;
       dates = "weekly";
       options = "--delete-older-than 7d";
     };
 
-    #optimize the store
+    # optimize the store
     optimise.automatic = true;
 
-    #enable flakes!
+    # enable flakes!
     settings.experimental-features = [
       "nix-command"
       "flakes"
     ];
   };
 
-  #kernel options
+  # kernel options
   boot = {
     kernelPackages = pkgs.linuxPackages_cachyos-lto;
 
     kernel.sysctl = {
-      #for profiling
+      # dmesg shushhhhh
-      "kernel.perf_event_paranoid" = 1;
-      "kernel.kptr_restrict" = 0;
-
-      #dmesg shushhhhh
       "kernel.printk" = "2 4 1 7";
     };
 
@@ -61,18 +56,18 @@
   };
 
   environment.etc = {
-    #override default nixos /etc/issue
+    # override default nixos /etc/issue
     "issue".text = "";
   };
 
   services = {
-    #fwupd for updating firmware
+    # fwupd for updating firmware
     fwupd = {
       enable = true;
       extraRemotes = [ "lvfs-testing" ];
     };
 
-    #auto detect network printers
+    # auto detect network printers
     avahi = {
       enable = true;
       nssmdns4 = true;
@@ -85,10 +80,10 @@
       drivers = with pkgs; [ hplip ];
     };
 
-    #disable fprintd (doesn't compile, idk)
+    # disable fprintd (doesn't compile, idk)
     fprintd.enable = false;
 
-    #Making sure mullvad works on boot
+    # Making sure mullvad works on boot
     mullvad-vpn.enable = true;
   };
 
@@ -96,7 +91,7 @@
   time.timeZone = "America/New_York";
 
   security = {
-    #lets use doas and not sudo!
+    # lets use doas and not sudo!
     doas.enable = true;
     sudo.enable = false;
     # Configure doas
@@ -111,12 +106,7 @@
 
   age.identityPaths = [ "/home/${username}/.ssh/id_ed25519" ];
 
-  age.secrets.primary-password = {
+  # networking
-    file = ./secrets/primary-password.age;
-    path = "/etc/secrets/primary-password";
-  };
-
-  #networking
   networking = import ./networking.nix { inherit hostname; };
 
   # Select internationalisation properties.
@@ -139,11 +129,11 @@
     enable = true;
     powerOnBoot = true;
 
-    #Enable experimental features for battery % of bluetooth devices
+    # Enable experimental features for battery % of bluetooth devices
     settings.General.Experimental = true;
   };
 
-  #apply gtk themes by enabling dconf
+  # Apply gtk themes by enabling dconf
   programs.dconf.enable = true;
 
   # Enable sound with pipewire.
@@ -154,8 +144,11 @@
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
+  };
-    # jack.enable = true;
+
+  age.secrets.primary-password = {
+    file = ./secrets/primary-password.age;
+    path = "/etc/secrets/primary-password";
   };
 
   # Define my user account (the rest of the configuration if found in `~/.config/home-manager/...`)
@@ -192,7 +185,7 @@
     extraCompatPackages = with pkgs; [ proton-ge-bin ];
   };
 
-  #System packages
+  # System packages
   environment.systemPackages = with pkgs; [
     mullvad-vpn
 

etcnixos/flake.lock

@@ -392,11 +392,11 @@
     },
     "wivrn": {
       "locked": {
-        "lastModified": 1729402130,
+        "lastModified": 1729405003,
         "narHash": "sha256-V9ZdbZ2iFVsN2AF/aJmSiRDp9rU5HYeQX+1NBYcKJzQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a2922fae7ea92ee5c3ddb5999ee1997c699d87f8",
+        "rev": "414c84c95aab19cb7dc603f0139d6dea2bc9f053",
         "type": "github"
       },
       "original": {

etcnixos/networking.nix

@@ -2,14 +2,14 @@
 {
   hostName = hostname;
 
-  hostId = "cfe0ff46";
-
   networkmanager = {
     enable = true;
+
     insertNameservers = [
       "1.1.1.1"
       "9.9.9.9"
     ];
+
     wifi = {
       scanRandMacAddress = true;
     };

etcnixos/system-mreow.nix

@@ -12,7 +12,6 @@
     ./hardware_laptop.nix
 
     inputs.nixos-hardware.nixosModules.framework-12th-gen-intel
-    inputs.nixos-hardware.nixosModules.common-pc-ssd
     inputs.lanzaboote.nixosModules.lanzaboote
   ];
 

etcnixos/system-nixos.nix

@@ -18,9 +18,6 @@
   ];
 
   boot = {
-    # kernelPackages = lib.mkForce pkgs.linuxPackages_6_10;
-    # supportedFilesystems = [ "zfs" ];
-
     kernelParams = [
       # allow overclocking (I actually underclock but lol)
       "amdgpu.ppfeaturemask=0xFFF7FFFF"
@@ -34,14 +31,16 @@
 
   services.xserver.enable = false;
   services.desktopManager.plasma6.enable = true;
-  services.displayManager.sddm = {
+  services.displayManager = {
+    sddm = {
       enable = true;
       wayland.enable = true;
     };
 
-  services.displayManager.autoLogin = {
+    autoLogin = {
       enable = true;
-    user = "primary";
+      user = username;
+    };
   };
 
   services.openssh = {
@@ -60,6 +59,7 @@
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
   };
 
+  # LACT (Linux AMDGPU Configuration Tool): https://github.com/ilya-zlobintsev/LACT
   environment.systemPackages = with pkgs; [
     lact
   ];