Improve systemm config

Sigmanificient · Dec 21, 2023 · 6cb4ff6 · 6cb4ff6
1 parent 46e3a29
commit 6cb4ff6
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 85 deletions.
diff --git a/bacon.nix b/bacon.nix
@@ -0,0 +1,45 @@
+{ inputs, system }: with inputs;
+let
+  username = "sigmanificient";
+in {
+  inherit system;
+
+  specialArgs = {
+    inherit username;
+    hostname = "Bacon";
+  };
+
+  modules =
+    let
+    home-manager-conf = {
+      home-manager = {
+        useGlobalPkgs = true;
+        useUserPackages = true;
+        users.${username} = import ./home;
+        extraSpecialArgs = {
+          inherit username system ecsls;
+        };
+      };
+    };
+
+  hosts-conf = {
+    networking.stevenBlackHosts.enable = true;
+  };
+
+  mod-nixhardware-lst = with nixos-hardware.nixosModules; [
+    asus-battery
+      common-cpu-amd
+      common-pc
+      common-pc-ssd
+  ];
+  in
+    [
+    ./system
+      ./hardware-configuration.nix
+    ] ++ [
+    home-manager.nixosModules.home-manager
+      home-manager-conf
+      hosts.nixosModule
+      hosts-conf
+    ] ++ mod-nixhardware-lst;
+}
diff --git a/flake.nix b/flake.nix
@@ -22,53 +22,9 @@
     {
       formatter.${system} = pkgs.nixpkgs-fmt;
 
-      nixosConfigurations =
-        let
-          username = "sigmanificient";
-        in
-        {
-          Bacon = nixpkgs.lib.nixosSystem {
-            inherit system;
-
-            specialArgs = {
-              inherit username;
-              hostname = "Bacon";
-            };
-
-            modules =
-              let
-                home-manager-conf = {
-                  home-manager = {
-                    useGlobalPkgs = true;
-                    useUserPackages = true;
-                    users.${username} = import ./home;
-                    extraSpecialArgs = {
-                      inherit username system ecsls;
-                    };
-                  };
-                };
-
-                hosts-conf = {
-                  networking.stevenBlackHosts.enable = true;
-                };
-
-                mod-nixhardware-lst = with nixos-hardware.nixosModules; [
-                  asus-battery
-                  common-cpu-amd
-                  common-pc
-                  common-pc-ssd
-                ];
-              in
-              [
-                ./system
-                ./hardware-configuration.nix
-              ] ++ [
-                home-manager.nixosModules.home-manager
-                home-manager-conf
-                hosts.nixosModule
-                hosts-conf
-              ] ++ mod-nixhardware-lst;
-          };
-        };
+      nixosConfigurations = {
+        Bacon = nixpkgs.lib.nixosSystem
+         (import ./bacon.nix { inherit inputs system; });
+      };
     };
 }
diff --git a/system/default.nix b/system/default.nix
@@ -1,4 +1,4 @@
-{ config, username, hostname, pkgs, ... }:
+{ username, hostname, pkgs, ... }:
 {
   imports =
     [
@@ -86,7 +86,10 @@
     ];
   };
 
-  hardware.pulseaudio.enable = false;
+  hardware = {
+    pulseaudio.enable = false;
+    opengl.enable = true;
+  };
 
   programs = {
     command-not-found.enable = false;
@@ -111,6 +114,21 @@
 
   security.rtkit.enable = true;
   services = {
+    auto-cpufreq = {
+      enable = true;
+      settings = {
+        battery = {
+          governor = "powersave";
+          turbo = "never";
+        };
+
+        charger = {
+          governor = "performance";
+          turbo = "auto";
+        };
+      };
+    };
+
     gvfs.enable = true;
     tumbler.enable = true;
     openssh.enable = true;
@@ -129,7 +147,6 @@
 
     xserver = {
       enable = true;
-      excludePackages = with pkgs; [ xterm ];
       displayManager.startx.enable = true;
       layout = "fr";
       libinput = {
@@ -140,16 +157,14 @@
       windowManager.qtile = {
         enable = true;
         backend = "x11";
-        extraPackages = python3Packages: with python3Packages; [
-          qtile-extras
-        ];
+        extraPackages = pypkgs: [ pypkgs.qtile-extras ];
       };
     };
 
     upower.enable = true;
   };
 
-  users.users."${username}" = {
+  users.users.${username} = {
     isNormalUser = true;
     shell = pkgs.zsh;
     extraGroups = [ "audio" "docker" "networkmanager" "libvirtd" "wheel" ];
@@ -186,7 +201,7 @@
       XDG_STATE_HOME = "$HOME/.local/state";
     };
 
-    shells = with pkgs; [ zsh ];
+    shells = [ pkgs.zsh ];
     systemPackages = with pkgs; [
       alsa-utils
       modemmanager
@@ -228,33 +243,4 @@
       ];
     };
   };
-
-  hardware.opengl.enable = true;
-  hardware.nvidia = {
-    open = false;
-    modesetting.enable = false;
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
-
-    prime = {
-      offload = {
-        enable = false;
-        enableOffloadCmd = false;
-      };
-      amdgpuBusId = "PCI:5:0:0";
-      nvidiaBusId = "PCI:1:0:0";
-    };
-  };
-
-  services.auto-cpufreq.enable = true;
-  services.auto-cpufreq.settings = {
-    battery = {
-      governor = "powersave";
-      turbo = "never";
-    };
-
-    charger = {
-      governor = "performance";
-      turbo = "auto";
-    };
-  };
 }