From 20ffd0b0a8d3a930746cc0cd560909da09638b74 Mon Sep 17 00:00:00 2001
From: Kabbone <tobias@opel-online.de>
Date: Sat, 4 Feb 2023 08:50:56 +0100
Subject: [PATCH] hosts: update agenix config

---
 flake.nix                       | 2 +-
 hosts/configuration_desktop.nix | 2 +-
 hosts/configuration_server.nix  | 2 +-
 hosts/default.nix               | 8 ++++----
 hosts/home.nix                  | 2 ++
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 91578b3..4af16b3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,7 @@
 
       agenix = {
         url = "github:ryantm/agenix";
-        #inputs.nixpkgs.follows = "nixpkgs-stable";
+        inputs.nixpkgs.follows = "nixpkgs";
       };
     };
 
diff --git a/hosts/configuration_desktop.nix b/hosts/configuration_desktop.nix
index a2fc6f4..b7012d6 100644
--- a/hosts/configuration_desktop.nix
+++ b/hosts/configuration_desktop.nix
@@ -97,7 +97,7 @@
       dig
       qmk-udev-rules
       gptfdisk
-      agenix.defaultPackage.x86_64-linux
+      agenix.packages.x86_64-linux.default
       age-plugin-yubikey
       pwgen
       cryptsetup
diff --git a/hosts/configuration_server.nix b/hosts/configuration_server.nix
index 4a24d7b..1670b7f 100644
--- a/hosts/configuration_server.nix
+++ b/hosts/configuration_server.nix
@@ -85,7 +85,7 @@
       lm_sensors
       bind
       dig
-      agenix.defaultPackage.x86_64-linux
+      agenix.package.x86_64-linux.default
       ffmpeg
     ];
   };
diff --git a/hosts/default.nix b/hosts/default.nix
index 9639ebb..09e8ac0 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -29,7 +29,7 @@ in
     inherit system;
     specialArgs = { inherit inputs user location hyprland nixos-hardware nur agenix; };
     modules = [
-      agenix.nixosModule
+      agenix.nixosModules.default
       nur.nixosModules.nur
       #hyprland.nixosModules.default
       ./desktop
@@ -57,7 +57,7 @@ in
     inherit system;
     specialArgs = { inherit inputs user location hyprland nixos-hardware nur agenix; };
     modules = [
-      agenix.nixosModule
+      agenix.nixosModules.default
       nur.nixosModules.nur
       #hyprland.nixosModules.default
       ./laptop
@@ -85,7 +85,7 @@ in
     #user = "dmz-user";
     specialArgs = { inherit inputs user location nixos-hardware nur agenix; };
     modules = [
-      agenix.nixosModule
+      agenix.nixosModules.default
       nur.nixosModules.nur
       ./server
       ./configuration_server.nix
@@ -111,7 +111,7 @@ in
     #user = "dmz-user";
     specialArgs = { inherit inputs user location nixos-hardware nur agenix; };
     modules = [
-      agenix.nixosModule
+      agenix.nixosModules.default
       nur.nixosModules.nur
       ./nas
       ./configuration_desktop.nix
diff --git a/hosts/home.nix b/hosts/home.nix
index e1a0107..473b465 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -69,6 +69,7 @@
       calibre
       mtpfs
       vimiv-qt
+      #freecad
 
       # File Management
       #okular            # PDF viewer
@@ -90,6 +91,7 @@
       #wget             # Downloader
       #zsh              # Shell
       keepassxc
+      libreoffice
       #
       # General home-manager
       #alacritty        # Terminal Emulator