diff --git a/flake.lock b/flake.lock
index 34230dc..398cd92 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,126 +1,5 @@
 {
   "nodes": {
-    "brew-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1716195221,
-        "narHash": "sha256-u+zjC7efKD3gBD9aKXsUTEhRhBQhYlP+KPFp1QbsgOo=",
-        "owner": "Homebrew",
-        "repo": "brew",
-        "rev": "e0bc557e7b991cb23583679e1cf1c8a92b793aeb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Homebrew",
-        "ref": "4.3.1",
-        "repo": "brew",
-        "type": "github"
-      }
-    },
-    "cask-fonts": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1715830477,
-        "narHash": "sha256-AjZYkbKvpRIHUwSimOebOQ/AuwP7Z3eIKFTyJaHyG1g=",
-        "owner": "homebrew",
-        "repo": "homebrew-cask-fonts",
-        "rev": "0ed20f35d21ebc3f4f829689b101078718ad5ce1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "homebrew",
-        "repo": "homebrew-cask-fonts",
-        "type": "github"
-      }
-    },
-    "cl-nix-lite": {
-      "locked": {
-        "lastModified": 1717972076,
-        "narHash": "sha256-hnZEsDInTcsVSL5LBGDAZegAxVLBus/wiJh+sNM15zU=",
-        "owner": "hraban",
-        "repo": "cl-nix-lite",
-        "rev": "cc920bfb0a6402d3871f470c98d65266126973e4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hraban",
-        "repo": "cl-nix-lite",
-        "type": "github"
-      }
-    },
-    "darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "unstable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1719128254,
-        "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "50581970f37f06a4719001735828519925ef8310",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "ref": "master",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1697816753,
-        "narHash": "sha256-40to80AEIyKCQI0xMKCeF5ePoIKTYgjVVCZeu4CnTxM=",
-        "owner": "hraban",
-        "repo": "flake-compat",
-        "rev": "6025bade1336a36014639bc3f67eacc853dab78f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hraban",
-        "ref": "fixed-output",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "id": "flake-utils",
-        "type": "indirect"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -141,38 +20,6 @@
         "type": "github"
       }
     },
-    "homebrew-cask": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1719307472,
-        "narHash": "sha256-nXyNo8SBVVA3P/GE7z7+E8IqCdMY/IrQI2DTCPopG8Y=",
-        "owner": "homebrew",
-        "repo": "homebrew-cask",
-        "rev": "3eb017748cf9a6dd33a3bab1c34f1fc7d2466c33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "homebrew",
-        "repo": "homebrew-cask",
-        "type": "github"
-      }
-    },
-    "homebrew-core": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1719302403,
-        "narHash": "sha256-UwgRuhCObAEm8ArVdPJwHrCN/PXU7wjuulJ8av0KmHw=",
-        "owner": "homebrew",
-        "repo": "homebrew-core",
-        "rev": "9a52ad5908685ce3ecfa6269c3f7df4048e28409",
-        "type": "github"
-      },
-      "original": {
-        "owner": "homebrew",
-        "repo": "homebrew-core",
-        "type": "github"
-      }
-    },
     "hyprland-contrib": {
       "inputs": {
         "nixpkgs": [
@@ -193,154 +40,13 @@
         "type": "github"
       }
     },
-    "mac-app-util": {
-      "inputs": {
-        "cl-nix-lite": "cl-nix-lite",
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1718893255,
-        "narHash": "sha256-NdSDGdz5eU/EcnGn8ECP1V+mn5hyGOZQ4ybv2bWTpuk=",
-        "owner": "hraban",
-        "repo": "mac-app-util",
-        "rev": "1857b26aceaf64c2b6a357eb83cf34139b6365cc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hraban",
-        "repo": "mac-app-util",
-        "type": "github"
-      }
-    },
-    "nix-darwin": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1716329735,
-        "narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=",
-        "owner": "LnL7",
-        "repo": "nix-darwin",
-        "rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "LnL7",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
-    "nix-homebrew": {
-      "inputs": {
-        "brew-src": "brew-src",
-        "flake-utils": "flake-utils_2",
-        "nix-darwin": "nix-darwin",
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1716838497,
-        "narHash": "sha256-tkceXNn87z+uC08gvQCl7olSCS782EWdflgq0FkSKiw=",
-        "owner": "zhaofengli-wip",
-        "repo": "nix-homebrew",
-        "rev": "31e9c8105a3ffdc03829c8c195d385500760d309",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zhaofengli-wip",
-        "repo": "nix-homebrew",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1717868076,
-        "narHash": "sha256-c83Y9t815Wa34khrux81j8K8ET94ESmCuwORSKm2bQY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1687274257,
-        "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
-        "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source",
-        "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1716330097,
-        "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
-        "cask-fonts": "cask-fonts",
-        "darwin": "darwin",
         "home-manager": "home-manager",
-        "homebrew-cask": "homebrew-cask",
-        "homebrew-core": "homebrew-core",
         "hyprland-contrib": "hyprland-contrib",
-        "mac-app-util": "mac-app-util",
-        "nix-homebrew": "nix-homebrew",
         "unstable": "unstable"
       }
     },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "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"
-      }
-    },
     "unstable": {
       "locked": {
         "lastModified": 1719075281,
diff --git a/flake.nix b/flake.nix
index 9b57e39..5532213 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,31 +4,14 @@
   inputs = {
     unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
-    darwin.url = "github:lnl7/nix-darwin/master";
-    darwin.inputs.nixpkgs.follows = "unstable";
-
-    nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
-
-    homebrew-core.url = "github:homebrew/homebrew-core";
-    homebrew-core.flake = false;
-
-    homebrew-cask.url = "github:homebrew/homebrew-cask";
-    homebrew-cask.flake = false;
-
-    cask-fonts.url = "github:homebrew/homebrew-cask-fonts";
-    cask-fonts.flake = false;
-
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "unstable";
     
     hyprland-contrib.url = "github:hyprwm/contrib";
     hyprland-contrib.inputs.nixpkgs.follows = "unstable";
-
-    # fix for app links on macos
-    mac-app-util.url = "github:hraban/mac-app-util";
   };
 
-  outputs = { unstable, home-manager, darwin, hyprland-contrib, nix-homebrew, homebrew-core, homebrew-cask, cask-fonts, ...}@inputs: {
+  outputs = { unstable, home-manager, hyprland-contrib, ...}@inputs: {
     nixosConfigurations = {
       gunther = unstable.lib.nixosSystem {
         system = "x86_64-linux";
@@ -63,7 +46,7 @@
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
         modules = [
-          "${unstable}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
+          "${unstable}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix"
           ./iso/configuration.nix
         ];
       };
@@ -78,28 +61,5 @@
         modules = [ ./dafoe/configuration.nix ];
       };
     };
-    darwinConfigurations = {
-      shinx = darwin.lib.darwinSystem {
-        system = "aarch64-darwin";
-        specialArgs = { inherit inputs; };
-        modules = [
-          ./shinx/default.nix
-          home-manager.darwinModules.home-manager 
-          nix-homebrew.darwinModules.nix-homebrew 
-          {
-            nix-homebrew = {
-              enable = true;
-              enableRosetta = true;
-              user = "leonvatthauer";
-              taps = {
-                "homebrew/homebrew-core" = homebrew-core;
-                "homebrew/homebrew-cask" = homebrew-cask;
-                "homebrew/homebrew-cask-fonts" = cask-fonts;
-              };
-            };
-          }
-        ];
-      };
-    };
   };
 }
diff --git a/iso/configuration.nix b/iso/configuration.nix
index bb5b225..f462886 100644
--- a/iso/configuration.nix
+++ b/iso/configuration.nix
@@ -66,7 +66,7 @@
     git
   ];
 
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 
   # source zsh
   programs.zsh.enable = true;
diff --git a/shinx/default.nix b/shinx/default.nix
deleted file mode 100755
index 01ccc69..0000000
--- a/shinx/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ pkgs, home-manager, inputs, ... }@mod-inputs:
-{
-
-  # Make sure the nix daemon always runs
-  services.nix-daemon.enable = true;
-  
-  # if you use zsh (the default on new macOS installations),
-  # you'll need to enable this so nix-darwin creates a zshrc sourcing needed environment changes
-  programs.zsh.enable = true;
-  # bash is enabled by default
-  home-manager = {
-    extraSpecialArgs = { inherit (mod-inputs) inputs; };
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    users.leonvatthauer = import ./leonvatthauer.nix;
-  };
-  nixpkgs.config.allowUnfree = true;
-  users.users.leonvatthauer = {
-    home="/Users/leonvatthauer";
-  };
-  fonts.fonts = [
-    pkgs.mononoki
-  ];
-
-
-  # automatically garbage collect and optimise
-  nix.gc = {
-    automatic = true;
-    interval = { Weekday = 0; Hour = 0; Minute = 0; };
-    options = "--delete-older-than 30d";
-  };
-
-  nix.settings.auto-optimise-store = true;
-}
diff --git a/shinx/leonvatthauer.nix b/shinx/leonvatthauer.nix
deleted file mode 100755
index 98485c4..0000000
--- a/shinx/leonvatthauer.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ pkgs, lib, config, inputs, ... }:
-{
-  home.stateVersion = "23.11";
-  imports = [
-    ./../common/default.nix
-  ];
-
-  home.activation = {
-    trampolineApps = let
-      mac-app-util = inputs.mac-app-util.packages.${pkgs.stdenv.system}.default;
-    in lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-      fromDir="$HOME/Applications/Home Manager Apps"
-      toDir="$HOME/Applications/Home Manager Trampolines"
-      ${mac-app-util}/bin/mac-app-util sync-trampolines "$fromDir" "$toDir"
-    '';
-  };
-
-  home.packages = with pkgs; [ 
-    zsh
-    oh-my-zsh
-    coq
-    openvpn
-    ghc
-    haskell-language-server
-    cabal-install
-    haskellPackages.alex
-    haskellPackages.happy
-    python3
-    python3Packages.pygments
-    nodejs_20
-    iterm2
-    (agda.withPackages [ 
-      agdaPackages.standard-library
-      agdaPackages.agda-categories
-    ])
-    texlive.combined.scheme-full
-    pandoc
-    gh
-    #yubico-pam
-    #yubikey-manager
-    # programs for emacs
-    emacs
-    fd
-    ripgrep
-    gnugrep
-    nixfmt
-    shellcheck
-    fontconfig
-    coreutils
-    coreutils-prefixed
-  ];
-
-  programs.home-manager.enable = true;
-  programs.kitty = {
-    enable = true;
-    font.name = "Berkeley Mono";
-
-  };
-  programs.zsh = {
-    enable = true;
-    shellAliases = {
-      code = "codium";
-    };
-    oh-my-zsh = {
-      enable = true;
-      plugins = [ "git" ];
-      theme = "robbyrussell";
-    };
-    initExtra = ''
-      export PATH="/opt/homebrew/bin:$PATH"
-    '';
-  };
-}