refactor(module): clean up some module inputs

feat(module): add use-lix option to nix module

feat(module): update fish config for catppuccin

flake.lock

@@ -36,11 +36,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1694529238,
+        "lastModified": 1710146030,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -51,7 +51,7 @@
     },
     "flake-utils-plus": {
       "inputs": {
-        "flake-utils": "flake-utils"
+        "flake-utils": "flake-utils_2"
       },
       "locked": {
         "lastModified": 1715533576,
@@ -68,6 +68,39 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flakey-profile": {
+      "locked": {
+        "lastModified": 1712898590,
+        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "type": "github"
+      }
+    },
     "hardware": {
       "locked": {
         "lastModified": 1724878143,
@@ -104,6 +137,41 @@
         "type": "github"
       }
     },
+    "lix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1723503926,
+        "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
+        "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
+      }
+    },
+    "lix-module": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "flakey-profile": "flakey-profile",
+        "lix": "lix",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723510904,
+        "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
+        "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
+      }
+    },
     "nix-flatpak": {
       "locked": {
         "lastModified": 1711997201,
@@ -141,6 +209,7 @@
         "catppuccin": "catppuccin",
         "hardware": "hardware",
         "home-manager": "home-manager",
+        "lix-module": "lix-module",
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs",
         "snowfall-lib": "snowfall-lib"
@@ -182,6 +251,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

homes/x86_64-linux/jo@puzzlevision/apps/gnome.nix

@@ -20,6 +20,7 @@
     appindicator
     unite
     color-picker
+    clipboard-history
   ];
 
   # Use `dconf watch /` to track stateful changes you are doing, then set them here.
@@ -44,6 +45,7 @@
         "appindicatorsupport@rgcjonas.gmail.com"
         "unite@hardpixel.eu"
         "color-picker@tuberry"
+        "clipboard-history@alexsaveau.dev"
       ];
     };
 

modules/home/apps/development/zed-editor.nix

@@ -2,32 +2,25 @@
   lib,
   pkgs,
   inputs,
-
+  namespace,
-  namespace, # The flake namespace, set in flake.nix. If not set, defaults to "internal".
-  home, # The home architecture for this host (eg. `x86_64-linux`).
-  target, # The Snowfall Lib target for this home (eg. `x86_64-home`).
-  format, # A normalized name for the home target (eg. `home`).
-  virtual, # A boolean to determine whether this home is a virtual target using nixos-generators.
-  host, # The host name for this home.
-
   config,
   ...
 }: with lib; with lib.${namespace};
 let
-    cfg = config.${namespace}.apps.zed-editor;
+  cfg = config.${namespace}.apps.zed-editor;
 
-    zed-fhs = pkgs.buildFHSUserEnv {
+  zed-fhs = pkgs.buildFHSUserEnv {
-        name = "zed";
+    name = "zed";
-        targetPkgs = pkgs:
+    targetPkgs = pkgs:
-        with pkgs; [
+    with pkgs; [
-            zed-editor
+      zed-editor
-        ];
+    ];
-        runScript = "zed";
+    runScript = "zed";
-    };
+  };
 in {
-    options.${namespace}.apps.zed-editor = { enable = mkEnableOption "zed-editor"; };
+  options.${namespace}.apps.zed-editor = { enable = mkEnableOption "zed-editor"; };
 
-    config = mkIf cfg.enable {
+  config = mkIf cfg.enable {
-        home.packages = [zed-fhs];
+    home.packages = [zed-fhs];
-    };
+  };
 }

modules/home/development/ssh/default.nix

@@ -2,14 +2,7 @@
   lib,
   pkgs,
   inputs,
-
+  namespace,
-  namespace, # The flake namespace, set in flake.nix. If not set, defaults to "internal".
-  system, # The home architecture for this host (eg. `x86_64-linux`).
-  target, # The Snowfall Lib target for this home (eg. `x86_64-home`).
-  format, # A normalized name for the home target (eg. `home`).
-  virtual, # A boolean to determine whether this home is a virtual target using nixos-generators.
-  host, # The host name for this home.
-
   config,
   ...
 }: let

modules/home/themes/catppuccin/fish/default.nix

@@ -2,5 +2,5 @@
   lib,
   ...
 }: {
-  home.file.".config/fish/themes/Catppuccin\ Frappe.theme".source = lib.snowfall.fs.get-file "resources/apps/fish/Catppuccin\ Frappe.theme";
+  home.file.".config/fish/themes/Catppuccin\ Macchiato.theme".source = lib.snowfall.fs.get-file "resources/apps/fish/Catppuccin\ Macchiato.theme";
 }

modules/home/themes/catppuccin/gnome/default.nix

@@ -31,29 +31,19 @@
     };
 
     theme = {
-      #name = "Colloid-Dark-Catppuccin";
+      name = "Colloid-Dark-Catppuccin";
-      #package = pkgs.colloid-gtk-theme.override {
+      package = pkgs.colloid-gtk-theme.override {
-        #themeVariants = ["default"];
+        themeVariants = ["default"];
-        #colorVariants = ["dark"];
+        colorVariants = ["dark"];
-        #sizeVariants = ["standard"];
+        sizeVariants = ["standard"];
-        #tweaks = ["catppuccin"];
+        tweaks = ["catppuccin"];
-      #};
-
-      name = "Graphite-teal-Dark-nord";
-      package = pkgs.graphite-gtk-theme.override {
-          themeVariants = ["blue" "teal"];
-          colorVariants = ["dark"];
-          sizeVariants = ["standard"];
-          tweaks = ["nord"];
-          withGrub = true;
-          grubScreens = ["1080p"];
       };
     };
   };
 
   dconf.settings = {
     "org/gnome/shell/extensions/user-theme" = {
-      name = "Graphite-teal-Dark-nord";
+      name = "Colloid-Dark-Catppuccin";
     };
 
     "org/gnome/desktop/interface" = {

modules/nixos/archetypes/workstation/default.nix

@@ -19,7 +19,10 @@ in {
     # Enable modules
     puzzlevision = {
       common = {
-        nix.enable = true; # Standard Nix configuration
+        nix = {
+          enable = true; # Standard Nix configuration
+          use-lix = true;
+        };
         grub.enable = true; # Bootloader grub
         networking.enable = true; # Networkmanager configuration
         kernel.enable = true; # Kernel modifications

modules/nixos/common/bluetooth/default.nix

@@ -11,7 +11,7 @@ in {
   options.${namespace}.common.bluetooth = { enable = mkEnableOption "Enable bluetooth support on your current system"; };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [ bluez ];
+    environment.systemPackages = with pkgs; [ bluez blueman ];
 
     hardware.bluetooth = {
       enable = true;
@@ -24,6 +24,7 @@ in {
           FastConnectable = "true";
           Experimental = "true";
           KernelExperimental = "true";
+          Disable= "Handsfree";
         };
       };
     };

modules/nixos/common/fonts/default.nix

@@ -7,16 +7,16 @@
   ...
 }: with lib; with lib.${namespace};
 let
-  cfg = config.${namespace}.system.fonts;
+  cfg = config.${namespace}.common.fonts;
 in {
-  options.${namespace}.system.fonts = {
+  options.${namespace}.common.fonts = {
     enable = mkEnableOption "Enable system font management";
-    fonts = mkOption {
+    #fonts = mkOption {
-      type = types.package;
+    #  type = types.package;
-      default = [ ];
+    #  default = noto-fonts;
-      example = [ noto-fonts noto-fonts-emoji ];
+    #  example = [ noto-fonts noto-fonts-emoji ];
-      description = "Install additional font packages";
+    #  description = "Install additional font packages";
-    }
+    #};
   };
 
   config = mkIf cfg.enable {
@@ -31,7 +31,7 @@ in {
       noto-fonts-cjk-sans
       noto-fonts-cjk-serif
       noto-fonts-emoji
-      (nerdfonts.override { fonts = [ "Hack" ]; })
+      nerdfonts
-    ] ++ cfg.fonts;
+    ]; # ++ cfg.fonts;
   };
 }

modules/nixos/common/locale/default.nix

@@ -49,9 +49,9 @@ in {
     };
 
     # Set console keymap.
-    console.keyMap = ${cfg.keymap};
+    console.keyMap = cfg.keymap;
     services.xserver = {
-      xkb.layout = ${cfg.keymap};
+      xkb.layout = cfg.keymap;
     };
   };
 }

modules/nixos/common/nix/default.nix

@@ -2,21 +2,17 @@
   lib,
   pkgs,
   inputs,
-
+  namespace,
-  namespace, # The flake namespace, set in flake.nix. If not set, defaults to "internal".
-  system, # The system architecture for this host (eg. `x86_64-linux`).
-  target, # The Snowfall Lib target for this system (eg. `x86_64-iso`).
-  format, # A normalized name for the system target (eg. `iso`).
-  virtual, # A boolean to determine whether this system is a virtual target using nixos-generators.
-  systems, # An attribute map of your defined hosts.
-
   config,
   ...
 }: with lib; with lib.${namespace};
 let
   cfg = config.${namespace}.common.nix;
 in {
-  options.${namespace}.common.nix = { enable = mkEnableOption "nix"; };
+  options.${namespace}.common.nix = {
+    enable = mkEnableOption "Overwrite the default Nix configuration.";
+    use-lix = mkEnableOption "Enable Lix as an alternative to CppNix.";
+  };
 
   config = mkIf cfg.enable {
     nix = {
@@ -35,6 +31,8 @@ in {
         dates = "daily";
         options = "--delete-older-than 3d";
       };
+
+      package = mkIf cfg.use-lix pkgs.lix; # Enable LIX
     };
   };
 }

modules/nixos/common/shell/default.nix

@@ -18,17 +18,11 @@ let
 in {
   options.${namespace}.common.shell = {
     enable = mkEnableOption "Modify the standard shell options";
-    package = mkOption {
-      type = types.str;
-      default = "fish";
-      example = "fish";
-      description = "Select an appropriate shell environment (bash, fish, zsh...)";
-    };
   };
 
   config = mkIf cfg.enable {
-    environment.shells = with pkgs; [ ${cfg.package} ];
+    environment.shells = with pkgs; [ fish ];
-    users.defaultUserShell = pkgs.${cfg.package};
+    users.defaultUserShell = pkgs.fish;
-    programs.${cfg.package}.enable = true;
+    programs.fish.enable = true;
   };
 }

resources/apps/fish/Catppuccin Frappe.theme

@@ -1,30 +0,0 @@
-# name: 'Catppuccin Frappé'
-# url: 'https://github.com/catppuccin/fish'
-# preferred_background: 303446
-
-fish_color_normal c6d0f5
-fish_color_command 8caaee
-fish_color_param eebebe
-fish_color_keyword e78284
-fish_color_quote a6d189
-fish_color_redirection f4b8e4
-fish_color_end ef9f76
-fish_color_comment 838ba7
-fish_color_error e78284
-fish_color_gray 737994
-fish_color_selection --background=414559
-fish_color_search_match --background=414559
-fish_color_option a6d189
-fish_color_operator f4b8e4
-fish_color_escape ea999c
-fish_color_autosuggestion 737994
-fish_color_cancel e78284
-fish_color_cwd e5c890
-fish_color_user 81c8be
-fish_color_host 8caaee
-fish_color_host_remote a6d189
-fish_color_status e78284
-fish_pager_color_progress 737994
-fish_pager_color_prefix f4b8e4
-fish_pager_color_completion c6d0f5
-fish_pager_color_description 737994

resources/apps/fish/Catppuccin Macchiato.theme

@@ -0,0 +1,30 @@
+# name: 'Catppuccin Macchiato'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: 24273a
+
+fish_color_normal cad3f5
+fish_color_command 8aadf4
+fish_color_param f0c6c6
+fish_color_keyword ed8796
+fish_color_quote a6da95
+fish_color_redirection f5bde6
+fish_color_end f5a97f
+fish_color_comment 8087a2
+fish_color_error ed8796
+fish_color_gray 6e738d
+fish_color_selection --background=363a4f
+fish_color_search_match --background=363a4f
+fish_color_option a6da95
+fish_color_operator f5bde6
+fish_color_escape ee99a0
+fish_color_autosuggestion 6e738d
+fish_color_cancel ed8796
+fish_color_cwd eed49f
+fish_color_user 8bd5ca
+fish_color_host 8aadf4
+fish_color_host_remote a6da95
+fish_color_status ed8796
+fish_pager_color_progress 6e738d
+fish_pager_color_prefix f5bde6
+fish_pager_color_completion cad3f5
+fish_pager_color_description 6e738d