From 20f62a6441ad56ade13455f3e8adcf53b81efe9d Mon Sep 17 00:00:00 2001
From: RGBCube <RGBCube@users.noreply.github.com>
Date: Wed, 3 May 2023 12:49:14 +0300
Subject: [PATCH] Fix: Fix missing and/or invalid options

---
 machines/asus/default.nix         | 13 +++++--------
 machines/asus/git/default.nix     |  2 +-
 machines/asus/neovim/default.nix  |  8 ++++++--
 machines/asus/nixpkgs/default.nix |  2 --
 machines/asus/users/default.nix   |  2 +-
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/machines/asus/default.nix b/machines/asus/default.nix
index acdb89a..11c2ab1 100644
--- a/machines/asus/default.nix
+++ b/machines/asus/default.nix
@@ -11,17 +11,14 @@
     ./nixpkgs
     ./nushell
     ./pipewire
-#    ./plasma
     ./system
     ./users
     ./xserver
   ];
 }
 
-# //
-#
-# (homeManagerConfiguration {
-#   imports = [
-#       plasma-manager.homeManagerModules.plasma-manager
-#   ];
-# })
+ //
+
+(homeManagerConfiguration {
+  home.stateVersion = "22.11";
+})
diff --git a/machines/asus/git/default.nix b/machines/asus/git/default.nix
index 8cc06b6..10a548c 100644
--- a/machines/asus/git/default.nix
+++ b/machines/asus/git/default.nix
@@ -6,6 +6,6 @@ homeManagerConfiguration {
     userName = "RGBCube";
     userEmail = "RGBCube@users.noreply.github.com";
 
-    config.init.defaultBranch = "master";
+    extraConfig.init.defaultBranch = "master";
   };
 }
diff --git a/machines/asus/neovim/default.nix b/machines/asus/neovim/default.nix
index 38c7bc7..f7a14bb 100644
--- a/machines/asus/neovim/default.nix
+++ b/machines/asus/neovim/default.nix
@@ -1,10 +1,14 @@
 { homeManagerConfiguration, ... }:
 
-homeManagerConfiguration {
+{
   # Nuking nano out of orbit.
   environment.defaultPackages = [];
   programs.nano.syntaxHighlight = false;
+}
 
+//
+
+(homeManagerConfiguration {
   programs.neovim.enable = true;
   programs.neovim = {
     defaultEditor = true;
@@ -16,4 +20,4 @@ homeManagerConfiguration {
       # lunarVim
     ];
   };
-}
+})
diff --git a/machines/asus/nixpkgs/default.nix b/machines/asus/nixpkgs/default.nix
index 918f0cb..d85b174 100644
--- a/machines/asus/nixpkgs/default.nix
+++ b/machines/asus/nixpkgs/default.nix
@@ -1,8 +1,6 @@
 { pkgs, ... }:
 
 {
-  nixpkgs.hostPlatform = "x86_64-linux";
-
   environment.systemPackages = import ./packages.nix pkgs;
   fonts.fonts = import ./fonts.nix pkgs;
 }
diff --git a/machines/asus/users/default.nix b/machines/asus/users/default.nix
index 1be695b..98265a8 100644
--- a/machines/asus/users/default.nix
+++ b/machines/asus/users/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-  users.defaultShell = pkgs.nushell;
+  users.defaultUserShell = pkgs.nushell;
 
   imports = [
     ./nixos.nix