Merge

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 = ''
@@ -76,10 +76,9 @@
   fonts.packages = with pkgs; [
     (nerdfonts.override { 
       fonts = [ 
+        "ComicShannsMono" 
         "FiraCode" 
-		"Agave"
-		"VictorMono"
-        "DroidSansMono" 
+		"Iosevka"
       ]; 
     })
   ];
@@ -98,8 +97,18 @@
     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; [
@@ -110,15 +119,15 @@
 		nano
 		git
 		openssh
-		(
-		catppuccin-sddm.override {
-			flavor = "mocha";
-			font  = "FiraCode 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;
+		# }
+		# )
 	];
 
 
@@ -139,14 +148,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";

config/home.nix

@@ -10,6 +10,7 @@
 }: {
   imports = [
     ../shared/dwm.nix
+    ../shared/vscode.nix
     ../shared/dmenu.nix
 	../shared/rofi.nix
     ../shared/kitty.nix
@@ -77,8 +78,14 @@
 	btop
 	xcolor
 	beets
+	openssl
 
 	# Dev
+	kaggle
+	unstable.cargo
+	unstable.rustc
+	cargo-generate
+	nodejs_22
 	gleam
 	gh-f
 	gh
@@ -94,16 +101,25 @@
 	ranger
 	tesseract4
 	k9s
+	kubectl
+	ngrok
+	graphviz
 
 	#LSP
+	yaml-language-server
     nil
 	jdt-language-server
 	texlab
 	marksman
 	nodePackages_latest.bash-language-server
+	typescript
+	nodePackages_latest.typescript-language-server
+	nodePackages_latest.vls
+	nodePackages_latest.volar
 	lua-language-server
 	tree-sitter
 	gopls
+	rust-analyzer
 
 	# Geography
 	geos
@@ -111,6 +127,8 @@
 	# UI
 	rofi-bluetooth
 	pastel
+	unstable.rmpc
+	mpd
 	imagemagick
 
     #VPN
@@ -134,6 +152,8 @@
 	poppler_utils
 
 	#Desktop
+	unstable.signal-desktop
+	kompare
 	pinta
     zathura
     firefox