moving some modules, changing to systemd-boot.

README.md

@@ -1,3 +1,3 @@
 # nix-config
 
-My configs for both nixos and home manager only machines0
+My configs for both nixos and home manager only machines

flake.nix

@@ -32,23 +32,23 @@
     formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
     # NixOS configuration entrypoint
     # Available through 'nixos-rebuild --flake .#your-hostname'
-     nixosConfigurations = {
-       archlaptop = nixpkgs.lib.nixosSystem {
-system="x86_64-linux";
-         specialArgs = {inherit inputs outputs;};
-         # > Our main nixos configuration file <
-         modules = [
-		./hosts/archlaptop/configuration.nix
-		home-manager.nixosModules.home-manager
-		{
-			home-manager.useGlobalPkgs=true;
-			home-manager.useUserPackages=true;
-			home-manager.users.gabe = import ./hosts/archlaptop/home.nix;
-        home-manager.extraSpecialArgs = {inherit inputs outputs;};
-		}
-	];
-       };
-     };
+    nixosConfigurations = {
+      archlaptop = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = {inherit inputs outputs;};
+        # > Our main nixos configuration file <
+        modules = [
+          ./hosts/archlaptop/configuration.nix
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.gabe = import ./hosts/archlaptop/home.nix;
+            home-manager.extraSpecialArgs = {inherit inputs outputs;};
+          }
+        ];
+      };
+    };
 
     # Standalone home-manager configuration entrypoint
     # Available through 'home-manager --flake .#your-username@your-hostname'

hosts/archlaptop/configuration.nix

@@ -1,21 +1,21 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, ... }:
-
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+  ];
 
   # Bootloader.
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/vda";
-  boot.loader.grub.useOSProber = true;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 
-  networking.hostName = "nixos"; # Define your hostname.
+  networking.hostName = "archlaptop"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # Configure network proxy if necessary
@@ -43,12 +43,12 @@
     LC_TIME = "en_US.UTF-8";
   };
 
-nix={
-package=pkgs.nixFlakes;
-extraOptions=''
-experimental-features = nix-command flakes
-'';
-};
+  nix = {
+    package = pkgs.nixFlakes;
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
+  };
 
   # Enable the X11 windowing system.
   services.xserver.enable = true;
@@ -90,10 +90,10 @@ experimental-features = nix-command flakes
   users.users.gabe = {
     isNormalUser = true;
     description = "Gabe Venberg";
-    extraGroups = [ "networkmanager" "wheel" ];
+    extraGroups = ["networkmanager" "wheel"];
     packages = with pkgs; [
       firefox
-    #  thunderbird
+      #  thunderbird
     ];
   };
 
@@ -133,5 +133,4 @@ experimental-features = nix-command flakes
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "23.11"; # Did you read the comment?
-
 }

hosts/archlaptop/hardware-configuration.nix

@@ -1,26 +1,30 @@
 # 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, ... }:
-
 {
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-amd"];
+  boot.extraModulePackages = [];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/87ee53a2-077d-47df-9051-9abcc0fc1a89";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/87ee53a2-077d-47df-9051-9abcc0fc1a89";
+    fsType = "ext4";
+  };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/5aa8725e-fdd1-4825-9d2c-e2c2c165b726"; }
-    ];
+  swapDevices = [
+    {device = "/dev/disk/by-uuid/5aa8725e-fdd1-4825-9d2c-e2c2c165b726";}
+  ];
 
   # 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

hosts/archlaptop/home.nix

@@ -1,5 +1,5 @@
 {
-inputs,
+  inputs,
   config,
   pkgs,
   lib,
@@ -9,13 +9,13 @@ inputs,
   # manage.
   # machine specific options
   host.enable-speech = true;
-  #host.nvim.enable-lsp = true;
-  #host.nvim.enable-treesitter = true;
+  host.nvim.enable-lsp = true;
+  host.nvim.enable-treesitter = true;
 
   home.username = "gabe";
   home.homeDirectory = "/home/gabe";
   imports = [
-    ../../terminal/home.nix
-inputs.nixvim.homeManagerModules.nixvim
+    ../../terminal/terminal.nix
+    inputs.nixvim.homeManagerModules.nixvim
   ];
 }

hosts/gabe-archlaptop.nix

@@ -15,6 +15,6 @@
   home.username = "gabe";
   home.homeDirectory = "/home/gabe";
   imports = [
-    ../terminal/home.nix
+    ../terminal/terminal.nix
   ];
 }

hosts/non-nixos-server.nix

@@ -15,6 +15,6 @@
   home.username = "gabe";
   home.homeDirectory = "/home/gabe";
   imports = [
-    ../terminal/home.nix
+    ../terminal/terminal.nix
   ];
 }

modules/home-manager/terminal/zsh.nix

@@ -8,7 +8,7 @@
   programs.zoxide.enableZshIntegration = true;
   programs.yazi.enableZshIntegration = true;
   programs.carapace.enableZshIntegration = true;
-  programs.direnv.enableZshIntegration=true;
+  programs.direnv.enableZshIntegration = true;
   programs.zsh = {
     enable = true;
     enableCompletion = true;