diff --git a/flake.lock b/flake.lock
index 5a56e6e..6f2a45c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -210,16 +210,16 @@
         "flakeCompat": "flakeCompat",
         "nixCargoIntegration": "nixCargoIntegration",
         "nixpkgs": [
-          "latest"
+          "nixos"
         ],
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1634956879,
-        "narHash": "sha256-i0BFwMPjafzKxZ074iMuIl3mr+VaeYfBGh85At+Jttg=",
+        "lastModified": 1634993538,
+        "narHash": "sha256-4UBBfkxDanL4OL6xeB6BkiWNCXj6gFLp3/b+MB9Hos4=",
         "ref": "master",
-        "rev": "4ee92cad19cc94f0751f91fa9391d1899353d740",
-        "revCount": 1563,
+        "rev": "0cb5e0b2caba61bbcf6f57ce58506882766d5eea",
+        "revCount": 1565,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/helix-editor/helix.git"
@@ -237,16 +237,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1634544068,
-        "narHash": "sha256-RlRQBaAHfdWqfRyHdWuDPMkplBTYwuyDQqDcNbP/Sog=",
+        "lastModified": 1634939539,
+        "narHash": "sha256-m+RC6it1doMjq5U5e1B36thzOOBc1GF4tVLK2SNMvzg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ff2bed9dac84fb202bbb3c49fdcfe30c29d0b12f",
+        "rev": "8278c14f5f8725e1b5936d6f54e63d4626aae98c",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-21.05",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
@@ -267,22 +267,6 @@
         "type": "github"
       }
     },
-    "latest_2": {
-      "locked": {
-        "lastModified": 1633617995,
-        "narHash": "sha256-+RfYXTAXtULLSAMFDHWaA20NhNg3YQ9GcntVJqDDjSI=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "70088dc29994c32f8520150e34c6e57e8453f895",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "70088dc29994c32f8520150e34c6e57e8453f895",
-        "type": "github"
-      }
-    },
     "lowdown-src": {
       "flake": false,
       "locked": {
@@ -303,7 +287,7 @@
     "naersk": {
       "inputs": {
         "nixpkgs": [
-          "latest"
+          "nixos"
         ]
       },
       "locked": {
@@ -370,16 +354,16 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1634883236,
-        "narHash": "sha256-Z9ofgNzSmYVhs+STOAvk6QNy5KVsUmADOE+UIfur2ug=",
+        "lastModified": 1634782485,
+        "narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b0274abf85097e9a2da868b28a5532918dc14380",
+        "rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-21.05",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -458,7 +442,7 @@
       "inputs": {
         "cachix": "cachix",
         "nixpkgs": [
-          "latest"
+          "nixos"
         ]
       },
       "locked": {
@@ -481,7 +465,7 @@
           "naersk"
         ],
         "nixpkgs": [
-          "latest"
+          "nixos"
         ],
         "utils": [
           "digga",
@@ -507,7 +491,6 @@
         "digga": "digga",
         "helix": "helix",
         "home": "home",
-        "latest": "latest_2",
         "naersk": "naersk",
         "nixos": "nixos",
         "nixos-hardware": "nixos-hardware",
diff --git a/flake.nix b/flake.nix
index 3a75f53..cf65dae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,68 +1,52 @@
 {
   description = "A highly structured configuration database.";
 
+  nixConfig.extra-experimental-features = "nix-command flakes ca-references";
+  nixConfig.extra-substituters = "https://nrdxp.cachix.org https://nix-community.cachix.org";
+  nixConfig.extra-trusted-public-keys = "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=";
+
   inputs =
     {
-      nixos.url = "github:nixos/nixpkgs/nixos-21.05";
-      latest.url = "github:nixos/nixpkgs/70088dc29994c32f8520150e34c6e57e8453f895";
+      nixos.url = "github:nixos/nixpkgs/nixos-unstable";
 
       digga.url = "github:divnix/digga/main";
       digga.inputs.nixpkgs.follows = "nixos";
       digga.inputs.nixlib.follows = "nixos";
       digga.inputs.home-manager.follows = "home";
 
-      /*bud.url = "github:divnix/bud";
-        bud.inputs.nixpkgs.follows = "nixos";
-        bud.inputs.devshell.follows = "digga/devshell";*/
-
-      home.url = "github:nix-community/home-manager/release-21.05";
+      home.url = "github:nix-community/home-manager/master";
       home.inputs.nixpkgs.follows = "nixos";
 
-      /*darwin.url = "github:LnL7/nix-darwin";
-        darwin.inputs.nixpkgs.follows = "latest";*/
-
-      /*agenix.url = "github:ryantm/agenix";
-        agenix.inputs.nixpkgs.follows = "latest";*/
-
-      /*nvfetcher.url = "github:berberman/nvfetcher";
-        nvfetcher.inputs.nixpkgs.follows = "latest";
-        nvfetcher.inputs.flake-compat.follows = "digga/deploy/flake-compat";
-        nvfetcher.inputs.flake-utils.follows = "digga/flake-utils-plus/flake-utils";*/
-
       naersk.url = "github:nmattia/naersk";
-      naersk.inputs.nixpkgs.follows = "latest";
+      naersk.inputs.nixpkgs.follows = "nixos";
 
       nixos-hardware.url = "github:nixos/nixos-hardware";
 
       rnixLsp = {
         url = "github:nix-community/rnix-lsp";
         inputs.naersk.follows = "naersk";
-        inputs.nixpkgs.follows = "latest";
+        inputs.nixpkgs.follows = "nixos";
         inputs.utils.follows = "digga/flake-utils";
       };
       helix = {
         url = "https://github.com/helix-editor/helix.git";
         type = "git";
         submodules = true;
-        inputs.nixpkgs.follows = "latest";
+        inputs.nixpkgs.follows = "nixos";
       };
       nixosPersistence.url = "github:nix-community/impermanence";
       nixpkgsWayland = {
         url = "github:colemickens/nixpkgs-wayland";
-        inputs.nixpkgs.follows = "latest";
+        inputs.nixpkgs.follows = "nixos";
       };
     };
 
   outputs =
     { self
     , digga
-      #, bud
     , nixos
     , home
     , nixos-hardware
-      #, nur
-      #, agenix
-      #, nvfetcher
     , nixosPersistence
     , nixpkgsWayland
     , rnixLsp
@@ -79,22 +63,13 @@
           nixos = {
             imports = [ (digga.lib.importOverlays ./overlays) ];
             overlays = [
-              #digga.overlays.patchedNix
-              #nur.overlay
-              #agenix.overlay
-              #nvfetcher.overlay
-              #deploy.overlay
-              nixpkgsWayland.overlay
-              ./pkgs/default.nix
-            ];
-          };
-          latest = {
-            overlays = [
+              #nixpkgsWayland.overlay
               (_: prev: {
                 helix = helix.packages.${prev.system}.helix;
                 helix-src = prev.helix.src;
                 rnix-lsp = rnixLsp.packages.${prev.system}.rnix-lsp;
               })
+              ./pkgs/default.nix
             ];
           };
         };
@@ -120,8 +95,6 @@
               digga.nixosModules.bootstrapIso
               digga.nixosModules.nixConfig
               home.nixosModules.home-manager
-              #agenix.nixosModules.age
-              #bud.nixosModules.bud
               nixosPersistence.nixosModules.impermanence
             ];
           };
@@ -156,14 +129,6 @@
         homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
 
         deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
-
-        /*defaultTemplate = self.templates.bud;
-          templates.bud.path = ./.;
-          templates.bud.description = "bud template";*/
       }
-    //
-    {
-      # budModules = { devos = import ./bud; };
-    }
   ;
 }
diff --git a/hosts/lungmen.nix b/hosts/lungmen.nix
index 54d671b..ed940eb 100644
--- a/hosts/lungmen.nix
+++ b/hosts/lungmen.nix
@@ -227,7 +227,7 @@ in
     };
   };
   virtualisation = {
-    podman.enable = true;
+    podman.enable = false;
     libvirtd.enable = false;
   };
 
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index 21af2ad..3fc1369 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -1,51 +1,3 @@
 channels: final: prev: {
   __dontExport = true; # overrides clutter up actual creations
-
-  inherit (channels.latest)
-    cachix
-    dhall
-    discord
-    element-desktop
-    rage
-    nixpkgs-fmt
-    qutebrowser
-    signal-desktop
-    starship
-    hydrus
-    steam
-    steam-run
-    lutris
-    rust-analyzer
-    vscodium
-    vscode
-    gh
-    chromium-unwrapped
-    chromium
-    sublime4
-    git
-    git-lfs
-    helix
-    rnix-lsp
-    vscode-extensions
-    vscode-utils
-    nixUnstable
-    bottom
-    bat
-    ripgrep
-    alacritty
-    ;
-
-  libnotify-latest = channels.latest.libnotify;
-
-  haskellPackages = prev.haskellPackages.override
-    (old: {
-      overrides = prev.lib.composeExtensions (old.overrides or (_: _: { })) (hfinal: hprev:
-        let version = prev.lib.replaceChars [ "." ] [ "" ] prev.ghc.version;
-        in
-        {
-          # same for haskell packages, matching ghc versions
-          inherit (channels.latest.haskell.packages."ghc${version}")
-            haskell-language-server;
-        });
-    });
 }
diff --git a/users/patriot/default.nix b/users/patriot/default.nix
index 6ec64c1..0c75888 100644
--- a/users/patriot/default.nix
+++ b/users/patriot/default.nix
@@ -11,7 +11,7 @@ in
     isNormalUser = true;
     createHome = true;
     home = "/home/patriot";
-    extraGroups = [ "wheel" "adbusers" "dialout" "wireshark" ];
+    extraGroups = [ "wheel" "adbusers" "dialout" /* "wireshark" */ ];
     shell = pkgs.zsh;
     hashedPassword =
       "$6$spzqhAyJfhHy$iHgLBlhjGn1l8PnbjJdWTn1GPvcjMqYNKUzdCe/7IrX6sHNgETSr/Nfpdmq9FCXLhrAfwHOd/q/8SvfeIeNX4/";
@@ -36,10 +36,10 @@ in
     adb.enable = true;
     steam.enable = true;
     java = {
-      enable = true;
+      enable = false;
       package = pkgs.adoptopenjdk-jre-bin;
     };
-    wireshark.enable = true;
+    wireshark.enable = false;
   };
 
   security.pam.services.patriot = {
@@ -286,7 +286,7 @@ in
             kdenlive
             gnome3.seahorse
             gnome3.gnome-boxes
-            wine-staging
+            #wine-staging
             cachix
             appimage-run
             bitwarden
@@ -323,9 +323,9 @@ in
                 unset VK_ICD_FILENAMES
                 export VK_ICD_FILENAMES=${nixosConfig.environment.variables.VK_ICD_FILENAMES}'';
             }))
-            (multimc.overrideAttrs (old: {
+            /*(multimc.overrideAttrs (old: {
               src = builtins.fetchGit { url = "https://github.com/AfoninZ/MultiMC5-Cracked.git"; ref = "develop"; rev = "9069e9c9d0b7951c310fdcc8bdc70ebc422a7634"; submodules = true; };
-            }))
+              }))*/
           ];
       };
 
@@ -576,26 +576,8 @@ in
           in
           {
             enable = true;
-            colors = {
-              window = {
-                background = bgc;
-                border = bgc;
-                separator = bgc;
-              };
-              rows = {
-                normal = {
-                  background = bgc;
-                  foreground = fgc;
-                  backgroundAlt = bgc;
-                  highlight = {
-                    background = bgc;
-                    foreground = acc;
-                  };
-                };
-              };
-            };
+            cycle = true;
             font = fontComb;
-            separator = "none";
             terminal = pkgBin "alacritty";
           };
         vscode = {