From f9cb050b5b6388d0d3ac3d79362bf803f0ccb33f Mon Sep 17 00:00:00 2001
From: Sebastian Moser <me@c2vi.dev>
Date: Tue, 31 Oct 2023 16:27:08 +0000
Subject: [PATCH] even more fixes for hpm

---
 common/nixos-graphical.nix | 6 ++++--
 hardware/hpm-laptop.nix    | 2 +-
 hardware/my-hp-laptop.nix  | 2 +-
 users/me/home.nix          | 1 -
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/nixos-graphical.nix b/common/nixos-graphical.nix
index 37ec3a0..f4de180 100644
--- a/common/nixos-graphical.nix
+++ b/common/nixos-graphical.nix
@@ -69,9 +69,11 @@
 
 	# xmonad
 	services.xserver.windowManager.xmonad = {
-   	enable = true;
+   	#enable = true;
    	#config = builtins.toPath "${self}/misc/xmonad.hs";
-   	config = builtins.readFile (self + /misc/xmonad.hs);
+		enable = builtins.trace "this is self ${self}" true;
+		
+   	config = builtins.readFile "${self} + /misc/xmonad.hs";
    	#config = "${confDir}/misc/xmo";
    	enableContribAndExtras = true;
    	extraPackages = hpkgs: [
diff --git a/hardware/hpm-laptop.nix b/hardware/hpm-laptop.nix
index 5471c39..9219919 100755
--- a/hardware/hpm-laptop.nix
+++ b/hardware/hpm-laptop.nix
@@ -12,7 +12,7 @@
 	boot.loader.grub = {
   		enable = true;
   		version = 2;
-  		device = "/dev/nvme0n1";
+  		device = "/dev/nvme0n1p1";
   		efiSupport = true;
 		extraConfig = ''
 			set timeout=2
diff --git a/hardware/my-hp-laptop.nix b/hardware/my-hp-laptop.nix
index 2a4922c..6e1e030 100644
--- a/hardware/my-hp-laptop.nix
+++ b/hardware/my-hp-laptop.nix
@@ -24,7 +24,7 @@
 	boot.loader.grub = {
   		enable = true;
   		version = 2;
-  		device = "/dev/nvme0n1";
+  		device = "/dev/nvme0n1p1";
   		efiSupport = true;
 		extraConfig = ''
 			set timeout=1
diff --git a/users/me/home.nix b/users/me/home.nix
index e6cbd8e..a1d579e 100644
--- a/users/me/home.nix
+++ b/users/me/home.nix
@@ -53,7 +53,6 @@
 	};
 
 	home.packages = with pkgs; [
-		neovim
 		vim
 		obsidian
 		tree