diff --git a/.gitignore b/.gitignore
index 13888a8..cfcaf8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ devenv.local.nix
 # pre-commit
 .pre-commit-config.yaml
 
+# clamav
+.clamav
\ No newline at end of file
diff --git a/devenv.nix b/devenv.nix
index 75490cd..f075a47 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -1,22 +1,11 @@
 { pkgs, lib, config, inputs, ... }:
 
 {
-  # https://devenv.sh/basics/
-  env.GREET = "devenv";
 
-  # https://devenv.sh/packages/
-  packages = [ pkgs.git ];
+  packages = [ 
+    pkgs.git
+  ];
 
-  # https://devenv.sh/languages/
-  # languages.rust.enable = true;
-
-  # https://devenv.sh/processes/
-  # processes.cargo-watch.exec = "cargo-watch";
-
-  # https://devenv.sh/services/
-  # services.postgres.enable = true;
-
-  # https://devenv.sh/scripts/
   scripts.hello.exec = ''
     echo hello from $GREET
   '';
@@ -26,20 +15,8 @@
     git --version
   '';
 
-  # https://devenv.sh/tasks/
-  # tasks = {
-  #   "myproj:setup".exec = "mytool build";
-  #   "devenv:enterShell".after = [ "myproj:setup" ];
-  # };
-
-  # https://devenv.sh/tests/
   enterTest = ''
     echo "Running tests"
     nix flake check --all-systems
   '';
-
-  # https://devenv.sh/git-hooks/
-  # git-hooks.hooks.shellcheck.enable = true;
-
-  # See full reference at https://devenv.sh/reference/options/
 }
diff --git a/home/alisceon.nix b/home/alisceon.nix
index c51faab..eae5b29 100644
--- a/home/alisceon.nix
+++ b/home/alisceon.nix
@@ -28,8 +28,8 @@
         # Development commands
         devt = "devenv test";
         devs = "devenv shell";
-        devu = "devenv up";
-        devi = "nix flake init -t path:/home/alisceon/Templates/devenv#python";
+        devu = "devenv up -d";
+        devi = "nix flake init -t templates#";
 
         pypod = "podman run --rm -it --network host -v '.:/run' -w '/run' python /run/";
 
diff --git a/hosts/common.nix b/hosts/common.nix
index 64ecfc9..0fb51c4 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -2,16 +2,37 @@
 
 {
   system.stateVersion = "24.05";
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-    auto-optimise-store = true;
-    trusted-users = [ "root" "alisceon" ];
-  }; # end nix settings
-  nix.gc = {
-    automatic = true;
-    dates = "weekly";
-    options = "--delete-older-than 7d";
-  }; # end nix gc
+  system.autoUpgrade = {
+    enable = true;
+    persistent = true;
+    flake = "/home/alisceon/.nixos_config";
+    flags = [
+      "--update-input"
+      "nixpkgs"
+      "-L"
+    ];
+    dates = "daily";
+  }; # end system.autoUpgrade
+
+  nix = {
+    settings = {
+      experimental-features = [ "nix-command" "flakes" ];
+      auto-optimise-store = true;
+      trusted-users = [ "root" "alisceon" ];
+    }; # end settings
+    gc = {
+      automatic = true;
+      persistent = true;
+      dates = "daily";
+      options = "--delete-older-than 3d";
+    }; # end gc
+    registry = {
+      templates.to = {
+        type = "git";
+        url = "git+ssh://git@git.malice.zone/alisceon/devenv_templates.git";
+      };
+    }; #end registry
+  }; #end nix
 
   console.keyMap = "sv-latin1";
   networking.networkmanager.enable = true;
@@ -50,20 +71,6 @@
       gnome-initial-setup.enable = false;
     };
   }; # end services
-  
-  environment.gnome.excludePackages = with pkgs; [
-    evolution
-    geary
-    gnome-contacts
-    gnome-music
-    gnome-user-docs
-    gnome-tour
-    gnome-weather
-    gnome-maps
-    gnome-calendar
-    gnome-initial-setup
-    gnome-clocks
-  ];
 
   services.fwupd.enable = true;
   programs = {
@@ -75,57 +82,72 @@
     };
   }; # end programs
 
-  environment.systemPackages = with pkgs; [
-    # CLI tools
-    git
-    wget
-    curl
-    btop
-    ripgrep
-    bat
-    fd
-    eza
-    bash
-    
-    # Chat
-    discord
-    signal-desktop
-    
-    # Browser
-    firefox
-    
-    # Development
-    vscode
-    devenv
-    direnv
-    
-    # Virtualization
-    podman
-    
-    # GNOME tweaks and extensions
-    gnome-tweaks
-    dconf-editor
-    gnomeExtensions.ddterm
+  environment = {
+    systemPackages = with pkgs; [
+      # CLI tools
+      git
+      wget
+      curl
+      btop
+      ripgrep
+      bat
+      fd
+      eza
+      bash
+      
+      # Chat
+      discord
+      signal-desktop
+      
+      # Browser
+      firefox
+      
+      # Development
+      vscode
+      devenv
+      direnv
+      
+      # Virtualization
+      podman
+      
+      # GNOME tweaks and extensions
+      gnome-tweaks
+      dconf-editor
+      gnomeExtensions.ddterm
 
-    # Other
-    syncthing
-    steam
-    krita
-    edk2-uefi-shell
-    obsidian
-  ];
-  environment.shells = with pkgs; [ fish ];
+      # Other
+      syncthing
+      steam
+      krita
+      edk2-uefi-shell
+      obsidian
+    ]; # end systemPackages
+    gnome.excludePackages = with pkgs; [
+      evolution
+      geary
+      gnome-contacts
+      gnome-music
+      gnome-user-docs
+      gnome-tour
+      gnome-weather
+      gnome-maps
+      gnome-calendar
+      gnome-initial-setup
+      gnome-clocks
+    ]; # end gnome.excludePackages
+    shells = with pkgs; [ fish ];
+  }; # end environment
 
   virtualisation.podman = {
     enable = true;
     dockerCompat = true;
     defaultNetwork.settings.dns_enabled = true;
-  };
+  }; # end virtualisation
 
   users.users.alisceon = {
     isNormalUser = true;
     extraGroups = [ "wheel" "networkmanager" "podman" ];
     shell = pkgs.fish;
-  };
+  }; # end users
   
-}
+} #end file
diff --git a/hosts/electra/configuration.nix b/hosts/electra/configuration.nix
index afcbc83..d18d5e3 100644
--- a/hosts/electra/configuration.nix
+++ b/hosts/electra/configuration.nix
@@ -36,4 +36,17 @@
     loader.timeout = 0;
     #resumeDevice = "/dev/disk/by-uuid/c49249b9-0d68-44af-97e0-e399c8409408";
   };
+  systemd.services = {
+    fprintd = {
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.Type = "simple";
+    };
+  };
+  services = {
+    fprintd = {
+      enable = true;
+      tod.enable = true;
+      tod.driver = pkgs.libfprint-2-tod1-goodix;
+    };
+  };
 }
diff --git a/run/.containerenv b/run/.containerenv
deleted file mode 100755
index e69de29..0000000