diff --git a/devshells/java17-maven/flake.lock b/devshells/java17-maven/flake.lock
new file mode 100644
index 0000000..b4da842
--- /dev/null
+++ b/devshells/java17-maven/flake.lock
@@ -0,0 +1,64 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": [
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1766473571,
+        "narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "76701a179d3a98b07653e2b0409847499b2a07d3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
+        "systems": "systems"
+      }
+    },
+    "systems": {
+      "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",
+  "version": 7
+}
diff --git a/devshells/java17-maven/flake.nix b/devshells/java17-maven/flake.nix
new file mode 100644
index 0000000..169ccb2
--- /dev/null
+++ b/devshells/java17-maven/flake.nix
@@ -0,0 +1,21 @@
+{
+  description = "A basic flake with a shell";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+  inputs.systems.url = "github:nix-systems/default";
+  inputs.flake-utils = {
+    url = "github:numtide/flake-utils";
+    inputs.systems.follows = "systems";
+  };
+
+  outputs =
+    { nixpkgs, flake-utils, ... }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      {
+        devShells.default = pkgs.mkShell { packages = with pkgs; [ maven jdk17 ]; };
+      }
+    );
+}
diff --git a/devshells/java21-maven/flake.lock b/devshells/java21-maven/flake.lock
new file mode 100644
index 0000000..b4da842
--- /dev/null
+++ b/devshells/java21-maven/flake.lock
@@ -0,0 +1,64 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": [
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1766473571,
+        "narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "76701a179d3a98b07653e2b0409847499b2a07d3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
+        "systems": "systems"
+      }
+    },
+    "systems": {
+      "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",
+  "version": 7
+}
diff --git a/devshells/java21-maven/flake.nix b/devshells/java21-maven/flake.nix
new file mode 100644
index 0000000..943795f
--- /dev/null
+++ b/devshells/java21-maven/flake.nix
@@ -0,0 +1,21 @@
+{
+  description = "A basic flake with a shell";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+  inputs.systems.url = "github:nix-systems/default";
+  inputs.flake-utils = {
+    url = "github:numtide/flake-utils";
+    inputs.systems.follows = "systems";
+  };
+
+  outputs =
+    { nixpkgs, flake-utils, ... }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      {
+        devShells.default = pkgs.mkShell { packages = with pkgs; [ maven jdk21 ]; };
+      }
+    );
+}
diff --git a/devshells/php8/flake.lock b/devshells/php8/flake.lock
new file mode 100644
index 0000000..ae71305
--- /dev/null
+++ b/devshells/php8/flake.lock
@@ -0,0 +1,64 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": [
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1736684107,
+        "narHash": "sha256-vH5mXxEvZeoGNkqKoCluhTGfoeXCZ1seYhC2pbMN0sg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "635e887b48521e912a516625eee7df6cf0eba9c1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
+        "systems": "systems"
+      }
+    },
+    "systems": {
+      "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",
+  "version": 7
+}
diff --git a/devshells/php8/flake.nix b/devshells/php8/flake.nix
new file mode 100644
index 0000000..146dfe4
--- /dev/null
+++ b/devshells/php8/flake.nix
@@ -0,0 +1,30 @@
+{
+  description = "A basic flake with a shell";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+  inputs.systems.url = "github:nix-systems/default";
+  inputs.flake-utils = {
+    url = "github:numtide/flake-utils";
+    inputs.systems.follows = "systems";
+  };
+
+  outputs =
+    { nixpkgs, flake-utils, ... }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      {
+        devShells.default = pkgs.mkShell { packages = with pkgs; [ (php81.buildEnv {
+          extensions = ({ enabled, all }: enabled ++ (with all; [
+            xdebug
+          ]));
+          extraConfig = ''
+            xdebug.mode=debug
+          '';
+        }) 
+        php81Packages.composer 
+        ]; };
+      }
+    );
+}
diff --git a/devshells/texlive-with-pygments/flake.lock b/devshells/texlive-with-pygments/flake.lock
new file mode 100644
index 0000000..cd08dba
--- /dev/null
+++ b/devshells/texlive-with-pygments/flake.lock
@@ -0,0 +1,64 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": [
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1739624908,
+        "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a60651b217d2e529729cbc7d989c19f3941b9250",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
+        "systems": "systems"
+      }
+    },
+    "systems": {
+      "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",
+  "version": 7
+}
diff --git a/devshells/texlive-with-pygments/flake.nix b/devshells/texlive-with-pygments/flake.nix
new file mode 100644
index 0000000..3a6635e
--- /dev/null
+++ b/devshells/texlive-with-pygments/flake.nix
@@ -0,0 +1,21 @@
+{
+  description = "Flake for TeXlive with python pygments";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+  inputs.systems.url = "github:nix-systems/default";
+  inputs.flake-utils = {
+    url = "github:numtide/flake-utils";
+    inputs.systems.follows = "systems";
+  };
+
+  outputs =
+    { nixpkgs, flake-utils, ... }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      {
+        devShells.default = pkgs.mkShell { packages = with pkgs; [ texliveFull python3Packages.pygments ]; };
+      }
+    );
+}
diff --git a/flake.nix b/flake.nix
index 6615b6c..8b183d5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,9 +60,8 @@
   } @ inputs: let
     inherit (self) outputs;
     lib = nixpkgs.lib;
-    eachSystem = lib.genAttrs (import systems);
     forEachSystem = f: lib.genAttrs (import systems) (system: f pkgsFor.${system});
-    pkgsFor = eachSystem (
+    pkgsFor = lib.genAttrs (import systems) (
       system:
         import nixpkgs {
           inherit system;
@@ -176,36 +175,10 @@
           home/neovim/default.nix
           home/zsh/default.nix
           home/cli.nix
-          home/gui.nix
-          home/java-dev.nix
-
-          home/direnv/default.nix
         ];
 
       };
     };
 
-    devShells = eachSystem (system:
-      let
-        pkgs = nixpkgs.legacyPackages.${system};
-      in {
-        java11-maven = pkgs.mkShell { packages = with pkgs; [ maven jdk11 ]; };
-        java17-maven = pkgs.mkShell { packages = with pkgs; [ maven jdk17 ]; };
-        java21-maven = pkgs.mkShell { packages = with pkgs; [ maven jdk21 ]; };
-        texlive-with-pygments = pkgs.mkShell { packages = with pkgs; [ texliveFull python3Packages.pygments ]; };
-        php8 = pkgs.mkShell { packages = with pkgs; [
-          (php82.buildEnv {
-            extensions = ({ enabled, all }: enabled ++ (with all; [
-              xdebug
-            ]));
-            extraConfig = ''
-              xdebug.mode=debug
-            '';
-          })
-          php82Packages.composer
-        ];};
-      }
-    );
-
   };
 }
diff --git a/home/cli.nix b/home/cli.nix
index 5c089dd..301cffc 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -18,6 +18,7 @@
 
   programs = {
     htop.enable = true;
+    git.enable = true;
     bat.enable = true;
   };
 }
diff --git a/home/gui.nix b/home/gui.nix
deleted file mode 100644
index e1627fe..0000000
--- a/home/gui.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
-  home.packages = with pkgs; [
-    jetbrains.idea
-    teams-for-linux
-    mate.engrampa
-    zotero
-    deezer-enhanced
-  ];
-
-  programs = {
-    firefox.enable = true;
-    keepassxc = {
-      enable = true;
-      autostart = true;
-    };
-  };
-
-  xdg.autostart.enable = true;
-}
diff --git a/home/java-dev.nix b/home/java-dev.nix
deleted file mode 100644
index c4c5adc..0000000
--- a/home/java-dev.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
-  home.packages = with pkgs; [
-    maven
-    gradle
-  ];
-
-  home.extraDependencies = with pkgs; [
-    jdk11
-    jdk17
-    jdk21
-  ];
-}
diff --git a/modules/fonts.nix b/modules/fonts.nix
index 6a3cbd9..55a3e97 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -8,7 +8,6 @@
     font-awesome
     terminus_font
     dlrg-fonts
-    fira
   ];
 
 }