updates

common/default.nix

@@ -1,4 +1,5 @@
-{ lib, inputs, pkgs, ... }: {
+{ lib, inputs, ... }:
+{
   imports = [
     ./users
     ./modules
@@ -7,8 +8,14 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    extraSpecialArgs = { inherit inputs; };
-    sharedModules = [ ./hm-modules inputs.nixvim.homeManagerModules.nixvim ];
+    extraSpecialArgs = {
+      inherit inputs;
+    };
+    sharedModules = [
+      ./hm-modules
+      inputs.nixvim.homeManagerModules.nixvim
+      inputs.catppuccin.homeManagerModules.catppuccin
+    ];
   };
 
   virtualisation.oci-containers.backend = lib.mkDefault "podman";
@@ -29,12 +36,15 @@
 
   # Nix Settings
   nix = {
-    registry.nixpkgs.flake = inputs.nixpkgs;
-    nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
+    # registry.nixpkgs.flake = inputs.nixpkgs;
+    # nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
     # package = pkgs.nixUnstable;
     settings = {
       auto-optimise-store = true;
-      trusted-users = [ "root" "vivian" ];
+      trusted-users = [
+        "root"
+        "vivian"
+      ];
       substituters = [
         "https://nix-community.cachix.org"
         "https://nixpkgs-review-bot.cachix.org"

common/hm-modules/catppuccin/default.nix

@@ -26,6 +26,11 @@ in
     enable = mkEnableOption "catppuccin";
   };
   config = mkIf cfg.enable {
+    catppuccin = {
+      flavor = "frappe";
+      accent = "pink";
+    };
+
     home.pointerCursor = {
       name = "Bibata_Ghost";
       size = 24;
@@ -39,14 +44,15 @@ in
 
     gtk = {
       enable = true;
-      theme = {
-        name = "Catppuccin-Frappe-Standard-Pink-Dark";
-        package = pkgs.catppuccin-gtk.override {
-          accents = [ "pink" ];
-          variant = "frappe";
-          size = "standard";
-        };
-      };
+      # theme = {
+      #   name = "Catppuccin-Frappe-Standard-Pink-Dark";
+      #   package = pkgs.catppuccin-gtk.override {
+      #     accents = [ "pink" ];
+      #     variant = "frappe";
+      #     size = "standard";
+      #   };
+      # };
+
       iconTheme = {
         name = "Papirus-Dark";
         package = pkgs.papirus-icon-theme.override { color = "violet"; };
@@ -56,31 +62,34 @@ in
       };
     };
 
-    qt = {
-      enable = true;
-      platformTheme = "qtct";
-      style.name = "kvantum";
-    };
+    # qt = {
+    #   enable = true;
+    #   # platformTheme = "qtct";
+    #   style.name = "kvantum";
+    #   platformTheme.name = "kvantum";
+    # };
 
-    xdg.configFile = {
-      "Kvantum/kvantum.kvconfig".text = ''
-        [General]
-        theme=Catppuccin-Frappe-Pink
-      '';
-    };
+    # xdg.configFile = {
+    #   "Kvantum/kvantum.kvconfig".text = ''
+    #     [General]
+    #     theme=Catppuccin-Frappe-Pink
+    #   '';
+    # };
 
     home.packages = with pkgs; [
-      (catppuccin-kvantum.override {
-        accent = "Pink";
-        variant = "Frappe";
-      })
+      # (catppuccin-kvantum.override {
+      #   accent = "Pink";
+      #   variant = "Frappe";
+      # })
     ];
 
-    programs.mako.extraConfig = readFile "${mako}/src/frappe";
-
-    programs.starship.settings = {
-      palette = "catppuccin_frappe";
-    } //fromTOML (readFile "${starship}/palettes/frappe.toml");
+    services.mako.catppuccin.enable = true;
+    # programs.mako.extraConfig = readFile "${mako}/src/frappe";
+    #
+    # programs.starship.settings = {
+    #   palette = "catppuccin_frappe";
+    # } //fromTOML (readFile "${starship}/palettes/frappe.toml");
+    #
 
     programs.vscode = {
       userSettings."workbench.colorTheme" = "Catppuccin Frappé";

common/hm-modules/nvim/default.nix

@@ -37,6 +37,7 @@ with lib;
         conceallevel = 2;
         expandtab = true;
         tabstop = 2;
+
         shiftwidth = 2;
         smartindent = true;
       };

common/modules/flood.nix

@@ -1,8 +1,8 @@
 { config, pkgs, lib, ... }:
 with lib;
-let cfg = config.services.flood;
+let cfg = config.services.v.flood;
 in {
-  options.services.flood = {
+  options.services.v.flood = {
     enable = mkEnableOption "flood";
 
     user = mkOption {
@@ -94,7 +94,7 @@ in {
       type = types.bool;
       default = false;
       description = ''
-        Enable SSL. 
+        Enable SSL.
         key.pem and fullchain.pem needed in runtime directory.
       '';
     };