From 5190de97d695829801cde8859960275576b2ee8c Mon Sep 17 00:00:00 2001
From: FredzyW <fredrik@wastring.com>
Date: Fri, 15 Nov 2024 09:23:13 +0100
Subject: [PATCH] Fixed booloader and more

---
 config/base.nix                   | 44 ++++++++++++++++++-------------
 config/home.nix                   |  2 ++
 maskiner/laptop/configuration.nix | 11 ++++++++
 maskiner/server/configuration.nix | 10 +++----
 shared/fish.nix                   |  2 ++
 shared/ssh.nix                    |  3 ++-
 6 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/config/base.nix b/config/base.nix
index 6a28542..4ed0648 100644
--- a/config/base.nix
+++ b/config/base.nix
@@ -22,7 +22,7 @@
   nix.nixPath = ["/etc/nix/path"];
   users.defaultUserShell = pkgs.bash;
   documentation.man.generateCaches = false;
-  systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
+  # systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
   programs.fish.enable = true;
 	programs.bash = {
 	interactiveShellInit = ''
@@ -97,21 +97,31 @@
     LC_TIME = "sv_SE.UTF-8";
   };
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+  # boot.loader.systemd-boot.enable = true;
+  # boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader = {
+	  efi = {
+		canTouchEfiVariables = false;
+	  };
+	  grub = {
+		 efiSupport = true;
+		 efiInstallAsRemovable = true;
+		 device = "nodev";
+	  };
+	};
   console.keyMap = "sv-latin1";
 
 	environment.systemPackages = with pkgs; [
 		openssh
-		(
-		catppuccin-sddm.override {
-			flavor = "mocha";
-			font  = "ComicShannsMono Nerd Font Bold";
-			fontSize = "17";
-			background = "${../wallpapers/inverted.png}";
-			loginBackground = true;
-		}
-		)
+		# (
+		# catppuccin-sddm.override {
+		# 	flavor = "mocha";
+		# 	font  = "ComicShannsMono Nerd Font Bold";
+		# 	fontSize = "17";
+		# 	background = "${../wallpapers/inverted.png}";
+		# 	loginBackground = true;
+		# }
+		# )
 	];
 
 
@@ -132,14 +142,10 @@
 		  "ipsec.d/ipsec.nm-l2tp.secrets"
 		];
 	};
-  displayManager = {
-	sddm = {
-	  enable = true;
-	  theme = "catppuccin-mocha";
-	  package = pkgs.kdePackages.sddm;
-	};
-  };
     xserver = {
+	  displayManager = {
+		  startx.enable = true;
+	  };
       enable = true;
 	  xkb = {
 		  layout = "se";
diff --git a/config/home.nix b/config/home.nix
index 3270522..fe46fe6 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -79,6 +79,8 @@
 	openssl
 
 	# Dev
+	kaggle
+	vscode
 	unstable.cargo
 	unstable.rustc
 	cargo-generate
diff --git a/maskiner/laptop/configuration.nix b/maskiner/laptop/configuration.nix
index 7a02fbf..539bc8d 100644
--- a/maskiner/laptop/configuration.nix
+++ b/maskiner/laptop/configuration.nix
@@ -21,6 +21,17 @@
 		dotnet-sdk_8
 	];
 
+	# boot.loader = {
+	# 	efi = {
+	# 		canTouchEfiVariables = true;
+	# 	};
+	# 	grub = {
+	# 		enable = true;
+	# 		efiSupport = true;
+	# 		useOSProber = true;
+	# 	};
+	# };
+
 
 	services.xserver.dpi = 140;
 
diff --git a/maskiner/server/configuration.nix b/maskiner/server/configuration.nix
index 4b18dcc..2dc64ad 100644
--- a/maskiner/server/configuration.nix
+++ b/maskiner/server/configuration.nix
@@ -87,11 +87,11 @@
     LC_TIME = "sv_SE.UTF-8";
   };
 
-  boot.loader.grub = {
-	enable = true;
-	device = "/dev/sdc";
-	useOSProber = true;
-  };
+ #  boot.loader.grub = {
+	# enable = true;
+	# device = "/dev/sdc";
+	# useOSProber = true;
+ #  };
 
   console.keyMap = "sv-latin1";
   programs.zsh.enable = true;
diff --git a/shared/fish.nix b/shared/fish.nix
index 7272d33..28e4d84 100644
--- a/shared/fish.nix
+++ b/shared/fish.nix
@@ -49,6 +49,8 @@
 		  reb="sudo nixos-rebuild switch --flake $SYSTEM_DIR";
 		  cam="jira issue create && jira issue assign && jira issue move";
 		  latest="git log | head -1 | awk '{print $2;}' | xsel -ib";
+		  vpnup="nmcli con up 'iFacts VPN'";
+		  vpndown="nmcli con down 'iFacts VPN'";
 	  };
 	  interactiveShellInit = ''
 		fish_vi_key_bindings
diff --git a/shared/ssh.nix b/shared/ssh.nix
index c36f30c..f76f719 100644
--- a/shared/ssh.nix
+++ b/shared/ssh.nix
@@ -19,6 +19,7 @@
         hostname = "login.student.lth.se";
         port = 22;
         user = "fr7658wa-s";
+        identityFile = "/home/fw/.ssh/id_rsa";
       };
       "dm2" = {
         hostname = "192.168.0.190";
@@ -27,7 +28,7 @@
         identityFile = "/home/fw/.ssh/fw-ssh-key";
       };
       "ha1" = {
-        hostname = "hosted-agent-1";
+        hostname = "192.168.0.180";
         port = 22;
         user = "fw";
         identityFile = "/home/fw/.ssh/fw-ssh-key";