From a9fa056ccb06036cc457da9ba269d8890ae2b06e Mon Sep 17 00:00:00 2001
From: MFlossmann <michael.flossmann@posteo.net>
Date: Tue, 28 May 2024 11:44:18 +0200
Subject: [PATCH] fix error from before

---
 modules/nixOS/bundles/core.nix            | 12 ------------
 modules/nixOS/bundles/core/default.nix    |  7 +++++++
 modules/nixOS/bundles/general-desktop.nix | 10 +++++-----
 3 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 modules/nixOS/bundles/core.nix

diff --git a/modules/nixOS/bundles/core.nix b/modules/nixOS/bundles/core.nix
deleted file mode 100644
index 766b874..0000000
--- a/modules/nixOS/bundles/core.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  environment.systemPackages = with pkgs; [
-    vim
-    wget
-    git
-    libgcc
-  ];
-}
diff --git a/modules/nixOS/bundles/core/default.nix b/modules/nixOS/bundles/core/default.nix
index 3814fba..ae7dea7 100644
--- a/modules/nixOS/bundles/core/default.nix
+++ b/modules/nixOS/bundles/core/default.nix
@@ -6,4 +6,11 @@
   imports = [
     # ./sops.nix
   ];
+
+  environment.systemPackages = with pkgs; [
+    vim
+    wget
+    git
+    libgcc
+  ];
 }
diff --git a/modules/nixOS/bundles/general-desktop.nix b/modules/nixOS/bundles/general-desktop.nix
index 018a383..f153460 100644
--- a/modules/nixOS/bundles/general-desktop.nix
+++ b/modules/nixOS/bundles/general-desktop.nix
@@ -55,11 +55,15 @@
   ];
 
   environment.systemPackages = with pkgs; [
+    keepassxc
+
     # TODO: move to displaymanagers
     kdePackages.kscreenlocker
-    gtklock
   ];
 
+  # TODO: move to displaymanagers
+  programs.partition-manager.enable = true;
+
   fonts.enableDefaultPackages = true;
   fonts.fontconfig = {
     defaultFonts = {
@@ -68,8 +72,4 @@
       serif = ["JetBrainsMono Nerd Font"];
     };
   };
-
-  environment.systemPackages = with pkgs; [
-    keepassxc
-  ];
 }