alpine: many changes

- updates
- snapserver
- graphana dashboards
- loki
- ddclient
- arr suite, jellyseer
- mautrix fixes

flake.nix

@@ -1,22 +1,25 @@
 {
   description = "A flake using my config";
-
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
-    stable-nixpkgs.url = "nixpkgs/nixos-23.11";
     home-manager = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    home-manager-cosmic.url = "github:tristanbeedell/home-manager/cosmic";
     stylix.url = "github:danth/stylix";
-    # hyprland = {
-    #   url = "github:hyprwm/Hyprland/v0.36.0";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
     sops-nix.url = "github:Mic92/sops-nix";
+    nixos-cosmic = {
+      url = "github:lilyinstarlight/nixos-cosmic";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nixvim = {
+      url = "github:nix-community/nixvim";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = inputs: let
+  outputs = {nixvim, ...} @ inputs: let
     system = "x86_64-linux";
     pkgs = import inputs.nixpkgs {inherit system;};
     user = "tristan";
@@ -27,51 +30,57 @@
   in {
     formatter.${system} = pkgs.alejandra;
     nixosConfigurations = {
-      zenix =
-        mkConf [
+      zenix = mkConf {
+        nixos-modules = [
           ./hardware/zenix.nix
-          (auto-login "Hyprland")
+          ./nixos/programs/cosmic.nix
           ./nixos/programs/gamer.nix
           ./nixos/programs/personal.nix
           ./nixos/workstation.nix
-        ] [
-          ./home/workstation.nix
-          ./home/desktop/hyprland/.
+        ];
+        home-modules = [
           ./home/programs/graphical.nix
           ./home/programs/gamer.nix
           ./home/programs/personal/.
-          ./home/programs/xr.nix
         ];
+      };
 
-      FCS-Tristan-Nixbook =
-        mkConf [
-          # inputs.hyprland.nixosModules.default
+      FCS-Tristan-Nixbook = mkConf {
+        nixos-modules = [
           ./hardware/fcs-tristan-nixbook.nix
-          (auto-login "Hyprland")
-          ./nixos/modules/work.nix
+          # (auto-login "Hyprland")
+          # ./nixos/programs/hyprland.nix
           ./nixos/workstation.nix
-        ] [
-          ./home/workstation.nix
-          ./home/desktop/hyprland/.
+          ./nixos/modules/work.nix
+          ./nixos/programs/cosmic.nix
+        ];
+        home-modules = [
           ./home/programs/work.nix
           ./home/programs/graphical.nix
         ];
+      };
 
-      alpine = mkConf [
-        ./hardware/alpine.nix
-        ./nixos/services/anki.nix
-        ./nixos/services/forgejo.nix
-        ./nixos/services/vaultwarden.nix
-        ./nixos/services/jellyfin.nix
-        ./nixos/services/mpd.nix
-        ./nixos/services/prometheus.nix
-        ./nixos/services/grafana.nix
-        ./nixos/services/synapse.nix
-        ./nixos/services/mautrix/whatsapp.nix
-        ./nixos/services/mautrix/signal.nix
-        ./nixos/services/nextcloud.nix
-        ./nixos/services/ntfy.nix
-      ] [];
+      alpine = mkConf {
+        nixos-modules = [
+          ./hardware/alpine.nix
+          ./nixos/services/anki.nix
+          ./nixos/services/forgejo.nix
+          ./nixos/services/vaultwarden.nix
+          ./nixos/services/jellyfin.nix
+          ./nixos/services/mpd.nix
+          ./nixos/services/prometheus.nix
+          ./nixos/services/grafana.nix
+          ./nixos/services/loki.nix
+          ./nixos/services/synapse/.
+          ./nixos/services/mautrix/whatsapp.nix
+          ./nixos/services/mautrix/signal.nix
+          ./nixos/services/nextcloud.nix
+          ./nixos/services/ntfy.nix
+          ./nixos/services/authentik.nix
+          ./nixos/services/monero.nix
+          ./nixos/services/arr.nix
+        ];
+      };
 
       vm-sway =
         builtins.trace ''
@@ -81,14 +90,30 @@
           start the vm with '-vga qxl' or '-vga virtio'
         ''
         mkConf
-        [
-          ./hardware/vm.nix
-          (auto-login "sway")
-          ./nixos/workstation.nix
-        ] [
-          ./home/desktop/sway/.
-          ./home/workstation.nix
-        ];
+        {
+          nixos-modules = [
+            ./hardware/vm.nix
+            (auto-login "sway")
+            ./nixos/workstation.nix
+          ];
+          home-modules = [
+            ./home/desktop/sway/.
+            ./home/workstation.nix
+          ];
+        };
+
+      vm-cosmic =
+        mkConf
+        {
+          nixos-modules = [
+            ./hardware/vm.nix
+            ./nixos/workstation.nix
+            ./nixos/programs/cosmic.nix
+          ];
+          home-modules = [
+            ./home/workstation.nix
+          ];
+        };
 
       vm-hyprland =
         builtins.trace ''
@@ -100,18 +125,33 @@
           start with '-vga virtio'
         ''
         mkConf
-        [
-          ./hardware/vm.nix
-          (auto-login "Hyprland")
-          ./nixos/workstation.nix
-        ] [
-          ./home/desktop/hyprland/.
-          ./home/workstation.nix
-        ];
+        {
+          nixos-modules = [
+            ./hardware/vm.nix
+            (auto-login "Hyprland")
+            ./nixos/programs/hyprland.nix
+          ];
+        };
 
-      vm-tty = mkConf [
-        ./hardware/vm.nix
-      ] [];
+      vm-tty =
+        mkConf
+        {
+          nixos-modules = [
+            ./hardware/vm.nix
+          ];
+        };
+    };
+
+    packages.${system} = {
+      nixvim = let
+        nixvim' = nixvim.legacyPackages.${system};
+        nixvimModule = {
+          inherit pkgs;
+          module = import ./lib/nixvim.nix;
+        };
+        nvim = nixvim'.makeNixvimWithModule nixvimModule;
+      in
+        nvim;
     };
   };
 }