fix(syncthing): solved problem with missing encrypted config

Wittano · Jun 27, 2024 · 3c3c568 · 3c3c568
1 parent a3dff63
commit 3c3c568
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 39 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/desktop/gaming/games.nix b/modules/desktop/gaming/games.nix
@@ -5,11 +5,15 @@ let
   cfg = config.modules.desktop.gaming.games;
   gamingCfg = config.modules.desktop.gaming;
 
+  fixedMindustry = unstable.mindustry.override {
+    gradle = unstable.gradle_7;
+  };
+
   games = with unstable; [
     # Games
     osu-lazer # osu!lazer
     airshipper # Veloren
-    mindustry # Mindustry
+    fixedMindustry # Mindustry
     xivlauncher # FF XIV
   ];
 in

diff --git a/modules/desktop/submodules/qt.nix b/modules/desktop/submodules/qt.nix
@@ -13,14 +13,14 @@ with lib.my;
       home = {
         packages = with pkgs; [ kdePackages.qt6ct libsForQt5.qt5ct ];
         sessionVariables = {
-          QT_QPA_PLATFORMTHEME = "qt5ct";
+          QT_QPA_PLATFORMTHEME = "kvantum";
           QT_QPA_PLATFORM = "xcb";
         };
       };
 
       qt = {
         enable = true;
-        platformTheme.name = "qtct";
+        platformTheme.name = "kvantum";
         style = {
           name = "kvantum";
           catppuccin = {

diff --git a/modules/agenix.nix → modules/secrets.nix b/modules/agenix.nix → modules/secrets.nix
@@ -66,6 +66,7 @@ in
       done
     '';
 
+
   age.secrets = attrsets.mapAttrs'
     (n: _:
       {

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
@@ -5,8 +5,10 @@ let
   cfg = config.modules.services.syncthing;
   homeDir = config.home-manager.users.wittano.home.homeDirectory;
 
-  encryptedConfig =
-    builtins.fromJSON (builtins.readFile config.age.secrets.syncthing.path);
+  encryptedConfig = trivial.pipe config.age.secrets.syncthing.path [
+    builtins.readFile
+    builtins.fromJSON
+  ];
 in
 {
   options = {
@@ -18,7 +20,7 @@ in
   config =
     mkIf (cfg.enable) {
       services.syncthing = {
-        enable = builtins.pathExists config.age.secrets.syncthing.path;
+        enable = true;
         systemService = true;
         dataDir = "${homeDir}/.cache/syncthing";
         configDir = "${homeDir}/.config/syncthing";
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,6 +66,7 @@ in @@
           done
         '';
       age.secrets = attrsets.mapAttrs'
         (n: _:
           {
@@ Expand Down @@