Improve nix codebase

Sigmanificient · Sep 23, 2023 · 2a2a524 · 2a2a524
1 parent 6771cc3
commit 2a2a524
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 23 deletions.
diff --git a/config/default.nix b/config/default.nix
@@ -1,5 +1,4 @@
-{ hostname }:
-{ config, pkgs, ... }:
+{ hostname, pkgs, ... }:
 {
   imports =
     [

diff --git a/flake.nix b/flake.nix
@@ -41,12 +41,13 @@
 
         home-manager.nixosModules.home-manager
         {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.${username} = import ./home;
-          home-manager.extraSpecialArgs = {
-            inherit ecsls;
-            conf = { inherit username system; };
+          home-manager = {
+            useGlobalPkgs = true;
+            useUserPackages = true;
+            users.${username} = import ./home;
+            extraSpecialArgs = {
+              inherit username system ecsls;
+            };
           };
         }
 
@@ -64,8 +65,9 @@
         Bacon = nixpkgs.lib.nixosSystem {
           inherit system;
 
+          specialArgs = { hostname = "Bacon"; };
           modules = default_modules ++ [
-            (import ./config { hostname = "Bacon"; })
+            ./config
             ./hardware/bacon.nix
 
             nixos-hardware.nixosModules.asus-battery
@@ -77,11 +79,11 @@
 
         Sigmachine = nixpkgs.lib.nixosSystem {
           inherit system;
+          specialArgs = { hostname = "Sigmachine"; };
 
           modules = default_modules ++ [
-            (import ./config { hostname = "Sigmachine"; })
+            ./config
             ./hardware/sigmachine.nix
-            # ./config/github_runner.nix
             ./config/sigmachine.nix
           ];
         };

diff --git a/home/default.nix b/home/default.nix
@@ -1,9 +1,9 @@
-{ pkgs, conf, ecsls, ... }:
+{ pkgs, username, ... }:
 {
   nixpkgs.config.allowUnfree = true;
 
   imports = [
-    (import ./nvim { inherit ecsls pkgs conf; })
+    ./nvim
 
     ./bash
     ./btop
@@ -26,15 +26,20 @@
   ];
 
   home = {
-    username = "${conf.username}";
-    homeDirectory = "/home/${conf.username}";
+    inherit username;
+    homeDirectory = "/home/${username}";
 
     stateVersion = "22.11";
     sessionVariables = {
       EDITOR = pkgs.nano;
     };
 
-    packages = with pkgs; [
+    packages = with pkgs; let
+      vencord = (discord.override {
+        withOpenASAR = true;
+        withVencord = true;
+      });
+    in [
       # settings
       arandr
       brightnessctl
@@ -46,13 +51,9 @@
       pavucontrol
 
       # messaging
-      (discord.override {
-        withOpenASAR = true;
-        withVencord = true;
-      })
-
       teams
       tdesktop
+      vencord
 
       # dev
       gnumake

diff --git a/home/nvim/default.nix b/home/nvim/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ecsls, conf, ... }:
+{ pkgs, ecsls, system, ... }:
 {
   home.file.nvim_conf = {
     source = ./lua;
@@ -25,7 +25,7 @@
       llvmPackages_latest.clang
       nodejs # Copilot
       xclip # Clipboard fix
-      ecsls.packages.${conf.system}.default
+      ecsls.packages.${system}.default
     ];
 
   };