From 579dd400d7113b7075154e34fc8397eaf226f450 Mon Sep 17 00:00:00 2001
From: mir <mirmarq428@gmail.com>
Date: Wed, 28 Feb 2024 14:38:42 -0900
Subject: [PATCH] make galvatron and default configuration.nix more similar

---
 configuration.nix           | 20 +++++---------------
 flake.nix                   |  2 ++
 galvatron/configuration.nix | 20 ++------------------
 3 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 3f0b669..22499d5 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -5,26 +5,15 @@
 { config, lib, pkgs, ... }:
 
 {
-  # imports =
-  #   [ # Include the results of the hardware scan.
-  #     # ./hardware-configuration.nix
-  #     # (import "${home-manager}/nixos")
-  #     # <home-manager>/nixos
-  #   ];
-
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  # networking.hostName = "starscream"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
   # Enable networking
   networking.networkmanager.enable = true;
+  networking.wireless.iwd = {
+    enable = true;
+    settings.General.EnableNetworkConfiguration = true;
+  };
 
   # Set your time zone.
   time.timeZone = "America/Anchorage";
@@ -135,6 +124,7 @@
   environment.systemPackages = with pkgs; [
   #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
   #  wget
+    vim
     emacs29-pgtk
   ];
 
diff --git a/flake.nix b/flake.nix
index 3172adf..5c4d4f3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,6 +32,7 @@
         modules = [
           ./configuration.nix {
             networking.hostName = "starscream";
+	    boot.loader.efi.canTouchEfiVariables = true;
           }
           ./hardware/starscream-hw.nix
           home-manager.nixosModules.home-manager
@@ -48,6 +49,7 @@
         modules = [
           ./configuration.nix {
             networking.hostName = "knockout";
+	    boot.loader.efi.canTouchEfiVariables = true;
           }
           ./hardware/knockout-hw.nix
           home-manager.nixosModules.home-manager
diff --git a/galvatron/configuration.nix b/galvatron/configuration.nix
index 908d3ff..9af8e58 100644
--- a/galvatron/configuration.nix
+++ b/galvatron/configuration.nix
@@ -5,23 +5,11 @@
 { config, lib, pkgs, ... }:
 
 {
-#   imports =
-#    [ # Include the results of the hardware scan.
-#      # ./hardware-configuration.nix
-#      # ./apple-silicon-support
-#    ];
-
-  # asahi shit
-  # hardware.asahi.peripheralFirmwareDirectory = ./firmware;
-
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
-  # boot.loader.efi.canTouchEfiVariables = false;
 
-  # networking.hostName = "galvatron"; # Define your hostname.
-  # Pick only one of the below networking options.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+  # Enable networking
+  networking.networkmanager.enable = true;
   networking.wireless.iwd = {
     enable = true;
     settings.General.EnableNetworkConfiguration = true;
@@ -30,10 +18,6 @@
   # Set your time zone.
   time.timeZone = "America/Anchorage";
 
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
   # Select internationalisation properties.
   # i18n.defaultLocale = "en_US.UTF-8";
   # console = {