From d49398a413acb7aaeadea04d664a3ddc0b17dab7 Mon Sep 17 00:00:00 2001
From: fwastring <fredrik@wastring.com>
Date: Tue, 28 Jan 2025 17:44:13 +0100
Subject: [PATCH] Changed dwm flake and home for new laptop

---
 config/base.nix      | 23 ++++++++++-------------
 config/lill-home.nix | 13 ++++---------
 flake.nix            |  2 +-
 shared/dwm.nix       |  2 +-
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/config/base.nix b/config/base.nix
index 46eaf50..fcc2c84 100644
--- a/config/base.nix
+++ b/config/base.nix
@@ -8,7 +8,7 @@
   ...
 }: {
 	imports = [
-		../shared/vial.nix
+		# ../shared/vial.nix
 	];
   nixpkgs = {
     overlays = [
@@ -110,24 +110,21 @@
 	environment.systemPackages = with pkgs; [
 		vim
 		neovim
-		cvs
-		rcs
-		nano
 		git
 		openssh
 	];
 
 
   services = {
-  	udev = {
-		extraRules = ''
-			KERNEL=="ttyACM0", MODE:="666"
-		'';
-		packages = with pkgs; [
-			vial
-			via
-		];
-	};
+ #  	udev = {
+	# 	extraRules = ''
+	# 		KERNEL=="ttyACM0", MODE:="666"
+	# 	'';
+	# 	packages = with pkgs; [
+	# 		vial
+	# 		via
+	# 	];
+	# };
 	picom.enable = true;
     openssh = {
       enable = true;
diff --git a/config/lill-home.nix b/config/lill-home.nix
index 8d02c6b..768b1f4 100644
--- a/config/lill-home.nix
+++ b/config/lill-home.nix
@@ -40,7 +40,7 @@
 	zip
     wget
     alsa-utils
-    upower
+    acpi
     gcc
     gnumake
 	cmake
@@ -59,11 +59,13 @@
 	unstable.fzf
 	eza
 	btop
-	thttpd
 	xcolor
 	openssl
 	dig
 	jq
+	rockbox-utility
+	rhythmbox
+	libgpod
 
 	# Dev
 	unstable.hugo
@@ -79,12 +81,9 @@
 	kubectl
 
 	#LSP
-	roslyn
-	roslyn-ls
 	python312Packages.python-lsp-server
 	yaml-language-server
     nil
-	jdt-language-server
 	texlab
 	marksman
 	nodePackages_latest.bash-language-server
@@ -133,13 +132,9 @@
     fastfetch
     lazygit
 	byzanz
-    remmina
 
 	# Utils
 	speedcrunch
-
-	#Unfree
-    discord
   ];
   programs.home-manager.enable = true;
   programs.fish.enable = true;
diff --git a/flake.nix b/flake.nix
index cc0970e..6fa0ad9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -143,7 +143,7 @@
 		};
         # > Our main home-manager configuration file <
         modules = [
-			./config/home.nix
+			./config/lill-home.nix
 			({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
 			({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-fw-pkgs ]; })
 		];
diff --git a/shared/dwm.nix b/shared/dwm.nix
index 0efa4b8..8068cb4 100644
--- a/shared/dwm.nix
+++ b/shared/dwm.nix
@@ -20,7 +20,7 @@ let
   }) else pkgs.dwmblocks.overrideAttrs (old: {
     src = builtins.fetchGit {
       url = "https://github.com/FredzyW/dwmblocks.git";
-      rev = "a334789ec7b9171a3c8e1fcac2ffe8463ee438dc";
+      rev = "ec1b1a61a80e0ba92842e5117736ff977bb6cfa5";
     };
   });
 in