From b1e6f4256ffb4ac8e391af2619acb16fb3539f8b Mon Sep 17 00:00:00 2001
From: Spectre <ole@benstem.de>
Date: Fri, 7 Jun 2024 18:14:25 +0200
Subject: [PATCH] huh

---
 home/default.nix                   | 2 +-
 home/packages.nix                  | 7 +++----
 home/persist.nix                   | 6 +++---
 home/sops.nix                      | 2 +-
 home/xournalpp/default.nix         | 8 ++++++++
 hosts/lilith-pad/configuration.nix | 4 ++--
 system/users.nix                   | 6 +++---
 7 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 home/xournalpp/default.nix

diff --git a/home/default.nix b/home/default.nix
index 37e4ffa2..6aa1695a 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -13,7 +13,7 @@
     ./persist.nix
     ./playerctld.nix
     ./rofi.nix
-    # ./sops.nix
+    ./sops.nix
     ./stylix.nix
     ./zsh
   ];
diff --git a/home/packages.nix b/home/packages.nix
index 0897ece4..4d716530 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -1,5 +1,5 @@
 {
-  conf,
+  config,
   pkgs,
   lib,
   ...
@@ -18,8 +18,7 @@
       xdg-utils
       hyprshot
 
-      # obsidian
-      xournalpp
+      obsidian
       vlc
       keepassxc
       ncspot
@@ -33,5 +32,5 @@
       lutris
     ];
   in
-    common ++ (lib.optionals conf.gaming.enable gaming);
+    common ++ (lib.optionals config.gaming.enable gaming);
 }
diff --git a/home/persist.nix b/home/persist.nix
index 00b24d03..9cbc5158 100644
--- a/home/persist.nix
+++ b/home/persist.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  conf,
+  config,
   ...
 }: {
   data = {
@@ -24,12 +24,12 @@
       ".config/spotify"
       (
         lib.mkIf
-        conf.gaming.enable
+        config.gaming.enable
         ".local/share/PrismLauncher"
       )
       (
         lib.mkIf
-        conf.gaming.enable
+        config.gaming.enable
         ".local/share/Steam"
       )
       ".local/state/wireplumber"
diff --git a/home/sops.nix b/home/sops.nix
index a0683c4d..573ac67e 100644
--- a/home/sops.nix
+++ b/home/sops.nix
@@ -3,7 +3,7 @@
   sops-nix,
   ...
 }: {
-  imports = [sops-nix.homeManagerModules.sops];
+  # imports = [sops-nix.homeManagerModules.sops];
   sops = {
     age.keyFile = "/persist/data${conf.home}/.config/sops/age/keys.txt";
   };
diff --git a/home/xournalpp/default.nix b/home/xournalpp/default.nix
new file mode 100644
index 00000000..792a19b9
--- /dev/null
+++ b/home/xournalpp/default.nix
@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.xournalpp];
+  home.file.xournalpp = {
+    source = ./settings;
+    target = ".config/xournalpp";
+    recursive = true;
+  };
+}
diff --git a/hosts/lilith-pad/configuration.nix b/hosts/lilith-pad/configuration.nix
index 2695df04..12ee0aaf 100644
--- a/hosts/lilith-pad/configuration.nix
+++ b/hosts/lilith-pad/configuration.nix
@@ -1,5 +1,5 @@
-{conf, ...}: {
+{config, ...}: {
   imports = [../../system];
 
-  gaming.enable = false;
+  config.gaming.enable = false;
 }
diff --git a/system/users.nix b/system/users.nix
index 257ce954..be002336 100644
--- a/system/users.nix
+++ b/system/users.nix
@@ -20,12 +20,12 @@
   };
 
   home-manager.users = let
-    hm = import ../home;
+    hm = {user = [];}; # import ../home;
   in {
     ${conf.user} = {
       imports = hm.user;
-      home.username = conf.user;
-      home.stateVersion = "24.11";
+      # home.username = conf.user;
+      # home.stateVersion = "24.11";
     };
   };