Update dotfiles

This reverts commit 544c9d66be.

flake.lock

@@ -1,9 +1,30 @@
 {
   "nodes": {
+    "antigravity-nix": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1785225335,
+        "narHash": "sha256-xzUNPgjfG06GvFNiZq+68euMeP05xydLwSv1cuS8Gq4=",
+        "owner": "jacopone",
+        "repo": "antigravity-nix",
+        "rev": "ab4c80d1e6524389fb4ccc05744e9e617ef363c4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jacopone",
+        "repo": "antigravity-nix",
+        "type": "github"
+      }
+    },
     "elephant": {
       "inputs": {
         "nixpkgs": "nixpkgs",
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1770910218,
@@ -35,6 +56,24 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -42,16 +81,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1777851538,
+        "lastModified": 1785119570,
-        "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=",
+        "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5",
+        "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-26.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -154,11 +193,11 @@
     },
     "nixpkgs-unstable_2": {
       "locked": {
-        "lastModified": 1777954456,
+        "lastModified": 1785090369,
-        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
+        "narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
+        "rev": "624af665418d3c65d544145b4d34ad696439570e",
         "type": "github"
       },
       "original": {
@@ -218,27 +257,27 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1777673416,
+        "lastModified": 1785104993,
-        "narHash": "sha256-5c2POKPOjU40Kh0MirOdScBLG0bu9TAuPYAtPRNZMBs=",
+        "narHash": "sha256-eKbrvPoAOFutbYMdbB3r5EQVmFxKv24iKqHPPUXA0gM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "26ef669cffa904b6f6832ab57b77892a37c1a671",
+        "rev": "8623c4c20aa4ca2f5fb81510d2944066c3fb0d96",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1775888245,
+        "lastModified": 1782175435,
-        "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=",
+        "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "13043924aaa7375ce482ebe2494338e058282925",
+        "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775",
         "type": "github"
       },
       "original": {
@@ -256,15 +295,16 @@
         "noctalia-qs": "noctalia-qs"
       },
       "locked": {
-        "lastModified": 1777859147,
+        "lastModified": 1783017890,
-        "narHash": "sha256-0vCgxdwrxBkHmqNgJtUMGCFwSV5a6AgYdKAgBCtFFPM=",
+        "narHash": "sha256-bAzrtN0GDMH0dOZkgeI3zSxfFs2rdD3pMuzOxvTF0bs=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "6b48834dd6c3913d211476ab2f964f3fb100675e",
+        "rev": "a48885b9fec485c903c955749a7da6e30147cd38",
         "type": "github"
       },
       "original": {
         "owner": "noctalia-dev",
+        "ref": "legacy-v4",
         "repo": "noctalia-shell",
         "type": "github"
       }
@@ -275,15 +315,15 @@
           "noctalia",
           "nixpkgs"
         ],
-        "systems": "systems_3",
+        "systems": "systems_4",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1777773024,
+        "lastModified": 1780799499,
-        "narHash": "sha256-pLU+KB84A0Jei/vTD6pOS4Ovkmq3QDfPQHg1MlKsRqM=",
+        "narHash": "sha256-YloRtLqJabzYUWvdLyh67zH4DZrR3kQj+dlQJwLPmPM=",
         "owner": "noctalia-dev",
         "repo": "noctalia-qs",
-        "rev": "d3e26ccd9eecde9139be00caf5dc2d4260fb31ee",
+        "rev": "f308426239665e3bc3d624014e9295b2ae2f58ff",
         "type": "github"
       },
       "original": {
@@ -294,6 +334,7 @@
     },
     "root": {
       "inputs": {
+        "antigravity-nix": "antigravity-nix",
         "home-manager": "home-manager",
         "nixers-repo": "nixers-repo",
         "nixpkgs": "nixpkgs_5",
@@ -307,11 +348,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1777944972,
+        "lastModified": 1783174389,
-        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
+        "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
+        "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9",
         "type": "github"
       },
       "original": {
@@ -322,16 +363,16 @@
     },
     "systems": {
       "locked": {
-        "lastModified": 1689347949,
+        "lastModified": 1681028828,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
         "type": "github"
       }
     },
@@ -365,6 +406,21 @@
         "type": "github"
       }
     },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -374,11 +430,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775636079,
+        "lastModified": 1780220602,
-        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
+        "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
+        "rev": "db947814a175b7ca6ded66e21383d938df01c227",
         "type": "github"
       },
       "original": {
@@ -394,7 +450,7 @@
           "elephant"
         ],
         "nixpkgs": "nixpkgs_4",
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1771062828,

flake.nix

@@ -9,19 +9,24 @@
 
   inputs = {
     # Nixpkgs
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
     # Nixpkgs-unstable
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     # Nixers
     nixers-repo.url = "github:Cian-H/Nixers";
     # Home manager
-    home-manager.url = "github:nix-community/home-manager/release-25.11";
+    home-manager.url = "github:nix-community/home-manager/release-26.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     # Add sops for secret management
     sops-nix.url = "github:Mic92/sops-nix";
     # Add Noctalia input
     noctalia = {
-      url = "github:noctalia-dev/noctalia-shell";
+      url = "github:noctalia-dev/noctalia-shell/legacy-v4";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    # Antigravity, for managing busywork and chores
+    antigravity-nix = {
+      url = "github:jacopone/antigravity-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -31,6 +36,7 @@
     nixpkgs,
     nixpkgs-unstable,
     nixers-repo,
+    antigravity-nix,
     home-manager,
     ...
   } @ inputs: let
@@ -135,7 +141,7 @@
             inherit inputs outputs;
             unstablePkgs = import nixpkgs-unstable {
               # We also need to do the same for unstable
-              system = pkgs.stdenv.hostPlatform.system;
+              inherit (pkgs.stdenv.hostPlatform) system;
               config = {
                 allowUnfree = true;
                 allowUnfreePredicate = _: true;
@@ -170,8 +176,9 @@
               };
             };
             nixers = inputs.nixers-repo.packages.${pkgs.stdenv.hostPlatform.system};
+            antigravityPkgs = antigravity-nix.packages.${pkgs.stdenv.hostPlatform.system};
           in {
-            inherit inputs outputs unstablePkgs nixers;
+            inherit inputs outputs unstablePkgs nixers antigravityPkgs;
             theme = worklaptopTheme {inherit pkgs unstablePkgs nixers;};
           };
 

home-manager/core/dotfiles.nix

@@ -51,6 +51,11 @@ in {
         target = ".config/nushell/my_config";
         recursive = true;
       };
+      "atuin" = {
+        source = ./dotfiles/dot_config/atuin;
+        target = ".config/atuin";
+        recursive = true;
+      };
       "fish" = {
         source = ./dotfiles/dot_config/fish;
         target = ".config/fish";
@@ -64,7 +69,7 @@ in {
           in
             ! (
               (lib.hasPrefix "*/nvim/*" name)
-              || (lib.hasPrefix "." baseName)
+              || ((lib.hasPrefix "." baseName) && (baseName != ".hotpot.fnl"))
               || (lib.hasPrefix "devenv" baseName)
               || (lib.hasSuffix ".toml" baseName)
               || (lib.hasSuffix ".yml" baseName)
@@ -73,6 +78,38 @@ in {
         target = ".config/nvim";
         recursive = true;
       };
+      "helix" = {
+        source = lib.cleanSourceWith {
+          src = ./dotfiles/dot_config/helix;
+          filter = name: type: let
+            baseName = baseNameOf name;
+          in
+            ! (
+              (lib.hasPrefix "*/helix/*" name)
+              || (lib.hasPrefix "." baseName)
+              || (lib.hasPrefix "devenv" baseName)
+            );
+        };
+        target = ".config/helix";
+        recursive = true;
+      };
+      "emacs" = {
+        source = lib.cleanSourceWith {
+          src = ./dotfiles/dot_config/emacs;
+          filter = name: type: let
+            baseName = baseNameOf name;
+          in
+            ! (
+              (lib.hasPrefix "*/emacs/*" name)
+              || (lib.hasPrefix "." baseName)
+              || (lib.hasPrefix "devenv" baseName)
+              || (lib.hasSuffix ".toml" baseName)
+              || (lib.hasSuffix ".yml" baseName)
+            );
+        };
+        target = ".config/emacs";
+        recursive = true;
+      };
       "noctalia" = {
         source = lib.cleanSourceWith {
           src = ./dotfiles/dot_config/noctalia;
@@ -103,11 +140,6 @@ in {
         source = ./dotfiles/dot_config/Thunar;
         target = ".config/Thunar";
       };
-      "rye" = {
-        source = ./dotfiles/dot_config/.rye;
-        target = ".config/.rye";
-        recursive = true;
-      };
     }
     // noctaliaPluginFiles
     // customPluginFiles;
@@ -122,7 +154,6 @@ in {
     "bat".source = ./dotfiles/dot_config/bat;
     "path.env".source = ./dotfiles/dot_config/path.env;
     "fastfetch".source = ./dotfiles/dot_config/fastfetch;
-    "helix".source = ./dotfiles/dot_config/helix;
     "home-manager".source = ./dotfiles/dot_config/home-manager;
     "hypr".source = ./dotfiles/dot_config/hypr;
     "just".source = ./dotfiles/dot_config/just;

home-manager/core/packages.nix

@@ -12,6 +12,7 @@
     pkgs.git-extras
     pkgs.git-credential-manager
     pkgs.meld
+    pkgs.statix
     pkgs.unzip
     unstablePkgs.devenv
     unstablePkgs.lazygit

home-manager/core/programs/yazi.nix

@@ -10,6 +10,7 @@
     enable = true;
     package = unstablePkgs.yazi;
     enableNushellIntegration = true;
+    shellWrapperName = "y";
   };
 
   # Manually place plugins for now, until home-manager updates for newer yazi versions
@@ -19,16 +20,16 @@
     "yazi/theme.toml".source = ../dotfiles/dot_config/yazi/theme.toml;
     "yazi/yazi.toml".source = ../dotfiles/dot_config/yazi/yazi.toml;
     "yazi/plugins/chmod.yazi".source = ../dotfiles/dot_config/yazi/plugins/core/chmod.yazi;
+    "yazi/plugins/clipboard.yazi".source = ../dotfiles/dot_config/yazi/plugins/clipboard.yazi;
     "yazi/plugins/full-border.yazi".source = ../dotfiles/dot_config/yazi/plugins/core/full-border.yazi;
     "yazi/plugins/git.yazi".source = ../dotfiles/dot_config/yazi/plugins/core/git.yazi;
-    "yazi/plugins/hexyl.yazi".source = ../dotfiles/dot_config/yazi/plugins/hexyl.yazi;
     "yazi/plugins/max-preview.yazi".source = ../dotfiles/dot_config/yazi/plugins/max-preview.yazi;
     "yazi/plugins/mime-ext.yazi".source = ../dotfiles/dot_config/yazi/plugins/core/mime-ext.yazi;
     "yazi/plugins/ouch.yazi".source = ../dotfiles/dot_config/yazi/plugins/ouch.yazi;
+    "yazi/plugins/piper.yazi".source = ../dotfiles/dot_config/yazi/plugins/yazi-rs-plugins/piper.yazi;
     "yazi/plugins/rich-preview.yazi".source = ../dotfiles/dot_config/yazi/plugins/rich-preview.yazi;
     "yazi/plugins/starship.yazi".source = ../dotfiles/dot_config/yazi/plugins/starship.yazi;
     "yazi/plugins/sudo.yazi".source = ../dotfiles/dot_config/yazi/plugins/sudo.yazi;
-    "yazi/plugins/wl-clipboard.yazi".source = ../dotfiles/dot_config/yazi/plugins/wl-clipboard.yazi;
     "yazi/flavors/tokyo-night.yazi".source = ../dotfiles/dot_config/yazi/flavors/tokyo-night.yazi;
   };
 }

home-manager/homeserver/containers.nix

@@ -21,7 +21,7 @@
 
   imports = [
     ./containers/media.nix
-    # ./containers/metrics.nix
+    ./containers/metrics.nix
     ./containers/caddy.nix
     ./containers/work_tools.nix
     ./containers/nextcloud.nix

home-manager/homeserver/containers/caddy.nix

@@ -20,6 +20,7 @@
       ];
       volumes = [
         "/home/cianh/caddy/config:/etc/caddy"
+        "${./caddy/Caddyfile.persistent}:/etc/caddy/Caddyfile.persistent:ro"
         "/home/cianh/caddy/data:/data:Z"
         "/home/cianh/caddy/logs:/var/log/caddy"
         "/home/cianh/caddy/placeholder_site:/var/www/site:Z"

home-manager/homeserver/containers/caddy/Caddyfile.persistent

@@ -0,0 +1,125 @@
+(web_analytics) {
+        log {
+                output file /var/log/caddy/access.log
+                format json
+        }
+}
+
+(security_headers) {
+        header {
+                X-Content-Type-Options "nosniff"
+                X-Frame-Options "SAMEORIGIN"
+                Referrer-Policy "no-referrer"
+                Strict-Transport-Security "max-age=15552000; includeSubDomains; preload"
+                X-XSS-Protection "1; mode=block"
+                X-Permitted-Cross-Domain-Policies "none"
+        }
+}
+
+bulba.space {
+        root * /var/www/site
+        file_server
+        import web_analytics
+        import security_headers
+}
+
+freshrss.bulba.space {
+        reverse_proxy freshrss:80
+        import web_analytics
+        import security_headers
+}
+
+vikunja.bulba.space {
+        reverse_proxy vikunja:3456
+        import web_analytics
+        import security_headers
+}
+
+blog.bulba.space {
+        root * /var/www/blog
+        file_server
+        import web_analytics
+        import security_headers
+}
+
+gitea.bulba.space {
+        reverse_proxy gitea:3000
+        import web_analytics
+        import security_headers
+}
+
+jellyfin.bulba.space {
+        reverse_proxy jellyfin:8096
+        import web_analytics
+        import security_headers
+}
+
+nextcloud.bulba.space {
+        header {
+                X-Robots-Tag "noindex, nofollow"
+        }
+
+        request_body {
+                max_size 5GB
+        }
+
+        root * /var/www/nextcloud/
+        file_server
+        php_fastcgi nextcloud:9000 {
+                root /var/www/html/
+
+                # This is required to inform Nextcloud that it shouldn't be setting
+                # headers itself. That's the job of the reverse proxy
+                env modHeadersAvailable true
+        }
+
+        redir /.well-known/carddav /remote.php/dav 301 permanent
+        redir /.well-known/caldav /remote.php/dav 301 permanent
+
+        @forbidden {
+                path /.htaccess
+                path /data/*
+                path /config/*
+                path /db_structure
+                path /.xml
+                path /README
+                path /3rdparty/*
+                path /lib/*
+                path /templates/*
+                path /occ
+                path /console.php
+        }
+        respond @forbidden "Access Denied" 403 {
+                close
+        }
+        import web_analytics
+        import security_headers
+}
+
+metrics.bulba.space {
+        import security_headers
+        import web_analytics
+        basic_auth {
+                admin $2a$14$/pMYYzIlniwZgFO7IvNCveax0OXzRpzROnE5krjtiZi5OhECQwpNi
+        }
+
+        handle /ws* {
+                reverse_proxy goaccess:7890
+        }
+
+        handle {
+                root * /var/www/goaccess
+                file_server
+        }
+}
+
+collabora.bulba.space {
+        reverse_proxy https://nextcloud-collabora:9980 {
+                transport http {
+                        tls
+                        tls_insecure_skip_verify
+                }
+        }
+        import web_analytics
+        import security_headers
+}

home-manager/homeserver/containers/media.nix

@@ -20,6 +20,7 @@
         "/home/cianh/TV_Archive/jf_cache:/cache:Z"
       ];
       userNS = "keep-id";
+      devices = [ "/dev/dri:/dev/dri" ];
     };
   };
 }

home-manager/homeserver/containers/metrics.nix

@@ -11,7 +11,7 @@
     containers = {
       goaccess = {
         image = "docker.io/allinurl/goaccess:latest";
-        exec = "--output=/var/www/goaccess/index.html --log-file=/var/log/caddy/access.log --log-format=CADDY --tz=Europe/Dublin --anonymize-ip --real-time-html --ws-url=wss://metrics.bulba.space:443/ws --port=7890 --origin=metrics.bulba.space";
+        exec = "--output=/var/www/goaccess/index.html --log-file=/var/log/caddy/access.log --log-format=CADDY --tz=Europe/Dublin --anonymize-ip --real-time-html --ws-url=wss://metrics.bulba.space:443/ws --port=7890 --origin=https://metrics.bulba.space";
         autoUpdate = "registry";
         network = [
           "proxy-net"
@@ -20,6 +20,13 @@
           "/home/cianh/caddy/logs:/var/log/caddy:Z"
           "/home/cianh/goaccess/site:/var/www/goaccess"
         ];
+        extraConfig = {
+          Unit = {
+            After = "podman-caddy.service";
+            Requires = "podman-caddy.service";
+            PartOf = "podman-caddy.service";
+          };
+        };
       };
     };
   };

home-manager/homeserver/containers/nextcloud.nix

@@ -27,14 +27,15 @@
           MYSQL_DATABASE = "nextcloud";
           MYSQL_USER = "nextcloud";
           MYSQL_PASSWORD = config.sops.secrets.nextcloud-db_password.path;
+          REDIS_HOST = "nextcloud-redis";
         };
         volumes = [
           "/home/cianh/Nextcloud/:/var/www/html"
         ];
         extraConfig = {
           Unit = {
-            After = "podman-nextcloud-db.service";
+            After = [ "podman-nextcloud-db.service" "podman-nextcloud-redis.service" ];
-            Requires = "podman-nextcloud-db.service";
+            Requires = [ "podman-nextcloud-db.service" "podman-nextcloud-redis.service" ];
           };
         };
       };
@@ -52,6 +53,11 @@
           "/home/cianh/nextcloud_db:/var/lib/mysql"
         ];
       };
+      nextcloud-redis = {
+        image = "docker.io/library/redis:alpine";
+        autoUpdate = "registry";
+        network = ["nextcloud-net"];
+      };
       nextcloud-collabora = {
         image = "docker.io/collabora/code:latest";
         autoUpdate = "registry";
@@ -59,9 +65,6 @@
           "nextcloud-net"
           "proxy-net"
         ];
-        ports = [
-          "9980:9980"
-        ];
         environment = {
           username = "admin";
           password = config.sops.secrets.nextcloud-collabora_password.path;
@@ -72,4 +75,30 @@
       };
     };
   };
+
+  systemd.user.services.nextcloud-cron = {
+    Unit = {
+      Description = "Nextcloud cron.php job";
+      Requires = [ "podman-nextcloud.service" ];
+      After = [ "podman-nextcloud.service" ];
+    };
+    Service = {
+      Type = "oneshot";
+      ExecStart = "${pkgs.podman}/bin/podman exec --user www-data nextcloud php -f /var/www/html/cron.php";
+    };
+  };
+
+  systemd.user.timers.nextcloud-cron = {
+    Unit = {
+      Description = "Run Nextcloud cron.php every 5 minutes";
+    };
+    Timer = {
+      OnBootSec = "5m";
+      OnUnitActiveSec = "5m";
+      Unit = "nextcloud-cron.service";
+    };
+    Install = {
+      WantedBy = [ "timers.target" ];
+    };
+  };
 }

home-manager/homeserver/containers/work_tools.nix

@@ -71,7 +71,6 @@
           "/home/cianh/freshrss/data:/var/www/FreshRSS/data"
           "/home/cianh/freshrss/extensions:/var/www/FreshRSS/extensions"
         ];
-        ports = ["3457:80"];
         extraPodmanArgs = [
           "--log-opt max-size=10m"
         ];

home-manager/worklaptop/defaultapps.nix

@@ -7,13 +7,50 @@
   unstablePkgs,
   ...
 }: {
-  xdg.mimeApps.defaultApplications = {
+  xdg.mimeApps = {
-    "inode/directory" = "thunar.desktop";
+    enable = true;
-    "application/zip" = "xarchiver.desktop";
+    defaultApplications = {
-    "text/html" = "zen.desktop";
+      # Directories and Archives
-    "x-scheme-handler/http" = "zen.desktop";
+      "inode/directory" = "thunar.desktop";
-    "x-scheme-handler/https" = "zen.desktop";
+      "application/zip" = "xarchiver.desktop";
-    "x-scheme-handler/about" = "zen.desktop";
+
-    "x-scheme-handler/unknown" = "zen.desktop";
+      # PDFs
+      "application/pdf" = "sioyek.desktop";
+
+      # Web Browser (Vivaldi)
+      "text/html" = "vivaldi-stable.desktop";
+      "x-scheme-handler/http" = "vivaldi-stable.desktop";
+      "x-scheme-handler/https" = "vivaldi-stable.desktop";
+      "x-scheme-handler/about" = "vivaldi-stable.desktop";
+      "x-scheme-handler/unknown" = "vivaldi-stable.desktop";
+
+      # Text and Code (Neovide)
+      "text/plain" = "neovide.desktop";
+      "text/markdown" = "neovide.desktop";
+
+      # TeX and LaTeX (TeXstudio)
+      "text/x-tex" = "texstudio.desktop";
+      "text/x-latex" = "texstudio.desktop";
+
+      # Images (imv)
+      "image/jpeg" = "imv.desktop";
+      "image/png" = "imv.desktop";
+      "image/gif" = "imv.desktop";
+      "image/webp" = "imv.desktop";
+      "image/svg+xml" = "imv.desktop";
+      "image/tiff" = "imv.desktop";
+      "image/bmp" = "imv.desktop";
+
+      # Office Files (OnlyOffice)
+      "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = "onlyoffice-desktopeditors.desktop"; # .docx
+      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" = "onlyoffice-desktopeditors.desktop"; # .xlsx
+      "application/vnd.openxmlformats-officedocument.presentationml.presentation" = "onlyoffice-desktopeditors.desktop"; # .pptx
+      "application/msword" = "onlyoffice-desktopeditors.desktop"; # .doc
+      "application/vnd.ms-excel" = "onlyoffice-desktopeditors.desktop"; # .xls
+      "application/vnd.ms-powerpoint" = "onlyoffice-desktopeditors.desktop"; # .ppt
+      "application/vnd.oasis.opendocument.text" = "onlyoffice-desktopeditors.desktop"; # .odt
+      "application/vnd.oasis.opendocument.spreadsheet" = "onlyoffice-desktopeditors.desktop"; # .ods
+      "application/vnd.oasis.opendocument.presentation" = "onlyoffice-desktopeditors.desktop"; # .odp
+    };
   };
 }

home-manager/worklaptop/packages.nix

@@ -6,37 +6,50 @@
   pkgs,
   unstablePkgs,
   nixers,
+  antigravityPkgs,
   ...
 }: let
+  patchedQuarto = pkgs.quarto.overrideAttrs (oldAttrs: {
+    postPatch =
+      (oldAttrs.postPatch or "")
+      + ''
+        substituteInPlace bin/quarto.js \
+          --replace-fail "syntax-highlighting" "highlight-style"
+      '';
+  });
 in {
   home.packages = [
-    pkgs.bitwarden-desktop
     pkgs.babashka
-    pkgs.bat-extras.batman
+    unstablePkgs.bat-extras.batman
-    pkgs.bat-extras.batdiff
+    unstablePkgs.bat-extras.batdiff
-    pkgs.bat-extras.batgrep
+    unstablePkgs.bat-extras.batgrep
-    pkgs.bat-extras.prettybat
+    unstablePkgs.bat-extras.prettybat
+    unstablePkgs.blender
     pkgs.broot
     pkgs.clapper
     pkgs.cliphist
     pkgs.distrobox
     pkgs.dvc
     pkgs.feh
+    unstablePkgs.gimp-with-plugins
     pkgs.git-lfs
     pkgs.go
     unstablePkgs.gurk-rs
     pkgs.has
     pkgs.hyperfine
     pkgs.imagemagick
+    pkgs.imv
+    unstablePkgs.inkscape
     pkgs.jujutsu
+    unstablePkgs.krita
     pkgs.kubectl
     pkgs.lnav
     pkgs.lynx
     pkgs.minikube
     unstablePkgs.mission-center
     pkgs.neovide
+    unstablePkgs.nil
     pkgs.nix-tree
-    pkgs.nh
     pkgs.nodejs_24
     pkgs.nwg-look
     unstablePkgs.obsidian
@@ -46,13 +59,20 @@ in {
     unstablePkgs.podman-compose
     unstablePkgs.podman-desktop
     unstablePkgs.podman-tui
+    pkgs.poppler
     pkgs.popsicle
     nixers.python-env
+    patchedQuarto
     nixers.rbw-autofill
     unstablePkgs.ruff
-    pkgs.signal-desktop
+    unstablePkgs.signal-desktop
+    pkgs.sioyek
     unstablePkgs.sone
     pkgs.sshs
+    pkgs.texliveFull
+    pkgs.texstudio
+    unstablePkgs.ty
+    unstablePkgs.typst
     unstablePkgs.uv
     pkgs.vial
     nixers.vivaldi-wayland
@@ -63,7 +83,6 @@ in {
     pkgs.xarchiver
     pkgs.yubikey-agent
     pkgs.yubikey-manager
-    pkgs.zathura
     pkgs.zeal
     unstablePkgs.zed-editor
     unstablePkgs.zotero
@@ -79,5 +98,9 @@ in {
     pkgs.steam-run
     pkgs.tree-sitter
     unstablePkgs.vimPlugins.mason-lspconfig-nvim
+    # LLM Agentic DE
+    antigravityPkgs.google-antigravity-no-fhs
+    antigravityPkgs.google-antigravity-ide-no-fhs
+    antigravityPkgs.google-antigravity-cli
   ];
 }

home-manager/worklaptop/services.nix

@@ -15,8 +15,8 @@
     Unit = {
       Description = "Ghostty Terminal Emulator";
       X-SwitchMethod = "keep-old";
+      X-RestartIfChanged = false;
       After = ["graphical-session.target"];
-      PartOf = ["graphical-session.target"];
     };
     Service = {
       ExecStart = "${lib.getExe config.programs.ghostty.package}";

home-manager/worklaptop/theming.nix

@@ -12,16 +12,16 @@
   gtk = {
     enable = true;
     iconTheme = {
-      name = theme.iconTheme.name;
+      inherit (theme.iconTheme) name;
-      package = theme.iconTheme.package;
+      inherit (theme.iconTheme) package;
     };
     theme = {
-      name = theme.gtkTheme.name;
+      inherit (theme.gtkTheme) name;
-      package = theme.gtkTheme.package;
+      inherit (theme.gtkTheme) package;
     };
     cursorTheme = {
-      name = theme.cursorTheme.name;
+      inherit (theme.cursorTheme) name;
-      package = theme.cursorTheme.package;
+      inherit (theme.cursorTheme) package;
     };
     gtk2.extraConfig = ''
       gtk-theme-name="Tokyonight-Dark"
@@ -33,10 +33,13 @@
         gtk-application-prefer-dark-theme=1
       '';
     };
-    gtk4.extraConfig = {
+    gtk4 = {
-      Settings = ''
+      inherit (config.gtk) theme;
-        gtk-application-prefer-dark-theme=1
+      extraConfig = {
-      '';
+        Settings = ''
+          gtk-application-prefer-dark-theme=1
+        '';
+      };
     };
   };
 

justfile

@@ -39,6 +39,20 @@ commit-lock:
 
 # Sync git and update flake inputs (override with git=false or flake=false)
 prebuild:
+    @if [ -n "$(git ls-files --others --exclude-standard)" ]; then \
+        echo "⚠️  WARNING: You have untracked files in your repository."; \
+        echo "Nix flakes cannot see untracked files. They will not be included in this build."; \
+        echo "The untracked files are:"; \
+        git ls-files --others --exclude-standard; \
+        echo ""; \
+        read -p "Do you want to run 'git add -A' before building? (y/N) " choice; \
+        if [[ "$choice" == [Yy]* ]]; then \
+            echo ">> Staging files..."; \
+            git add -A; \
+        else \
+            echo ">> Proceeding without staging. Untracked files will be ignored by Nix."; \
+        fi; \
+    fi
     @if [ "{{git}}" == "true" ]; then \
         echo ">> Syncing Git..."; \
         just _git-sync; \

nixos/core/packages.nix

@@ -8,7 +8,7 @@
 }: {
   environment.systemPackages = [
     pkgs.atuin
-    pkgs.bat
+    unstablePkgs.bat
     pkgs.bottom
     pkgs.delta
     pkgs.dust
@@ -21,6 +21,7 @@
     pkgs.git
     pkgs.git-extras
     pkgs.git-filter-repo
+    pkgs.git-lfs
     pkgs.glab
     pkgs.glow
     pkgs.gnupg
@@ -28,6 +29,7 @@
     pkgs.hexyl
     pkgs.killall
     pkgs.libsecret
+    pkgs.luaPackages.fennel
     pkgs.micro
     pkgs.netcat-gnu
     pkgs.nix-index
@@ -42,6 +44,7 @@
     pkgs.rm-improved
     pkgs.starship
     pkgs.tealdeer
+    pkgs.tree-sitter
     pkgs.wget
     pkgs.wl-clipboard
     pkgs.wtype

nixos/homeserver.nix

@@ -50,11 +50,6 @@
   nix = {
     registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
     nixPath = ["nixpkgs=${inputs.nixpkgs}"];
-    gc = {
-      automatic = true;
-      dates = "daily";
-      options = "--delete-older-than 14d";
-    };
     settings = {
       experimental-features = "nix-command flakes";
       auto-optimise-store = true;

nixos/homeserver/hardware-configuration.nix

@@ -1,32 +1,39 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
-    ];
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot = {
-  boot.initrd.kernelModules = [ ];
+    initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"];
-  boot.kernelModules = [ "kvm-intel" ];
+    initrd.kernelModules = [];
-  boot.extraModulePackages = [ ];
+    kernelModules = ["kvm-intel"];
+    extraModulePackages = [];
+  };
 
-  fileSystems."/" =
+  fileSystems = {
-    { device = "/dev/disk/by-uuid/b6757b17-330d-4820-a45f-bad5e7f06516";
+    "/" = {
+      device = "/dev/disk/by-uuid/b6757b17-330d-4820-a45f-bad5e7f06516";
       fsType = "ext4";
     };
-
+    "/boot" = {
-  fileSystems."/boot" =
+      device = "/dev/disk/by-uuid/AAE3-7115";
-    { device = "/dev/disk/by-uuid/AAE3-7115";
       fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
+      options = ["fmask=0077" "dmask=0077"];
     };
+  };
 
-  swapDevices =
+  swapDevices = [
-    [ { device = "/dev/disk/by-uuid/173de2f3-09e8-4175-9f52-c8b6ea970ad5"; }
+    {device = "/dev/disk/by-uuid/173de2f3-09e8-4175-9f52-c8b6ea970ad5";}
-    ];
+  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

nixos/worklaptop.nix

@@ -42,13 +42,13 @@
       ];
     };
     nvidia = {
+      branch = "legacy_535";
       # Modesetting is required.
       modesetting.enable = true;
       powerManagement.enable = false;
       powerManagement.finegrained = false;
       open = false;
       nvidiaSettings = true;
-      package = config.boot.kernelPackages.nvidiaPackages.stable;
       prime = {
         sync.enable = true;
         intelBusId = "PCI:0:2:0";

nixos/worklaptop/hardware-configuration.nix

@@ -12,25 +12,27 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
+  boot = {
-  boot.initrd.kernelModules = [];
+    initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
-  boot.kernelModules = ["kvm-intel"];
+    initrd.kernelModules = [];
-  boot.extraModulePackages = [];
+    kernelModules = ["kvm-intel"];
-
+    extraModulePackages = [];
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/1eec95dd-9663-4a46-8b6f-10f7754322fa";
-    fsType = "ext4";
   };
 
-  fileSystems."/boot/efi" = {
+  fileSystems = {
-    device = "/dev/disk/by-uuid/056D-249D";
+    "/" = {
-    fsType = "vfat";
+      device = "/dev/disk/by-uuid/1eec95dd-9663-4a46-8b6f-10f7754322fa";
-    options = ["fmask=0022" "dmask=0022"];
+      fsType = "ext4";
-  };
+    };
-
+    "/boot/efi" = {
-  fileSystems."/home" = {
+      device = "/dev/disk/by-uuid/056D-249D";
-    device = "/dev/disk/by-uuid/92c16a05-22ad-436d-a6ca-37d5f0c2cc3d";
+      fsType = "vfat";
-    fsType = "ext4";
+      options = ["fmask=0022" "dmask=0022"];
+    };
+    "/home" = {
+      device = "/dev/disk/by-uuid/92c16a05-22ad-436d-a6ca-37d5f0c2cc3d";
+      fsType = "ext4";
+    };
   };
 
   swapDevices = [

nixos/worklaptop/packages.nix

@@ -26,8 +26,8 @@
     nixers.walker
     pkgs.wayland
     pkgs.wayland-utils
-    pkgs.xfce.thunar
+    pkgs.thunar
-    pkgs.xfce.tumbler
+    pkgs.tumbler
     pkgs.xh
     unstablePkgs.ghostty
     unstablePkgs.hyprland

nixos/worklaptop/programs.nix

@@ -13,21 +13,25 @@ in {
   programs = {
     uwsm = {
       enable = true;
-      waylandCompositors.hyprland.binPath = lib.mkForce "/run/current-system/sw/bin/start-hyprland";
+      waylandCompositors.hyprland = {
+        binPath = lib.mkForce "/run/current-system/sw/bin/start-hyprland";
+        prettyName = "Hyprland";
+        comment = "Hyprland managed by UWSM";
+      };
     };
     regreet = {
       enable = true;
       theme = {
-        name = theme.gtkTheme.name;
+        inherit (theme.gtkTheme) name;
-        package = theme.gtkTheme.package;
+        inherit (theme.gtkTheme) package;
       };
       cursorTheme = {
-        name = theme.cursorTheme.name;
+        inherit (theme.cursorTheme) name;
-        package = theme.cursorTheme.package;
+        inherit (theme.cursorTheme) package;
       };
       iconTheme = {
-        name = theme.iconTheme.name;
+        inherit (theme.iconTheme) name;
-        package = theme.iconTheme.package;
+        inherit (theme.iconTheme) package;
       };
       font = {
         name = "Noto Sans";
@@ -54,9 +58,9 @@ in {
     thunar = {
       enable = true;
       plugins = [
-        pkgs.xfce.thunar-volman
+        pkgs.thunar-volman
-        pkgs.xfce.thunar-archive-plugin
+        pkgs.thunar-archive-plugin
-        pkgs.xfce.thunar-media-tags-plugin
+        pkgs.thunar-media-tags-plugin
       ];
     };
     xfconf.enable = true;