diff --git a/base-system/desktop-config.nix b/base-system/desktop-config.nix
deleted file mode 100644
index a5847c7..0000000
--- a/base-system/desktop-config.nix
+++ /dev/null
@@ -1,159 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./desktop-hardware-config.nix
-      ./env.nix
-    ];
-
-  # Enable nix flakes
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  # Disable documentation
-  documentation.nixos.enable = false;
-
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  # Select kernel version
-  boot.kernelPackages = pkgs.linuxPackages_zen;
-
-  networking.hostName = "nixdesktop"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Enable networking
-  networking.networkmanager.enable = true;
-
-  # Set your time zone.
-  time.timeZone = "Europe/Amsterdam";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_US.UTF-8";
-    LC_IDENTIFICATION = "en_US.UTF-8";
-    LC_MEASUREMENT = "en_US.UTF-8";
-    LC_MONETARY = "en_US.UTF-8";
-    LC_NAME = "en_US.UTF-8";
-    LC_NUMERIC = "en_US.UTF-8";
-    LC_PAPER = "en_US.UTF-8";
-    LC_TELEPHONE = "en_US.UTF-8";
-    LC_TIME = "en_US.UTF-8";
-  };
-
-  # Enable OpenGL
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
-  };
-
-  # Load nvidia driver
-  services.xserver.videoDrivers = ["nvidia"];
-
-  hardware.nvidia = {
-    modesetting.enable = true;
-    powerManagement.enable = false;
-    powerManagement.finegrained = false;
-    open = false;
-    nvidiaSettings = true;
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
-  };
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Remove XTerm
-  services.xserver.excludePackages = [ pkgs.xterm ];
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-  # Don't pull unnecessary packages
-  services.gnome.core-utilities.enable = false;
-  environment.gnome.excludePackages = [ pkgs.gnome-tour ];
-
-  # Configure keymap in X11
-  services.xserver = {
-    layout = "us";
-    xkbVariant = "";
-  };
-
-  # Enable CUPS to print documents.
-  services.printing.enable = false;
-
-  # Enable sound with pipewire.
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.twoneis = {
-    isNormalUser = true;
-    description = "twoneis";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = import ./packages/user-core-packages.nix pkgs ++ import ./packages/user-game-packages.nix pkgs;
-  };
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = import ./packages/system-packages.nix pkgs;
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.05"; # Did you read the comment?
-
-}
-
diff --git a/base-system/desktop-hardware-config.nix b/base-system/desktop-hardware-config.nix
deleted file mode 100644
index 87e44a6..0000000
--- a/base-system/desktop-hardware-config.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/95b15244-c97c-42a5-9be1-ed5df6872dcb";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/BF87-B3DE";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/b6445ced-1cc2-461f-a81f-6e8409c10f48"; }
-    ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/base-system/dotfiles/alacritty/alacritty.nix b/base-system/dotfiles/alacritty/alacritty.nix
deleted file mode 100644
index 1292a2d..0000000
--- a/base-system/dotfiles/alacritty/alacritty.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  colors = {
-    primary = {
-      background = "0x191724";
-      foreground = "0xe0def4";
-    };
-    cursor = {
-      text = "0xe0def4";
-      cursor = "0x524f67";
-    };
-    vi_mode_cursor = {
-      text = "0xe0def4";
-      cursor = "0x524f67";
-    };
-    line_indicator = {
-      foreground = "None";
-      background = "None";
-    };
-    selection = {
-      text = "0xe0def4";
-      background = "0x403d52";
-    };
-    normal = {
-      black = "0x26233a";
-      red = "0xeb6f92";
-      green = "0x31748f";
-      yellow = "0xf6c177";
-      blue = "0x9ccfd8";
-      magenta = "0xc4a7e7";
-      cyan = "0xebbcba";
-      white = "0xe0def4";
-    };
-    bright = {
-      black = "0x6e6a86";
-      red = "0xeb6f92";
-      green = "0x31748f";
-      yellow = "0xf6c177";
-      blue = "0x9ccfd8";
-      magenta = "0xc4a7e7";
-      cyan = "0xebbcba";
-      white = "0xe0def4";
-    };
-    hints = {
-      start = {
-        foreground = "#908caa";
-        background = "#1f1d2e";
-      };
-      end = {
-        foreground = "#6e6a86";
-        background = "#1f1d2e";
-      };
-    };
-  };
-
-  window.decorations = "None";
-}
diff --git a/base-system/dotfiles/gdb/gdb-for-asm b/base-system/dotfiles/gdb/gdb-for-asm
deleted file mode 100644
index cc8c745..0000000
--- a/base-system/dotfiles/gdb/gdb-for-asm
+++ /dev/null
@@ -1,4 +0,0 @@
-source /usr/share/gef/gef.py
-set debuginfod enabled off
-set disassembly-flavor att
-
diff --git a/base-system/dotfiles/gdb/gdb-for-c b/base-system/dotfiles/gdb/gdb-for-c
deleted file mode 100644
index 0821213..0000000
--- a/base-system/dotfiles/gdb/gdb-for-c
+++ /dev/null
@@ -1,5 +0,0 @@
-source /usr/share/gef/gef.py
-set debuginfod enabled off
-set disassembly-flavor intel
-set detach-on-fork off
-set follow-fork-mode child
diff --git a/base-system/dotfiles/gdb/gef-for-c b/base-system/dotfiles/gdb/gef-for-c
deleted file mode 100644
index 3fba1db..0000000
--- a/base-system/dotfiles/gdb/gef-for-c
+++ /dev/null
@@ -1,126 +0,0 @@
-[context]
-clear_screen = True
-enable = True
-grow_stack_down = False
-ignore_registers = 
-layout = source args extra
-libc_args = False
-libc_args_path = 
-nb_lines_backtrace = 10
-nb_lines_backtrace_before = 2
-nb_lines_code = 6
-nb_lines_code_prev = 3
-nb_lines_stack = 10
-nb_lines_threads = -1
-peek_calls = True
-peek_ret = True
-redirect = 
-show_opcodes_size = 0
-show_registers_raw = False
-show_source_code_variable_values = True
-show_stack_raw = False
-
-[dereference]
-max_recursion = 7
-
-[entry-break]
-entrypoint_symbols = main _main __libc_start_main __uClibc_main start _start
-
-[gef]
-autosave_breakpoints_file = 
-debug = False
-disable_color = False
-extra_plugins_dir = 
-follow_child = True
-readline_compat = False
-show_deprecation_warnings = True
-tempdir = /tmp/gef
-
-[got]
-function_not_resolved = yellow
-function_resolved = green
-
-[heap-analysis-helper]
-check_double_free = True
-check_free_null = False
-check_heap_overlap = True
-check_uaf = True
-check_weird_free = True
-
-[heap-chunks]
-peek_nb_byte = 16
-
-[hexdump]
-always_show_ascii = False
-
-[highlight]
-regex = False
-
-[pattern]
-length = 1024
-
-[pcustom]
-max_depth = 4
-struct_path = /tmp/gef/structs
-structure_name = bold blue
-structure_size = green
-structure_type = bold red
-
-[process-search]
-ps_command = /usr/bin/ps auxww
-
-[syscall-args]
-path = /tmp/gef/syscall-tables
-
-[theme]
-address_code = red
-address_heap = green
-address_stack = pink
-context_title_line = gray
-context_title_message = cyan
-default_title_line = gray
-default_title_message = cyan
-dereference_base_address = cyan
-dereference_code = gray
-dereference_register_value = bold blue
-dereference_string = yellow
-disassemble_current_instruction = green
-old_context = gray
-registers_register_name = blue
-registers_value_changed = bold red
-source_current_line = green
-table_heading = blue
-
-[trace-run]
-max_tracing_recursion = 1
-tracefile_prefix = ./gef-trace-
-
-[aliases]
-ctx = context
-telescope = dereference
-flags = edit-flags
-start = entry-break
-fmtstr-helper = format-string-helper
-hl = highlight
-highlight set = highlight add
-hla = highlight add
-hlc = highlight clear
-highlight ls = highlight list
-hll = highlight list
-highlight delete = highlight remove
-highlight del = highlight remove
-highlight unset = highlight remove
-highlight rm = highlight remove
-hlr = highlight remove
-nb = name-break
-pattern offset = pattern search
-pf = print-format
-ps = process-search
-status = process-status
-lookup = scan
-grep = search-pattern
-xref = search-pattern
-sc-get = shellcode get
-sc-search = shellcode search
-screen-setup = tmux-setup
-
diff --git a/base-system/dotfiles/helix/config.nix b/base-system/dotfiles/helix/config.nix
deleted file mode 100644
index 800b65b..0000000
--- a/base-system/dotfiles/helix/config.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  theme = "rosepine";
-
-  editor = {
-    line-number = "relative";
-    cursorline = true;
-    auto-format = true;
-    soft-wrap.enable = true;
-
-    whitespace.render = "all";
-
-    cursor-shape = {
-      insert = "bar";
-      normal = "block";
-      select = "underline";
-    };
-
-  };
-
-  keys.normal  = {
-    h = "move_char_left";
-    t = "move_line_up";
-    n = "move_line_down";
-    s = "move_char_right";
-  };
-}
diff --git a/base-system/dotfiles/helix/rosepine.nix b/base-system/dotfiles/helix/rosepine.nix
deleted file mode 100644
index a217ef4..0000000
--- a/base-system/dotfiles/helix/rosepine.nix
+++ /dev/null
@@ -1,193 +0,0 @@
-# Author: Rosé Pine <hi@rosepinetheme.com>
-# Upstream: https://github.com/rose-pine/helix
-# Contributing:
-#   Please submit changes to https://github.com/rose-pine/helix.
-#   The Rosé Pine team will update Helix, including you as a co-author.
-{
-  rosepine = let
-    base           = "#191724";
-    surface        = "#1f1d2e";
-    overlay        = "#26233a";
-    muted          = "#6e6a86";
-    subtle         = "#908caa";
-    text           = "#e0def4";
-    love           = "#eb6f92";
-    love_10        = "#311f30";
-    gold           = "#f6c177";
-    gold_10        = "#30282c";
-    rose           = "#ebbcba";
-    rose_10        = "#2f2834";
-    pine           = "#31748f";
-    pine_10        = "#1a2030";
-    foam           = "#9ccfd8";
-    foam_10        = "#252937";
-    iris           = "#c4a7e7";
-    iris_10        = "#2b2539";
-    highlight_low  = "#21202e";
-    highlight_med  = "#403d52";
-    highlight_high = "#524f67";
-  in {
-    
-    "ui.background" = { bg = base; };
-    "ui.background.separator" = { bg = base; };
-
-    "ui.cursor" = { fg = text; bg = highlight_high; };
-    # "ui.cursor.select" = {};
-    "ui.cursor.match" = { fg = text; bg = highlight_med; };
-    "ui.cursor.primary" = { fg = text; bg = muted; };
-
-    # "ui.gutter" = {};
-    # "ui.gutter.selected" = {};
-
-    "ui.linenr" = { fg = muted; };
-    "ui.linenr.selected" = { fg = text; };
-
-    "ui.statusline" = { fg = subtle; bg = surface; };
-    "ui.statusline.inactive" = { fg = muted; bg = surface; };
-    "ui.statusline.normal" = { fg = rose; bg = rose_10; };
-    "ui.statusline.insert" = { fg = foam; bg = foam_10; };
-    "ui.statusline.select" = { fg = iris; bg = iris_10; };
-    # "ui.statusline.separator" = {};
-
-    "ui.popup" = { bg = surface; };
-    "ui.popup.info" = { bg = surface; };
-
-    "ui.window" = { fg = overlay; bg = base; };
-    "ui.help" = { fg = subtle; bg = overlay; };
-
-    "ui.text" = { fg = text; };
-    "ui.text.focus" = { bg = overlay; };
-    "ui.text.info" = { fg = subtle; };
-
-    "ui.virtual.ruler" = { bg = overlay; };
-    "ui.virtual.whitespace" = { fg = highlight_high; };
-    "ui.virtual.indent-guide" = { fg = muted; };
-    "ui.virtual.inlay-hint" = { fg = subtle; };
-
-    "ui.menu" = { fg = subtle; bg = surface; };
-    "ui.menu.selected" = { fg = text; };
-    "ui.menu.scroll" = { fg = muted; bg = highlight_med; };
-
-    "ui.selection" = { bg = overlay; };
-    "ui.selection.primary" = { bg = highlight_med; };
-
-    "ui.cursorline.primary" = { bg = highlight_low; };
-    "ui.cursorline.secondary" = { bg = surface; };
-
-    "warning" = gold;
-    "error" = love;
-    "info" = foam;
-    "hint" = iris;
-    "debug" = rose;
-
-    "diagnostic" = { underline = { color = subtle; style = "curl"; }; };
-    "diagnostic.hint" = { underline = { color = iris; style = "curl"; }; };
-    "diagnostic.info" = { underline = { color = foam; style = "curl"; }; };
-    "diagnostic.warning" = { underline = { color = gold; style = "curl"; }; };
-    "diagnostic.error" = { underline = { color = love; style = "curl"; }; };
-    "special" = rose;
-
-    "attribute" = "iris";
-
-    "type" = foam;
-    # "type.builtin" = "";
-
-    "constructor" = foam;
-
-    "constant" = foam;
-    "constant.builtin" = rose;
-    # "constant.builtin.boolean" = "";
-    "constant.character" = gold;
-    "constant.character.escape" = pine;
-    "constant.numeric" = gold;
-    # "constant.numeric.integer" = "";
-    # "constant.numeric.float" = "";
-
-    "string" = gold;
-    # "string.regexp" = "";
-    # "string.special" = "";
-    # "string.special.path" = "";
-    # "string.special.url" = "";
-    # "string.special.symbol" = "";
-
-    "comment" = { fg = muted; modifiers = ["italic"];};
-    # "comment.line" = "";
-    # "comment.block" = "";
-    # "comment.block.documenation" = "";
-
-    "variable" = text;
-    "variable.builtin" = love;
-    "variable.parameter" = iris;
-    # "variable.other" = "";
-    # "variable.other.member" = "";
-
-    "label" = foam;
-
-    "punctuation" = subtle;
-    # "punctuation.delimiter" = "";
-    # "punctuation.bracket" = "";
-    # "punctuation.special" = "";
-
-    "keyword" = pine;
-    # "keyword.control" = "";
-    # "keyword.control.conditional" = "";
-    # "keyword.control.repeat" = "";
-    # "keyword.control.import" = "";
-    # "keyword.control.return" = "";
-    # "keyword.control.exception" = "";
-    "keyword.operator" = subtle;
-    # "keyword.directive" = "";
-    # "keyword.function" = "";
-    # "keyword.storage" = "";
-    # "keyword.storage.type" = "";
-    # "keyword.storage.modifier" = "";
-
-    "operator" = subtle;
-
-    "function" = rose; # maybe pine;
-    "function.builtin" = love;
-    # "function.method" = "";
-    # "function.macro" = "";
-    # "function.special" = "";
-
-    "tag" = foam;
-
-    "namespace" = iris;
-
-    "markup.heading.marker" = muted;
-    "markup.heading" = { fg = iris; modifiers = ["bold"]; };
-    "markup.heading.1" = { fg = "iris"; modifiers = ["bold"]; };
-    "markup.heading.2" = { fg = foam; modifiers = ["bold"]; };
-    "markup.heading.3" = { fg = rose; modifiers = ["bold"]; };
-    "markup.heading.4" = { fg = gold; modifiers = ["bold"]; };
-    "markup.heading.5" = { fg = pine; modifiers = ["bold"]; };
-    "markup.heading.6" = { fg = foam; modifiers = ["bold"]; };
-    # "markup.heading.completion" = "";
-    # "markup.heading.hover" = "";
-    "markup.list" = muted;
-    # "markup.list.unnumbered" = "";
-    # "markup.list.numbered" = "";
-    "markup.bold" = { modifiers = ["bold"]; };
-    "markup.italic" = { modifiers = ["italic"]; };
-    "markup.link" = iris;
-    "markup.link.url" = { fg = iris;  underline = { color = iris; style = "line"; }; } ;
-    "markup.link.label" = subtle;
-    "markup.link.text" = text;
-    "markup.quote" = subtle;
-    "markup.raw" = subtle;
-    # "markup.raw.inline" = {};
-    # "markup.raw.inline.completion" = {};
-    # "markup.raw.inline.hover" = {};
-    # "markup.raw.block" = {};
-    # "markup.normal" = "";
-    # "markup.normal.completion" = "";
-    # "markup.normal.hover" = "";
-
-    "diff" = overlay;
-    "diff.plus" = foam;
-    "diff.minus" = love;
-    "diff.delta" = highlight_high;
-    # "diff.delta.moved" = "";
-
-  };
-}
diff --git a/base-system/dotfiles/spotifyd/spotifyd.nix b/base-system/dotfiles/spotifyd/spotifyd.nix
deleted file mode 100644
index 27a3c69..0000000
--- a/base-system/dotfiles/spotifyd/spotifyd.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  global = {
-    username = "sanjay15@sapura.de";
-    use_keyring = true;
-    backend = "alsa";
-    device_name = "nix-daemon";
-    device_type = "computer";
-    device = "default";
-    bitrate = 320;
-    zeroconf_port = 8888;
-    initial_volume = "50";
-    autoplay = false;
-  };
-}
diff --git a/base-system/env.nix b/base-system/env.nix
deleted file mode 100644
index 99a2d23..0000000
--- a/base-system/env.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-
-{
-  environment.sessionVariables = {
-    EDITOR = "hx";
-    SUDO_EDITOR = "hx";
-    VISUAL = "hx";
-  };
-}
diff --git a/base-system/flake.lock b/base-system/flake.lock
deleted file mode 100644
index 9351318..0000000
--- a/base-system/flake.lock
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "nodes": {
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1699783872,
-        "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "280721186ab75a76537713ec310306f0eba3e407",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1699099776,
-        "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/base-system/flake.nix b/base-system/flake.nix
deleted file mode 100644
index 8ef07f6..0000000
--- a/base-system/flake.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  description = "Nix flake for basic configuration, for surface and desktop";
-
-
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
-
-  outputs = {nixpkgs, home-manager, ...}:
-  let
-    system = "x86_64-linux";
-  in
-  {
-    nixosConfigurations.nixdesktop = nixpkgs.lib.nixosSystem {
-      specialArgs = { inherit system; };
-
-      modules = [ 
-        ./desktop-config.nix 
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.twoneis = import ./home.nix;
-        }
-      ];
-    };
-    nixosConfigurations.nixsurface = nixpkgs.lib.nixosSystem {
-      specialArgs = { inherit system; };
-
-      modules = [
-        ./surface-config.nix
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.twoneis = import ./home.nix;
-        }
-      ];
-    };
-  };
-}
diff --git a/base-system/home.nix b/base-system/home.nix
deleted file mode 100644
index f082f76..0000000
--- a/base-system/home.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Set username and home directory
-  home = {
-    username = "twoneis";
-    homeDirectory = "/home/twoneis";
-
-    file = {
-      ".gef.rc" = {
-        source = ./dotfiles/gdb/gef-for-c;
-        # source = ./dotfiles/gdb/gef-for-asm
-      };
-      ".gdbinit" = {
-        source = ./dotfiles/gdb/gdb-for-c;
-        # source = ./dotfiles/gdb/gdb-for-asm;
-      };
-    };
-  };
-
-  programs = {
-    home-manager = {
-      enable = true;
-    };
-
-    git = {
-      enable = true;
-      userName = "twoneis";
-      userEmail = "sanjay29@sapura.de";
-    };
-
-    helix = {
-      enable = true;
-      defaultEditor = true;
-      settings = import ./dotfiles/helix/config.nix;
-      themes = import ./dotfiles/helix/rosepine.nix;
-    };
-
-    alacritty = {
-      enable = true;
-      settings = import ./dotfiles/alacritty/alacritty.nix;
-    };
-  };
-
-  home.stateVersion = "18.09";
-}
diff --git a/base-system/packages/system-packages.nix b/base-system/packages/system-packages.nix
deleted file mode 100644
index 8abe2d5..0000000
--- a/base-system/packages/system-packages.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-pkgs: with pkgs; [
-  alacritty
-  git
-  gh
-  man-pages
-  man-pages-posix
-  bottom
-  firefox
-  gnome.nautilus
-  vlc
-  image-roll
-]
diff --git a/base-system/packages/user-core-packages.nix b/base-system/packages/user-core-packages.nix
deleted file mode 100644
index af25d4c..0000000
--- a/base-system/packages/user-core-packages.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgs: with pkgs; [
-  # Scrolling window manager extension
-  gnomeExtensions.paperwm
-  # For character search
-  gnome.gnome-characters
-  # Helix editor and LSPs for helix
-  helix
-  nil
-  marksman
-  # Render markdown files
-  glow
-  pandoc
-  texlive.combined.scheme-full
-  # Regular apps
-  thunderbird
-  signal-desktop
-  discord
-  spotify
-  calibre
-  krita
-]
diff --git a/base-system/packages/user-game-packages.nix b/base-system/packages/user-game-packages.nix
deleted file mode 100644
index babd85d..0000000
--- a/base-system/packages/user-game-packages.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-pkgs: with pkgs; [
-  steam
-  prismlauncher-qt5
-  lutris
-]
diff --git a/base-system/surface-config.nix b/base-system/surface-config.nix
deleted file mode 100644
index 96bdd8b..0000000
--- a/base-system/surface-config.nix
+++ /dev/null
@@ -1,147 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./surface-hardware-config.nix
-      ./env.nix
-    ];
-
-  # Enable nix flakes
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  # Disable documentation
-  documentation.nixos.enable = false;
-
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  # Select kernel version
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  networking.hostName = "nixsurface"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Enable networking
-  networking.networkmanager.enable = true;
-
-  # Set your time zone.
-  time.timeZone = "Europe/Amsterdam";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_US.UTF-8";
-    LC_IDENTIFICATION = "en_US.UTF-8";
-    LC_MEASUREMENT = "en_US.UTF-8";
-    LC_MONETARY = "en_US.UTF-8";
-    LC_NAME = "en_US.UTF-8";
-    LC_NUMERIC = "en_US.UTF-8";
-    LC_PAPER = "en_US.UTF-8";
-    LC_TELEPHONE = "en_US.UTF-8";
-    LC_TIME = "en_US.UTF-8";
-  };
-
-  # Enable OpenGL
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
-  };
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Remove XTerm
-  services.xserver.excludePackages = [ pkgs.xterm ];
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-  # Don't pull unnecessary packages
-  services.gnome.core-utilities.enable = false;
-  environment.gnome.excludePackages = [ pkgs.gnome-tour ];
-
-  # Configure keymap in X11
-  services.xserver = {
-    layout = "us";
-    xkbVariant = "";
-  };
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound with pipewire.
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.twoneis = {
-    isNormalUser = true;
-    description = "twoneis";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = import ./packages/user-core-packages.nix pkgs;
-  };
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = import ./packages/system-packages.nix pkgs;
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.05"; # Did you read the comment?
-
-}
-
diff --git a/base-system/surface-hardware-config.nix b/base-system/surface-hardware-config.nix
deleted file mode 100644
index e03e407..0000000
--- a/base-system/surface-hardware-config.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/4ecc3b27-016f-4416-a819-bd0998fc993f";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/0721-3632";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/b35abec3-ff20-4b3b-b953-e36f2df719cb"; }
-    ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..1ffdfe2
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,15 @@
+{
+  description = "My collection of flake templates";
+
+  outputs = { }: {
+    trivial = {
+      path = ./trivial;
+      description = "The default flake template most non-specialised flakes should be based on";
+    };
+
+    fhs = {
+      path = ./fhs;
+      description = "A simple flake but creating an fhs compliant environment";
+    };
+  };
+}
diff --git a/gcc-devel/flake.lock b/gcc-devel/flake.lock
deleted file mode 100644
index dfaecfb..0000000
--- a/gcc-devel/flake.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1698318101,
-        "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/gcc-devel/flake.nix b/gcc-devel/flake.nix
deleted file mode 100644
index 5825ab3..0000000
--- a/gcc-devel/flake.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  description = "A template flake for development with gcc";
-
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-  };
-
-  outputs = { self, nixpkgs, ... }:
-    let
-      system = "x86_64-linux";
-      pkgs = import nixpkgs {
-        inherit system;
-      };
-    in {
-      devShell.x86_64-linux = pkgs.mkShell rec {
-        name = "gcc-devel";
-        packages = with pkgs; [
-          cmake
-          libgcc
-          gdb
-          gef
-        ];
-        shellHook = ''export PS1="[\u@gcc-devel:\W]\$ "'';
-      };
-    };
-}