updates and bookmarks and other stuff

Author: neonvoidx

flake.lock

@@ -4,7 +4,22 @@
     { host, user, ... }:
     {
       homeManager =
-        { pkgs, osConfig, ... }:
+        { osConfig, lib, ... }:
+        let
+          hasGames = osConfig.fileSystems ? "/games";
+          gtk3Bookmarks = [
+            "file:///home/${user.userName}/.config"
+            "file:///home/${user.userName}/3D"
+            "file:///home/${user.userName}/Downloads"
+            "file:///home/${user.userName}/Screenshots"
+            "file:///home/${user.userName}/Videos"
+            "file:///home/${user.userName}/dev"
+            "file:///home/${user.userName}/gamedev"
+            "file:///home/${user.userName}/nix"
+            "file:///home/${user.userName}/pics"
+          ]
+          ++ lib.optionals hasGames [ "file:///games" ];
+        in
         {
           # Force Home Manager to overwrite existing GTK files
           xdg.configFile."gtk-3.0/settings.ini".force = true;
@@ -17,17 +32,7 @@
               extraConfig = {
                 gtk-application-prefer-dark-theme = 1;
               };
-              bookmarks = [
-                "file:///home/${user.userName}/.config"
-                "file:///home/${user.userName}/3D"
-                "file:///home/${user.userName}/Downloads"
-                "file:///home/${user.userName}/Screenshots"
-                "file:///home/${user.userName}/Videos"
-                "file:///home/${user.userName}/dev"
-                "file:///home/${user.userName}/gamedev"
-                "file:///home/${user.userName}/nix"
-                "file:///home/${user.userName}/pics"
-              ];
+              bookmarks = gtk3Bookmarks;
             };
             gtk4 = {
               extraConfig = {

modules/desktop/gtk.nix

@@ -117,18 +117,18 @@
                   lock = {
                     action = "lock";
                     enabled = true;
-                    timeout = 600;
+                    timeout = 720;
                   };
                   screen-off = {
                     action = "screen_off";
                     enabled = true;
-                    timeout = 900;
+                    timeout = 1800;
                   };
                   suspend = {
                     action = "suspend";
                     enabled = true;
                     lock_before_suspend = true;
-                    timeout = 7200;
+                    timeout = 10800;
                   };
                 };
               };

modules/desktop/noctalia.nix

@@ -7,9 +7,9 @@
         url = "https://curseforge.overwolf.com/downloads/curseforge-latest-linux.AppImage";
         hash = "sha256-ocLq6EaM2E/yvH9zH2ESXZ8eLiquRHxStT/CDhJ2OdQ=";
       };
-      archon = pkgs.fetchurl {
-        url = "https://github.com/RPGLogs/Uploaders-archon/releases/download/v9.6.0/archon-v9.6.0.AppImage";
-        hash = "sha256-69xo+1jMo91KQ6yoMOBTXLUzFRNGUJqH7G5ZeEiiX4I=";
+      archon-lite = pkgs.fetchurl {
+        url = "https://github.com/RPGLogs/Uploaders-archon-lite/releases/download/v9.5.0/archon-lite-v9.5.0.AppImage";
+        hash = "sha256-ZuALgVtqsYtvnSq8hkJL4A+i4UaEpk+2L3bpSEXrhRM=";
       };
     in
     {
@@ -35,23 +35,23 @@
             '';
         })
         (pkgs.appimageTools.wrapType2 {
-          pname = "archon";
-          name = "archon";
-          version = "9.6.0";
-          src = archon;
+          pname = "archon-lite";
+          name = "archon-lite";
+          version = "9.5.0";
+          src = archon-lite;
           extraInstallCommands =
             let
               contents = pkgs.appimageTools.extract {
-                pname = "archon";
-                version = "9.6.0";
-                src = archon;
+                pname = "archon-lite";
+                version = "9.5.0";
+                src = archon-lite;
               };
             in
             ''
-              install -m 444 -D ${contents}/archon.desktop $out/share/applications/archon.desktop
-              substituteInPlace $out/share/applications/archon.desktop \
-                  --replace-fail 'Exec=AppRun' 'Exec=archon'
-              install -m 444 -D ${contents}/archon.png $out/share/icons/hicolor/256x256/apps/archon.png
+              install -m 444 -D ${contents}/archon-lite.desktop $out/share/applications/archon-lite.desktop
+              substituteInPlace $out/share/applications/archon-lite.desktop \
+                  --replace-fail 'Exec=AppRun' 'Exec=archon-lite'
+              install -m 444 -D ${contents}/archon-lite.png $out/share/icons/hicolor/256x256/apps/archon-lite.png
             '';
         })
         pkgs.xembsni