do more

.github/README.md

@@ -17,7 +17,6 @@
   - [hydra](../hosts/hydra/) A super mid spec latop
   - [amatarasu](../hosts/amatarasu/) My high end gameing machine
 - :electric_plug: [modules](../modules/)
-- :lock: [secrets](secrets)
 
 <details>
 <summary> Hyprland Shortcuts </summary>

env.nix

@@ -1,3 +1,3 @@
 {
-  env = "eyJhIjoiNjA0YTQxZmY1ZDI1NzQ5MzllZmJiMWM1NWJhYzA5MGUiLCJ0IjoiN2U5MzZlMjAtODE4ZS00N2UwLWE2ZjEtYmIxOTE3NmY0ZTE4IiwicyI6IllUSXdZelJqTm1RdE5qY3lNeTAwWmpNMExUbGpOell0TmpKall6RmxPVEpsTWpkaiJ9";
+  env = "#";
 }

flake.nix

@@ -7,7 +7,7 @@
     flake-parts,
     ...
   } @ inputs:
-    flake-parts.lib.mkFlake {inherit inputs;} {
+    flake-parts.lib.mkFlake {inherit inputs;} ({withSystem, ...}: {
       systems = [
         "x86_64-linux"
       ];
@@ -16,44 +16,31 @@
         {config._module.args._inputs = inputs // {inherit (inputs) self;};}
 
         inputs.flake-parts.flakeModules.easyOverlay
+
+        ./lib/args.nix # args that is passsed to the flake, moved away from the main file
       ];
 
       flake = let
         # extended nixpkgs lib, contains my custom functions
         lib = import ./lib {inherit nixpkgs lib inputs;};
       in {
         # entry-point for nixos configurations
-        nixosConfigurations = import ./hosts {inherit nixpkgs self lib;};
+        nixosConfigurations = import ./hosts {inherit nixpkgs self lib withSystem;};
       };
 
       perSystem = {
         config,
-        inputs',
+        #inputs',
         pkgs,
-        system,
+        #system,
         ...
       }: {
-        imports = [
-          {
-            _module.args.pkgs = import nixpkgs {
-              config.allowUnfree = true;
-              config.allowUnsupportedSystem = true;
-              inherit system;
-            };
-          }
-        ];
+        imports = [{_module.args.pkgs = config.legacyPackages;}];
 
         # provide the formatter for nix fmt
         formatter = pkgs.alejandra;
-
-        # packages
-        packages = {
-          # A copy of Hyprland with its nixpkgs overriden
-          # cannot trigger binary cache pulls, so I push it to my own
-          hyprland-cached = inputs'.hyprland.packages.default;
-        };
       };
-    };
+    });
 
   inputs = {
     flake-parts = {

home/default.nix

@@ -2,7 +2,8 @@
   config,
   inputs,
   self,
-  profiles,
+  inputs',
+  self',
   ...
 }: let
   user =
@@ -14,7 +15,7 @@ in {
     useUserPackages = true;
     useGlobalPkgs = true;
     extraSpecialArgs = {
-      inherit inputs self profiles;
+      inherit inputs self inputs' self';
     };
     users = {
       # home directory for the user

home/isabel/default.nix

@@ -1,6 +1,5 @@
 {
   inputs,
-  pkgs,
   config,
   lib,
   ...

home/isabel/packages/cli/confs/bat.nix

@@ -1,9 +1,6 @@
 {
   osConfig,
   lib,
-  pkgs,
-  inputs,
-  self,
   ...
 }:
 with lib; let

home/isabel/packages/cli/confs/btop.nix

@@ -1,9 +1,6 @@
 {
   osConfig,
   lib,
-  pkgs,
-  inputs,
-  self,
   ...
 }:
 with lib; let
@@ -13,8 +10,6 @@ with lib; let
   acceptedTypes = ["desktop" "laptop" "lite" "hybrid"];
 in {
   config = mkIf ((builtins.elem device.type acceptedTypes) && (programs.cli.enable)) {
-    home.packages = [pkgs.btop];
-
     programs.btop = {
       enable = true;
       catppuccin.enable = true;

home/isabel/packages/cli/confs/fish.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+_: {
   programs.fish = {
     enable = true;
     catppuccin.enable = true;

home/isabel/packages/cli/confs/git.nix

@@ -14,7 +14,6 @@ with lib; let
 in {
   config = mkIf ((builtins.elem device.type acceptedTypes) && (programs.cli.enable)) {
     home.packages = with pkgs; [
-      gh-cal # github activity stats in the CLI
       gist # manage github gists
       act # local github actions
       gitflow
@@ -25,7 +24,11 @@ in {
       gh = {
         enable = true;
         enableGitCredentialHelper = false;
-        extensions = [];
+        extensions = with pkgs; [
+          gh-cal # github activity stats in the CLI
+          gh-dash # dashboard with pull requests and issues
+          gh-eco # explore the ecosystem
+        ];
         settings = {
           git_protocol = "ssh";
           prompt = "enabled";

home/isabel/packages/cli/confs/nix-shell.nix

@@ -2,8 +2,6 @@
   osConfig,
   lib,
   pkgs,
-  inputs,
-  self,
   ...
 }:
 with lib; let
@@ -18,6 +16,7 @@ in {
         alejandra
         deadnix
         nix-index
+        nix-tree
         statix
       ];
 

home/isabel/packages/cli/confs/starship.nix

@@ -1,9 +1,6 @@
 {
   osConfig,
   lib,
-  pkgs,
-  inputs,
-  self,
   ...
 }:
 with lib; let
@@ -13,7 +10,6 @@ with lib; let
   acceptedTypes = ["desktop" "laptop" "lite" "hybrid"];
 in {
   config = mkIf ((builtins.elem device.type acceptedTypes) && (programs.cli.enable)) {
-    home.packages = [pkgs.starship];
     programs.starship = {
       enable = true;
       catppuccin.enable = true;

home/isabel/packages/cli/shared.nix

@@ -2,8 +2,6 @@
   osConfig,
   lib,
   pkgs,
-  inputs,
-  self,
   ...
 }:
 with lib; let