flake.lock

@@ -524,11 +524,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1724053136,
+        "lastModified": 1723210907,
-        "narHash": "sha256-INFq3ENfz0dtIFohPkMiIeX9yBcGV/Xzl1sTK/268fg=",
+        "narHash": "sha256-bDREVGFdYVZDhkipgFSJSTxZMzsNl1wg1EM6Li5eWlk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "815d5589d958531af840d7e29424c8525aeff441",
+        "rev": "d6037c7090df9b7fb9f8d421570d25553713e264",
         "type": "github"
       },
       "original": {
@@ -540,11 +540,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1723637854,
+        "lastModified": 1722813957,
-        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
+        "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
+        "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
         "type": "github"
       },
       "original": {
@@ -588,11 +588,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1723938990,
+        "lastModified": 1722987190,
-        "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=",
+        "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890",
+        "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90",
         "type": "github"
       },
       "original": {

overlays/default.nix

@@ -4,7 +4,7 @@
   ...
 }: {
   flake = {
-    nixosModules = {
+    nixosModules = rec {
       overlays = {...}: {
         nixpkgs.overlays = [
           inputs.deno2nix.overlays.default
@@ -20,7 +20,6 @@
             paperless-ngx = unstable.paperless-ngx;
             waybar = master.waybar;
             nix-inspect = unstable.nix-inspect;
-            nix = unstable.lix;
             authelia = authelia-438.authelia;
 
             adlist = inputs.adblock-unbound.packages.${prev.system};
@@ -44,7 +43,7 @@
 
           (import ./element-desktop.nix)
           (import ../pkgs)
-          # (import ./blesh.nix)
+          (import ./blesh.nix)
           (import ./rnix-lsp.nix)
           (import ./neovim-plugins.nix)
 

pkgs/_sources/generated.nix

@@ -1,10 +1,6 @@
 # This file was generated by nvfetcher, please do not modify it manually.
+{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
 {
-  fetchgit,
-  fetchurl,
-  fetchFromGitHub,
-  dockerTools,
-}: {
   b12f-io-nvfetcher = {
     pname = "b12f-io-nvfetcher";
     version = "38adb94ce69d8807ea2e36f57abe08091192b31c";

users/b12f/concepts-and-training.nix

@@ -34,55 +34,46 @@ in {
         "salt.base.test" = {
           hostname = "10.0.0.2";
           user = "root";
-          proxyJump = "gateway.base.test";
         };
 
         "gateway.base.test" = {
-          # hostname = "10.0.0.3";
+          hostname = "10.0.0.3";
-          hostname = "gateway.base.cate-infra-test.de";
           user = "root";
         };
 
         "monitor.base.test" = {
           hostname = "10.0.0.4";
           user = "root";
-          proxyJump = "gateway.base.test";
         };
 
         "proxy1.prod.test" = {
           hostname = "10.0.0.6";
           user = "root";
-          proxyJump = "gateway.base.test";
         };
 
         "proxy2.prod.test" = {
           hostname = "10.0.0.7";
           user = "root";
-          proxyJump = "gateway.base.test";
         };
 
         "demo1.prod.test" = {
           hostname = "10.0.0.5";
           user = "root";
-          proxyJump = "gateway.base.test";
         };
 
         "demo2.prod.test" = {
           hostname = "10.0.0.5";
           user = "root";
-          proxyJump = "gateway.base.test";
         };
 
         "proxy1.test.test" = {
           hostname = "10.0.0.8";
           user = "root";
-          proxyJump = "gateway.base.test";
         };
 
         "proxy2.test.test" = {
           hostname = "10.0.0.9";
           user = "root";
-          proxyJump = "gateway.base.test";
         };
       };
     };