diff --git a/etc/hostname b/etc/hostname
deleted file mode 100755
index e69de29..0000000
diff --git a/etc/hosts b/etc/hosts
deleted file mode 100755
index e69de29..0000000
diff --git a/etc/resolv.conf b/etc/resolv.conf
deleted file mode 100755
index e69de29..0000000
diff --git a/home/alisceon.nix b/home/alisceon.nix
index a309008..c426374 100644
--- a/home/alisceon.nix
+++ b/home/alisceon.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, hostName, ... }: {
+{ pkgs, config, hostName, lib, ... }: {
   home.username = "alisceon";
   home.homeDirectory = "/home/alisceon";
   home.stateVersion = "24.05";
@@ -21,6 +21,7 @@
         nixos-switch = "sudo nixos-rebuild switch --flake .#${hostName}";
         nixos-test = "sudo nixos-rebuild build-vm --flake .#${hostName}";
         pypod = "podman run --rm -it --network host -v '.:/run' -w '/run' python /run/";
+        weboot = "nix shell nixpkgs#efibootmgr -c sudo efibootmgr -n 0000 && reboot";
       };
     }; # end fish
     git = {
@@ -31,7 +32,6 @@
         push = { autoSetupRemote = true; };
       };
     }; # end git
-    obsidian.enable = true;
     vscode.enable = true;
     firefox = {
       enable = true;
@@ -77,6 +77,11 @@
     }; # end ssh
   }; # end programs
 
+  # obsidian special case
+  programs.obsidian.enable = true;
+  # overide broken config 
+  xdg.configFile."obsidian/obsidian.json".source = lib.mkForce ./conf/obsidian.json;
+
   home.packages = with pkgs; [
     signal-desktop
     discord
@@ -101,8 +106,11 @@
       picture-options = "zoom";
       primary-color = "#000000000000";
       secondary-color = "#000000000000";
-      picture-uri = "org.gnome.desktop.background picture-uri 'file:///home/alisceon/Pictures/songbird/Songbird4.png'";
-      picture-uri-dark = "org.gnome.desktop.background picture-uri 'file:///home/alisceon/Pictures/songbird/Songbird4.png'";
+      picture-uri = "file:///home/alisceon/Pictures/system/bg.png";
+      picture-uri-dark = "file:///home/alisceon/Pictures/system/bg.png";
+    };
+    "org/gnome/mutter" = {
+      auto-maximize = true;
     };
     "org/gnome/desktop/interface" = {
       accent-color = "red";
@@ -114,20 +122,32 @@
       favorite-apps = [
         "org.gnome.Nautilus.desktop"
         "firefox.desktop"
-        "vscode.desktop"
+        "code.desktop"
         "obsidian.desktop"
         "discord.desktop"
-        "signal-desktop.desktop"
+        "signal.desktop"
       ];
     };
+    "org/gnome/shell/keybindings" = {
+      show-screenshot-ui = [ "<Shift><Super>s" ];
+    };
+    "org/gnome/settings-daemon/plugins/media-keys" = {
+      custom-keybindings = [
+        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
+      ];
+    };
+    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
+      name = "GNOME Console";
+      command = "kgx";
+      binding = "<Shift><Super>Return";
+    };
     "com/github/amezin/ddterm" = {
       ddterm-toggle-hotkey = [ "<Super>Return" ];
+      window-monitor = "focus";
+      hide-when-focus-lost = true;
+      hide-window-on-esc = true;
+      tab-policy = "never";
+      panel-icon-type = "none";
     };
   }; # end dconf.settings
-    #overide broken obsidian config 
-  xdg.configFile."obsidian/obsidian.json".source = builtins.toPath ./conf/obsidian.json;
-
-  home.file = {
-
-  }; # end home.file
 } # end file
diff --git a/hosts/common.nix b/hosts/common.nix
index ae13568..4ad7693 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -1,13 +1,19 @@
 { config, pkgs, ... }:
 
 {
+  system.stateVersion = "24.05";
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.settings.auto-optimise-store = true;
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 7d";
+  };
 
+  console.keyMap = "sv-latin1";
   networking.networkmanager.enable = true;
-
   time.timeZone = "Europe/Stockholm";
   i18n.defaultLocale = "en_US.UTF-8";
-
   i18n.extraLocaleSettings = {
     LC_ADDRESS = "sv_SE.UTF-8";
     LC_IDENTIFICATION = "sv_SE.UTF-8";
@@ -19,16 +25,29 @@
     LC_TELEPHONE = "sv_SE.UTF-8";
     LC_TIME = "sv_SE.UTF-8";
   };
+  security.sudo.wheelNeedsPassword = false;
 
-
-  services.displayManager = {
-    gdm.enable = true;
-    gdm.wayland = true;
-  };
-  services.desktopManager.gnome.enable = true;
-  services.xserver.xkb.layout = "se";
+  services = {
+    printing.enable = true;
+    pulseaudio.enable = false;
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      pulse.enable = true;
+      jack.enable = true;
+    };
+    xserver.xkb.layout = "se";
+    displayManager = {
+      gdm.enable = true;
+      gdm.wayland = true;
+    };
+    desktopManager.gnome.enable = true;
+    gnome = {
+      gnome-keyring.enable = true;
+      gnome-initial-setup.enable = false;
+    };
+  }; # end services
   
-  services.gnome.gnome-keyring.enable = true;
   environment.gnome.excludePackages = with pkgs; [
     evolution
     geary
@@ -43,32 +62,15 @@
     gnome-clocks
   ];
 
-  nix.settings.auto-optimise-store = true;
-  nix.gc = {
-    automatic = true;
-    dates = "weekly";
-    options = "--delete-older-than 7d";
-  };
-
-  console.keyMap = "sv-latin1";
-
-  services.printing.enable = true;
-  services.pulseaudio.enable = false;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    pulse.enable = true;
-    jack.enable = true;
-  };
-
   services.fwupd.enable = true;
   programs = {
+    dconf.enable = true;
     fish.enable = true;
     steam = {
       enable = true;
       remotePlay.openFirewall = true;
     };
-  };
+  }; # end programs
 
   environment.systemPackages = with pkgs; [
     # CLI tools
@@ -104,7 +106,10 @@
     # Other
     syncthing
     steam
+    krita
+    edk2-uefi-shell
   ];
+  environment.shells = with pkgs; [ fish ];
 
   virtualisation.podman = {
     enable = true;
@@ -117,11 +122,5 @@
     extraGroups = [ "wheel" "networkmanager" "podman" ];
     shell = pkgs.fish;
   };
-
-  security.sudo.wheelNeedsPassword = false;
-  programs.dconf.enable = true;
-
-  environment.shells = with pkgs; [ fish ];
-
-  system.stateVersion = "24.05";
+  
 }
diff --git a/hosts/electra/configuration.nix b/hosts/electra/configuration.nix
index 6551207..afcbc83 100644
--- a/hosts/electra/configuration.nix
+++ b/hosts/electra/configuration.nix
@@ -14,7 +14,6 @@
       verbose = false;
     };
 
-  
     plymouth = {
       enable = true;
       theme = "rings";
diff --git a/hosts/tower/configuration.nix b/hosts/tower/configuration.nix
index 80b49b3..f6e57b6 100644
--- a/hosts/tower/configuration.nix
+++ b/hosts/tower/configuration.nix
@@ -4,10 +4,40 @@
   imports =
     [ ./hardware-configuration.nix ];
   networking.hostName = "tower";
-  
-  boot = {
-    loader.systemd-boot.enable = true;
-    loader.efi.canTouchEfiVariables = true;
-    initrd.enable = true;
+  networking.interfaces.enp10s0.wakeOnLan = {
+    enable = true;
   };
-}
+  boot.initrd.enable = true;
+  boot.loader = {
+    efi.canTouchEfiVariables = true;
+    systemd-boot = {
+      enable = true;
+      windows = {
+        "nvme0n1p1" = {
+          title = "Windows";
+          efiDeviceHandle = "FS0";
+          sortKey = "1";
+        };
+      }; #end windows
+      edk2-uefi-shell = {
+        enable = true;
+        sortKey = "0";
+      }; # end edk2-uefi-shell
+    }; # end loader.systemd-boot
+  }; # end boot
+  hardware = {
+    graphics.enable = true;
+    nvidia = {
+      modesetting.enable = true;
+      powerManagement.enable = false;
+      powerManagement.finegrained = false;
+      open = true;
+      nvidiaSettings = true;
+      package = config.boot.kernelPackages.nvidiaPackages.stable;
+    }; # end nvidia
+  }; # end hardware
+  services = {
+    xserver.videoDrivers = [ "nvidia" ];
+    openssh.enable = true;
+  }; # end services
+} # end file
diff --git a/users/alisceon.nix b/users/alisceon.nix
deleted file mode 100644
index 2ee435e..0000000
--- a/users/alisceon.nix
+++ /dev/null
@@ -1,134 +0,0 @@
-{ pkgs, config, hostName, ... }: {
-  home.username = "alisceon";
-  home.homeDirectory = "/home/alisceon";
-  home.stateVersion = "24.05";
-  manual.manpages.enable = true;
-
-  programs = {
-    fish = {
-      enable = true;
-      # Disable greeting
-      interactiveShellInit = ''
-        set fish_greeting
-      '';
-      preferAbbrs = true;
-      shellAbbrs = {
-        ls = "exa";
-        ll = "exa -lah";
-        grep = "rg";
-        cat = "bat";
-        tsla-fan = "ipmitool -H 10.30.0.3 -U ADMIN -P ADMIN raw 0x30 0x70 0x66 0x01 0x0";
-        nixos-switch = "sudo nixos-rebuild switch --flake .#${hostName}";
-        nixos-test = "sudo nixos-rebuild build-vm --flake .#${hostName}";
-        pypod = "podman run --rm -it --network host -v '.:/run' -w '/run' python /run/";
-      };
-    };
-    git = {
-      enable = true;
-      userName = "alisceon";
-      userEmail = "alisceon@protonmail.com";
-      extraConfig = {
-        push = { autoSetupRemote = true; };
-      };
-    };
-    vscode.enable = true;
-    firefox = {
-      enable = true;
-      nativeMessagingHosts = [ 
-        pkgs.gnome-browser-connector
-      ];
-    };
-    obsidian = {
-      enable = true;
-      package = pkgs.obsidian;
-      
-      vaults = {
-        "Documents/Obsidian/private".enable = true;
-      };
-    };
-    bat.enable = true;
-    ssh = {
-      enable = true;
-      matchBlocks = {
-        "alisceon.com" = {
-          hostname = "alisceon.com";
-          user = "opc";
-        };
-        "miscbox" = {
-          hostname = "10.1.0.11";
-          proxyJump = "alisceon.com";
-          user = "opc";
-        };
-        "blogbox" = {
-          hostname = "10.1.0.10";
-          proxyJump = "alisceon.com";
-          user = "ubuntu";
-        };
-        "filurbox" = {
-          hostname = "oci.malice.zone";
-          user = "opc";
-        };
-        "dnspi" = {
-          hostname = "10.40.0.2";
-          user = "pi";
-        };
-        "tsla-exporter-bridge" = {
-          hostname = "alma02.lab.the.malice.zone";
-          user = "root";
-        };
-        "tsla-runner-boi" = {
-          hostname = "alma03.lab.the.malice.zone";
-          user = "root";
-        };
-      };
-    };
-  };
-
-  home.packages = with pkgs; [
-    signal-desktop
-    discord
-    eza
-    fd
-    ripgrep
-  ];
-
-  xdg = {
-    enable = true;
-    userDirs.enable = true;
-    mime.enable = true;
-  };
-
-  services.syncthing = {
-    enable = true;
-  };
-  dconf.enable = true;
-  dconf.settings = {
-    "org/gnome/desktop/background" = {
-      color-shading-type = "solid";
-      picture-options = "zoom";
-      primary-color = "#000000000000";
-      secondary-color = "#000000000000";
-      picture-uri = "org.gnome.desktop.background picture-uri 'file:///home/alisceon/Pictures/songbird/songbird4.jpg'";
-      picture-uri-dark = "org.gnome.desktop.background picture-uri 'file:///home/alisceon/Pictures/songbird/songbird4.jpg'";
-    };
-    "org/gnome/desktop/interface" = {
-      accent-color = "red";
-      color-scheme = "prefer-dark";
-    };
-    "org/gnome/shell" = {
-      disable-user-extensions = false;
-      enabled-extensions = [ pkgs.gnomeExtensions.ddterm.extensionUuid ];
-      favorite-apps = [
-        "org.gnome.Nautilus.desktop"
-        "firefox.desktop"
-        "vscode.desktop"
-        "obsidian.desktop"
-        "discord.desktop"
-        "signal-desktop.desktop"
-      ];
-    };
-    "com/github/amezin/ddterm" = {
-      ddterm-toggle-hotkey = [ "<Super>Return" ];
-    };
-  };
-}