[mcp] Updates to 25.05 and adds FreshRSS. Removes Focalboard and Bookstack

flake.lock

@@ -3,83 +3,36 @@
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs-stable"
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1746040799,
+        "lastModified": 1747556831,
-        "narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=",
+        "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5f217e5a319f6c186283b530f8c975e66c028433",
+        "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager-unstable": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-unstable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1746040799,
-        "narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "5f217e5a319f6c186283b530f8c975e66c028433",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 0,
+        "lastModified": 1747610100,
-        "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
+        "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
-        "path": "/nix/store/fwhfa9pbx8vdi8nd5pcys665baz6xdxf-source",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1744168086,
-        "narHash": "sha256-S9M4HddBCxbbX1CKSyDYgZ8NCVyHcbKnBfoUXeRu2jQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "60e405b241edb6f0573f3d9f944617fe33ac4a73",
+        "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1744098102,
-        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -87,17 +40,14 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "home-manager-unstable": "home-manager-unstable",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-stable": "nixpkgs-stable",
-        "nixpkgs-unstable": "nixpkgs-unstable",
         "sops-nix": "sops-nix"
       }
     },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs-stable"
+          "nixpkgs"
         ]
       },
       "locked": {

flake.nix

@@ -2,35 +2,16 @@
   description = "System Configuration";
 
   inputs = {
-    nixpkgs-unstable = {
+    nixpkgs = {
-      url = "github:nixos/nixpkgs?ref=nixos-unstable";
+      url = "github:nixos/nixpkgs?ref=nixos-25.05";
-    };
-    nixpkgs-stable = {
-      url = "github:nixos/nixpkgs?ref=nixos-24.11";
     };
     home-manager = {
-      url = "github:nix-community/home-manager";
+      url = "github:nix-community/home-manager?ref=release-25.05";
-      inputs.nixpkgs.follows = "nixpkgs-stable";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
-    home-manager-unstable = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
-    };
-    # hyprland = {
-    #   url = "github:hyprwm/Hyprland";
-    #   inputs.nixpkgs.follows = "nixpkgs-unstable";
-    # };
-    # hy3 = {
-    #   url = "github:outfoxxed/hy3";
-    #   inputs.hyprland.follows = "hyprland";
-    # };
-    # split-monitor-workspaces = {
-    #   url = "github:Duckonaut/split-monitor-workspaces";
-    #   inputs.hyprland.follows = "hyprland";
-    # };
     sops-nix = {
       url = "github:Mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs-stable";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
@@ -38,17 +19,17 @@
     { self, nixpkgs, ... }@inputs:
     let
       local = import ./lib;
-      # TODO: Convert other configurations to use this function.
       mkNixosConfig =
         {
           path,
           system ? "x86_64-linux",
-          nixpkgs ? inputs.nixpkgs-stable,
+          nixpkgs ? inputs.nixpkgs,
+          homemanager ? inputs.home-manager,
         }:
         nixpkgs.lib.nixosSystem {
           inherit system;
           modules = [
-            inputs.home-manager.nixosModules.home-manager
+            homemanager.nixosModules.home-manager
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
@@ -67,11 +48,9 @@
       nixosConfigurations = {
         altair = mkNixosConfig {
           path = ./system/hosts/altair;
-          nixpkgs = inputs.nixpkgs-unstable; # Required for Tailwind until 25.05 is cut
         };
         vega = mkNixosConfig {
           path = ./system/hosts/vega;
-          nixpkgs = inputs.nixpkgs-unstable; # Required for Tailwind until 25.05 is cut
         };
         mcp = mkNixosConfig {
           path = ./system/hosts/mcp;

system/hosts/mcp/containers.nix

@@ -3,8 +3,7 @@
 {
   # Additional configuration
   imports = [
-    ./containers/bookstack.nix
+    ./containers/freshrss.nix
-    ./containers/focalboard.nix
     ./containers/gitea.nix
     ./containers/grafana.nix
     ./containers/jobhunt.nix

system/hosts/mcp/containers/freshrss.nix

@@ -0,0 +1,20 @@
+{ config, ... }:
+let
+  inherit (import ./lib.nix config) mkContainer havenisms;
+in {
+  virtualisation.oci-containers.containers.freshrss = mkContainer {
+    image = "lscr.io/linuxserver/freshrss:latest";
+    hostName = "freshrss";
+    domain = havenisms;
+    port = "80";
+    homepageOpts = {
+      group = "Apps";
+      name = "FreshRSS";
+      icon = "freshrss.svg";
+      description = "Feed aggregator";
+    };
+    volumes = [
+      "/tank/config/freshrss:/config"
+    ];
+  };
+}