diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..0d69151
--- /dev/null
+++ b/.envrc
@@ -0,0 +1,2 @@
+use flake
+eval "$shellHook"
diff --git a/.gitignore b/.gitignore
index 8b13789..726d2d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-
+result
+.direnv
diff --git a/config.nix b/config.nix
deleted file mode 100644
index 7e0a949..0000000
--- a/config.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  allowUnfree = true;
-  allowUnsupportedSystem = true;
-}
diff --git a/configs/kak/colors/nord.kak b/configs/kak/colors/nord.kak
index bc009d0..cb97cd4 100644
--- a/configs/kak/colors/nord.kak
+++ b/configs/kak/colors/nord.kak
@@ -63,13 +63,13 @@ set-face global StatusLineMode rgb:5e81ac,rgb:3b4252
     # face used for the current mode except the normal mode
 
 set-face global StatusLineInfo rgb:5e81ac,rgb:3b4252
-	# face used for special information
+    # face used for special information
 
 set-face global StatusLineValue rgb:5e81ac,rgb:3b4252
     # face used for special values (numeric prefixes, registers, etc.)
 
 set-face global StatusCursor rgb:2e3440,rgb:ebcb8b
-	# face used for the status line cursor
+    # face used for the status line cursor
 
 set-face global Prompt rgb:88c0d0,rgb:3b4252
     # face used prompt displayed on the status line
diff --git a/configs/rofi/onedark.rasi b/configs/rofi/onedark.rasi
new file mode 100644
index 0000000..f63f4fb
--- /dev/null
+++ b/configs/rofi/onedark.rasi
@@ -0,0 +1,100 @@
+/*
+ * ROFI One Dark
+ *
+ * Based on OneDark.vim (https://github.com/joshdick/onedark.vim)
+ *
+ * Author: Benjamin Stauss
+ * User: me-benni
+ *
+ */
+
+
+* {
+  black:      #000000;
+  red:        #eb6e67;
+  green:      #95ee8f;
+  yellow:     #f8c456;
+  blue:       #6eaafb;
+  mangenta:   #d886f3;
+  cyan:       #6cdcf7;
+  emphasis:   #50536b;
+  text:       #dfdfdf;
+  text-alt:   #b2b2b2;
+  fg:         #abb2bf;
+  bg:         #282c34;
+
+  spacing: 0;
+  background-color: transparent;
+
+  font: "Knack Nerd Font 14";
+  text-color: @text;
+}
+
+window {
+  transparency: "real";
+  fullscreen: true;
+  background-color: #282c34dd;
+}
+
+mainbox {
+  padding: 30% 30%;
+}
+
+inputbar {
+  margin: 0px 0px 20px 0px;
+  children: [prompt, textbox-prompt-colon, entry, case-indicator];
+}
+
+prompt {
+  text-color: @blue;
+}
+
+textbox-prompt-colon {
+  expand: false;
+  str: ":";
+  text-color: @text-alt;
+}
+
+entry {
+  margin: 0px 10px;
+}
+
+listview {
+  spacing: 5px;
+  dynamic: true;
+  scrollbar: false;
+}
+
+element {
+  padding: 5px;
+  text-color: @text-alt;
+  highlight: bold #95ee8f; /* green */
+  border-radius: 3px;
+}
+
+element selected {
+  background-color: @emphasis;
+  text-color: @text;
+}
+
+element urgent, element selected urgent {
+  text-color: @red;
+}
+
+element active, element selected active {
+  text-color: @purple;
+}
+
+message {
+  padding: 5px;
+  border-radius: 3px;
+  background-color: @emphasis;
+  border: 1px;
+  border-color: @cyan;
+}
+
+button selected {
+  padding: 5px;
+  border-radius: 3px;
+  background-color: @emphasis;
+}
\ No newline at end of file
diff --git a/custom/cocktail-bar-cli/default.nix b/custom/cocktail-bar-cli/default.nix
index 1aa5b11..a47aef3 100644
--- a/custom/cocktail-bar-cli/default.nix
+++ b/custom/cocktail-bar-cli/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, autoPatchelfHook, ... }:
+{ stdenv, autoPatchelfHook, ... }:
 stdenv.mkDerivation rec {
   name = "cocktail-bar-cli";
   version = "1.0";
diff --git a/custom/default.nix b/custom/default.nix
index cb5f006..ce76210 100644
--- a/custom/default.nix
+++ b/custom/default.nix
@@ -4,10 +4,9 @@
 
 let
   self = with pkgs; {
-    lockscreen = callPackage ./lockscreen {};
-    update-background = callPackage ./update-background {};
-    cocktail-bar-cli = callPackage ./cocktail-bar-cli {};
-    # joystickwake = callPackage ./joystickwake {};
+    lockscreen = callPackage ./lockscreen { };
+    update-background = callPackage ./update-background { };
+    cocktail-bar-cli = callPackage ./cocktail-bar-cli { };
   };
 in
 (self)
diff --git a/custom/joystickwake/default.nix b/custom/joystickwake/default.nix
deleted file mode 100644
index 514ce4a..0000000
--- a/custom/joystickwake/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, python3, fetchFromGitHub }:
-python3.pkgs.buildPythonApplication rec {
-  pname = "joystickwake";
-  version = "0.2.4";
-
-  src = fetchFromGitHub {
-    owner = "foresto";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0j8xwfmzzmc9s88zvzc3lv67821r6x28vy6vli3srvx859wprppd";
-  };
-
-  buildInputs = with python3.pkgs; [
-    pyudev
-    xlib
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    pyudev
-    xlib
-  ];
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "A joystick-aware screen waker";
-    longDescription = ''
-      Linux gamers often find themselves unexpectedly staring at a blank screen, because their display server fails to recognize game controllers as input devices, allowing the screen blanker to activate during gameplay.
-      This program works around the problem by temporarily disabling screen blankers when joystick activity is detected.
-    '';
-    homepage = "https://github.com/foresto/joystickwake";
-    license = licenses.mit;
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/custom/lockscreen/default.nix b/custom/lockscreen/default.nix
index c9e0693..3b8e1da 100644
--- a/custom/lockscreen/default.nix
+++ b/custom/lockscreen/default.nix
@@ -1,18 +1,16 @@
 { lib
-, stdenv
 , rice
 , roboto
 , i3lock-color
-, update-background
-, writeScript
+, writeScriptBin
 , font ? { package = roboto; name = "Roboto"; }
-, palette ? rice.palette.palette {}
+, palette ? rice.palette.palette { }
 , ...
 }:
 let
-  strPalette = rice.palette.toRGBAHex palette;
+  strPalette = lib.rice.palette.toRGBAHex palette;
 in
-writeScript "lockscreen.sh" ''
+writeScriptBin "lockscreen" ''
   #!/bin/sh
   # Using font package ${font.package}
   ${i3lock-color}/bin/i3lock-color \
@@ -53,6 +51,5 @@ writeScript "lockscreen.sh" ''
   --pass-media-keys \
   --pass-screen-keys \
   --pass-volume-keys \
-  --nofork &&
-  ${update-background}
+  --nofork
 ''
diff --git a/custom/update-background/default.nix b/custom/update-background/default.nix
index 1a74946..92d3c17 100644
--- a/custom/update-background/default.nix
+++ b/custom/update-background/default.nix
@@ -1,18 +1,17 @@
-{ lib
-, stdenv
-, feh
+{ feh
 , glib
 , findutils
 , gnugrep
 , coreutils
-, writeScript
-, backgrounds_directory ? "$HOME/Immagini/Sfondi"}:
+, writeScriptBin
+, backgrounds_directory ? "$HOME/Immagini/Sfondi"
+}:
 let
   find = "${findutils}/bin/find";
   grep = "${gnugrep}/bin/grep";
   shuf = "${coreutils}/bin/shuf";
 in
-writeScript "update-background.sh" ''
+writeScriptBin "update-background" ''
   #!/bin/sh
   if [ $# -eq 0 ]; then
     image=`${find} ${backgrounds_directory} -type f | ${grep} -v "/\." | ${shuf} -n 1`
@@ -22,4 +21,5 @@ writeScript "update-background.sh" ''
   echo "image: $image"
   ${feh}/bin/feh --bg-fill --no-fehbg "$image"
   ${glib}/bin/gsettings set org.gnome.desktop.background picture-uri "file://$image"
+  true
 ''
diff --git a/environment.nix b/environment.nix
deleted file mode 100644
index 112b4f8..0000000
--- a/environment.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-values: {
-  enableCpp = false;
-  enableData = false;
-  enableGo = false;
-  enableHtml = false;
-  enableJava = false;
-  enableJavascript = false;
-  enableLatex = false;
-  enableNix = false;
-  enablePython = false;
-  enableRust = false;
-  enableShell = false;
-  enableSpelling = false;
-  enableOffice = true;
-} // values
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..62307be
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,298 @@
+{
+  "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1656065134,
+        "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1655880690,
+        "narHash": "sha256-pO+EqUefNFolIWV1DHXPfI8NuUtD4fd7JFKoaCjVXOs=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "a839432a5c3d2a762d68168093349097e6affb07",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-22.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager-unstable": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "unstable"
+        ],
+        "nmd": "nmd",
+        "nmt": "nmt",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1656199469,
+        "narHash": "sha256-17t4qc016C1p6oNSKOrYbOCErWhQI4dr4nzJKrGO8VE=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "1dbac84b846e4bfa21a08e31e95e11f0965ed042",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nix-rice": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": "nixpkgs",
+        "pre-commit-hooks": "pre-commit-hooks"
+      },
+      "locked": {
+        "lastModified": 1654440289,
+        "narHash": "sha256-Mgm0eUNDb9td3aVImg7jYq/0W0XWPJo1g6K4ONgr31U=",
+        "owner": "bertof",
+        "repo": "nix-rice",
+        "rev": "9faf7bdc8935577f48eb80d4625a01a024e82489",
+        "type": "github"
+      },
+      "original": {
+        "owner": "bertof",
+        "repo": "nix-rice",
+        "type": "github"
+      }
+    },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1656241064,
+        "narHash": "sha256-+jWwBt515aFGukeX8WSafg9CM3Ju3FD0XrF+X4ph0mU=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "99e33a57149916ebede78ec13edd9ba310c10f2f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1653931853,
+        "narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "f1c167688a6f81f4a51ab542e5f476c8c595e457",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1656219440,
+        "narHash": "sha256-2dhFA29f3dpw4axAKhVj8JsHQzHViG92a7AfkXLHnBY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4a155658a7c3a9e465c365beb0a50352efa64ca0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-22.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nmd": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1653339422,
+        "narHash": "sha256-RNLq09vfj21TyYuUCeD6BNTNC6Ew8bLhQULZytN4Xx8=",
+        "owner": "rycee",
+        "repo": "nmd",
+        "rev": "91dee681dd1c478d6040a00835d73c0f4a4c5c29",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmd",
+        "type": "gitlab"
+      }
+    },
+    "nmt": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1648075362,
+        "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
+        "owner": "rycee",
+        "repo": "nmt",
+        "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmt",
+        "type": "gitlab"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-utils": [
+          "nix-rice",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nix-rice",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1652714503,
+        "narHash": "sha256-qQKVEfDe5FqvGgkZtg5Pc491foeiDPIOeycHMqnPDps=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "521a524771a8e93caddaa0ac1d67d03766a8b0b3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks_2": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1656169028,
+        "narHash": "sha256-y9DRauokIeVHM7d29lwT8A+0YoGUBXV3H0VErxQeA8s=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "db3bd555d3a3ceab208bed48f983ccaa6a71a25e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "home-manager": "home-manager",
+        "home-manager-unstable": "home-manager-unstable",
+        "nix-rice": "nix-rice",
+        "nixos-hardware": "nixos-hardware",
+        "nixpkgs": "nixpkgs_2",
+        "pre-commit-hooks": "pre-commit-hooks_2",
+        "tex2nix": "tex2nix",
+        "unstable": "unstable"
+      }
+    },
+    "tex2nix": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1646670117,
+        "narHash": "sha256-fU6gLOP2xm6lTRKfMKeXAm7rEhYAVR4RcRFK1zh/QTM=",
+        "owner": "Mic92",
+        "repo": "tex2nix",
+        "rev": "74159694f0c27ffa3f9172c6d691635568fbece4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "tex2nix",
+        "type": "github"
+      }
+    },
+    "unstable": {
+      "locked": {
+        "lastModified": 1655983783,
+        "narHash": "sha256-0h1FzkYWei24IdKNpCX93onkF/FMiXQG8SdEbTc0r8A=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6141b8932a5cf376fe18fcd368cecd9ad946cb68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1653893745,
+        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..96a5eee
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,177 @@
+{
+  description = "Thor system configuration";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/release-22.05";
+    home-manager = { url = "github:nix-community/home-manager/release-22.05"; inputs.nixpkgs.follows = "nixpkgs"; };
+
+    unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    home-manager-unstable = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "unstable"; };
+
+    flake-utils.url = "github:numtide/flake-utils";
+    nixos-hardware.url = "github:NixOS/nixos-hardware";
+
+    nix-rice = { url = "github:bertof/nix-rice"; inputs.inxpkgs.follows = "unstable"; inputs.flake-utils.follows = "flake-utils"; };
+    pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; };
+    tex2nix = { url = github:Mic92/tex2nix; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; };
+  };
+
+  outputs =
+    { self
+    , nixpkgs
+    , home-manager
+    , unstable
+    , home-manager-unstable
+    , flake-utils
+    , nixos-hardware
+    , tex2nix
+    , nix-rice
+    , pre-commit-hooks
+    }:
+    let
+      system = "x86_64-linux";
+      overlaysBuilder = system: [
+        (nix-rice.overlays.default)
+        (import ./rice.nix)
+        (_: _: { inherit (tex2nix.packages.${system}) tex2nix; })
+        (final: _: {
+          update-background = final.callPackage ./custom/update-background { backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+"; };
+          lockscreen = final.callPackage ./custom/lockscreen { palette = final.rice.colorPalette; font = final.rice.font.normal; };
+        })
+        (_: _: { stable = pkgs; })
+        (_: _: { unstable = unstablePkgs; })
+      ];
+      nixpkgsSettings = {
+        inherit system;
+        overlays = overlaysBuilder system;
+        config = {
+          extraOptions = "experimental-features = nix-command flakes";
+          allowUnfree = true;
+          permittedInsecurePackages = [ "electron-9.4.4" ]; # authy dependency
+        };
+      };
+      pkgs = import nixpkgs nixpkgsSettings;
+      unstablePkgs = import unstable nixpkgsSettings;
+      homeManagerSettings = { home-manager = { useGlobalPkgs = true; useUserPackages = true; }; };
+
+      odinBaseModules = [
+        { nixpkgs = nixpkgsSettings; }
+        ./odin/hardware-configuration.nix
+        nixos-hardware.nixosModules.common-cpu-intel
+        nixos-hardware.nixosModules.common-pc-laptop
+        nixos-hardware.nixosModules.common-pc-laptop-ssd
+        ./odin/common_configuration.nix
+      ];
+
+      thorBaseModules = [
+        { nixpkgs = nixpkgsSettings; }
+        ./thor/hardware-configuration.nix
+        nixos-hardware.nixosModules.common-cpu-amd
+        nixos-hardware.nixosModules.common-pc-ssd
+        ./thor/configuration.nix
+      ];
+
+      lokiBaseModules = [
+        { nixpkgs = nixpkgsSettings; }
+        ./loki/hardware-configuration.nix
+        nixos-hardware.nixosModules.common-cpu-intel
+        nixos-hardware.nixosModules.common-pc-ssd
+        ./loki/configuration.nix
+      ];
+
+      odinStable = extraModules: nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = odinBaseModules ++ [
+          home-manager.nixosModules.home-manager
+          homeManagerSettings
+          { home-manager.users.bertof = import ./home_manager/odin.nix; }
+        ] ++ extraModules;
+      };
+
+      odinUnstable = extraModules: unstable.lib.nixosSystem {
+        inherit system;
+        modules = odinBaseModules ++ [
+          home-manager-unstable.nixosModules.home-manager
+          homeManagerSettings
+          { home-manager.users.bertof = import ./home_manager/odin.nix; }
+        ] ++ extraModules;
+      };
+
+      thorStable = extraModules: nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = thorBaseModules ++ [
+          home-manager.nixosModules.home-manager
+          homeManagerSettings
+          { home-manager.users.bertof = import ./home_manager/thor.nix; }
+        ] ++ extraModules;
+      };
+
+      thorUnstable = extraModules: unstable.lib.nixosSystem {
+        inherit system;
+        modules = thorBaseModules ++ [
+          home-manager-unstable.nixosModules.home-manager
+          homeManagerSettings
+          { home-manager.users.bertof = import ./home_manager/thor.nix; }
+        ] ++ extraModules;
+      };
+
+      lokiUnstable = extraModules: unstable.lib.nixosSystem {
+        inherit system;
+        modules = lokiBaseModules ++ [
+          home-manager-unstable.nixosModules.home-manager
+          homeManagerSettings
+          { home-manager.users.bertof = import ./home_manager/loki.nix; }
+        ] ++ extraModules;
+      };
+
+      lokiStable = extraModules: nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = lokiBaseModules ++ [
+          home-manager.nixosModules.home-manager
+          homeManagerSettings
+          { home-manager.users.bertof = import ./home_manager/loki.nix; }
+        ] ++ extraModules;
+      };
+
+    in
+    {
+      packages.${system} = unstablePkgs;
+
+      nixosConfigurations = rec {
+
+        thor = thor-unstable;
+        thor-stable = thorStable [ ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
+        thor-unstable = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
+        # thor-big-data = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ./nixos_modules/sesar.nix ];
+
+        odin = odin-intel;
+        odin-intel = odin-intel-stable;
+        odin-nvidia = odin-nvidia-stable;
+        odin-intel-unstable = odinUnstable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
+        odin-nvidia-unstable = odinUnstable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
+        odin-intel-stable = odinStable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
+        odin-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
+
+        loki = loki-stable;
+        loki-stable = lokiStable [ ];
+        loki-unstable = lokiUnstable [ ];
+
+      };
+    } // (flake-utils.lib.eachDefaultSystem (system:
+    let unstablePkgs = import unstable { inherit system; overlays = overlaysBuilder system; };
+    in
+    rec {
+      checks = {
+        pre-commit-check = pre-commit-hooks.lib.${system}.run {
+          src = ./.;
+          hooks = { nixpkgs-fmt.enable = true; nix-linter.enable = true; };
+        };
+      };
+
+      devShells.default = unstablePkgs.mkShell {
+        shellHook = ''
+          ${self.checks.${system}.pre-commit-check.shellHook}
+        '';
+      };
+    }));
+}
diff --git a/freya.nix b/freya.nix
deleted file mode 100644
index 0468e42..0000000
--- a/freya.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  nixpkgs.overlays = [
-    (final: prev: {
-      devEnvironment = (import ./environment.nix) {
-        # enableCpp = true;
-        # enableData = true;
-        # enableGo = true;
-        # enableHtml = true;
-        # enableJavascript = true;
-        # enableJava = true;
-        # enableLatex = true;
-        # enableNix = true;
-        # enableOffice = true;
-        # enablePython = true;
-        # enableRust = true;
-        # enableShell = true;
-        # enableSpelling = true;
-      };
-    })
-  ];
-  home = {
-    language.base = "it_IT.UTF-8";
-    keyboard = {
-      layout = "it";
-      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
-    };
-    packages = with pkgs; [
-      htop
-      neofetch
-      nix-prefetch-scripts
-      ripgrep
-      wget
-    ];
-  };
-  imports = [
-    ./modules/configurations.nix
-    ./modules/fonts.nix
-    ./modules/bash.nix
-    ./modules/bat.nix
-    ./modules/bottom.nix
-    ./modules/broot.nix
-    ./modules/dircolors.nix
-    ./modules/direnv.nix
-    ./modules/git.nix
-    ./modules/gpg.nix
-    ./modules/info.nix
-    ./modules/jq.nix
-    ./modules/kakoune.nix
-    ./modules/keychain.nix
-    ./modules/lf.nix
-    ./modules/man.nix
-    ./modules/megasync.nix
-    ./modules/noti.nix
-    ./modules/ssh.nix
-    ./modules/starship.nix
-    ./modules/tmux.nix
-    ./modules/zoxide.nix
-    ./modules/zsh.nix
-    ./modules/shell_aliases.nix
-  ];
-}
diff --git a/home.nix b/home.nix
deleted file mode 100644
index dbb7757..0000000
--- a/home.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, lib, ... }:
-let
-  hostname = lib.fileContents /etc/hostname;
-  user = builtins.getEnv "USER";
-  host_config = builtins.toPath "/home/${user}/.config/nixpkgs/${hostname}.nix";
-in
-{
-  nixpkgs.overlays = [
-    (import ./rice.nix)
-  ];
-  imports = [ host_config ];
-
-  programs.home-manager.enable = true;
-}
diff --git a/home_manager/basic_env.nix b/home_manager/basic_env.nix
new file mode 100644
index 0000000..93e29a9
--- /dev/null
+++ b/home_manager/basic_env.nix
@@ -0,0 +1,46 @@
+{ pkgs, ... }:
+{
+  home = {
+    language.base = "it_IT.UTF-8";
+    packages = with pkgs; [
+      file
+      htop
+      mmv-go
+      neofetch
+      nixos-option
+      nix-tree
+      unrar
+      unzip
+      wget
+      xclip
+      yq
+      zip
+    ];
+  };
+
+  imports = [
+    ./modules/configurations.nix
+
+    ./modules/bash.nix
+    ./modules/bat.nix
+    ./modules/bottom.nix
+    ./modules/broot.nix
+    ./modules/dircolors.nix
+    ./modules/direnv.nix
+    ./modules/fonts.nix
+    ./modules/fzf.nix
+    ./modules/git.nix
+    ./modules/gpg.nix
+    ./modules/info.nix
+    ./modules/jq.nix
+    ./modules/keychain.nix
+    ./modules/lf.nix
+    ./modules/man.nix
+    ./modules/shell_aliases.nix
+    ./modules/ssh.nix
+    ./modules/starship.nix
+    ./modules/tmux.nix
+    ./modules/zoxide.nix
+    ./modules/zsh.nix
+  ];
+}
diff --git a/loki.nix b/home_manager/loki.nix
similarity index 96%
rename from loki.nix
rename to home_manager/loki.nix
index c0b3618..806235d 100644
--- a/loki.nix
+++ b/home_manager/loki.nix
@@ -1,7 +1,7 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   nixpkgs.overlays = [
-    (final: prev: {
+    (_: _: {
       devEnvironment = (import ./environment.nix) {
         # enableCpp = true;
         enableData = true;
@@ -47,6 +47,7 @@
     ./modules/direnv.nix
     ./modules/git.nix
     ./modules/gpg.nix
+    ./modules/helix.nix
     ./modules/info.nix
     ./modules/jq.nix
     ./modules/kakoune.nix
diff --git a/modules/alacritty.nix b/home_manager/modules/alacritty.nix
similarity index 93%
rename from modules/alacritty.nix
rename to home_manager/modules/alacritty.nix
index 2f8b250..ff027e9 100644
--- a/modules/alacritty.nix
+++ b/home_manager/modules/alacritty.nix
@@ -1,6 +1,6 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 let
-  strPalette = with pkgs.rice; palette.toRgbHex rec {
+  strPalette = with pkgs.rice; pkgs.lib.rice.palette.toRgbHex rec {
     inherit (colorPalette) normal bright;
     dim = colorPalette.dark;
 
diff --git a/home_manager/modules/autorandr.nix b/home_manager/modules/autorandr.nix
new file mode 100644
index 0000000..660946b
--- /dev/null
+++ b/home_manager/modules/autorandr.nix
@@ -0,0 +1,33 @@
+{
+  programs.autorandr = {
+    enable = true;
+    profiles = {
+      odin-intel = {
+        fingerprint = { "eDP1" = "00ffffffffffff0030e43f0500000000001a010495221378eaa1c59459578f27205054000000010101010101010101010101010101012e3680a070381f403020350058c21000001a5c2b80a070381f403020350058c21000001a000000fe0034584b3133803135365746360a000000000000413196001000000a010a202000c5"; };
+        config = {
+          "eDP1" = { primary = true; crtc = 0; mode = "1920x1080"; dpi = 96; };
+        };
+      };
+      odin-intel-laboratorio = {
+        fingerprint = {
+          "DP1-3" = "00ffffffffffff0010ac71404c473344281601030e331d78eadd45a3554fa027125054a54b00714f8180d1c001010101010101010101023a801871382d40582c4500fe1f1100001e000000ff004b463837593241364433474c0a000000fc0044454c4c205532333132484d0a000000fd00384c1e5311000a2020202020200081";
+          "eDP1" = "00ffffffffffff0030e43f0500000000001a010495221378eaa1c59459578f27205054000000010101010101010101010101010101012e3680a070381f403020350058c21000001a5c2b80a070381f403020350058c21000001a000000fe0034584b3133803135365746360a000000000000413196001000000a010a202000c5";
+        };
+        config = {
+          "DP1-3" = { primary = true; crtc = 1; mode = "1920x1080"; position = "0x0"; };
+          "eDP1" = { crtc = 0; mode = "1920x1080"; position = "0x1080"; dpi = 96; };
+        };
+      };
+      thor-two-screens = {
+        fingerprint = {
+          "DP-4" = "00ffffffffffff001e6d7f5ba1c60a00011f0104b53c22789f8cb5af4f43ab260e5054254b007140818081c0a9c0b300d1c08100d1cf09ec00a0a0a0675030203a0055502100001a000000fd0030901ee63c000a202020202020000000fc004c4720554c545241474541520a000000ff003130314e5454514c533230390a017102031a7123090607e305c000e606050160592846100403011f136fc200a0a0a0555030203a0055502100001a565e00a0a0a029503020350055502100001a5aa000a0a0a0465030203a005550210000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000da";
+          "HDMI-0" = "00ffffffffffff004c2d2c0d443650302e19010380341d782a5295a556549d250e5054bb8c00b30081c0810081809500a9c001010101023a801871382d40582c450009252100001e000000fd0030481e5216000a202020202020000000fc00433234463339300a2020202020000000ff00485451483330353636370a20200163020324f14690041f131203230907078301000067030c001000802b681a00000101304800011d00bc52d01e20b828554009252100001e8c0ad090204031200c4055000925210000188c0ad08a20e02d10103e9600092521000018215280a07238304088c8350009252100001c00000000000000000000000000000000000000fa";
+        };
+        config = {
+          "DP-4" = { primary = true; crtc = 0; mode = "2560x1440"; position = "1080x162"; };
+          "HDMI-0" = { crtc = 1; mode = "1920x1080"; position = "0x0"; rotate = "right"; };
+        };
+      };
+    };
+  };
+}
diff --git a/modules/bash.nix b/home_manager/modules/bash.nix
similarity index 100%
rename from modules/bash.nix
rename to home_manager/modules/bash.nix
diff --git a/modules/bat.nix b/home_manager/modules/bat.nix
similarity index 100%
rename from modules/bat.nix
rename to home_manager/modules/bat.nix
diff --git a/home_manager/modules/bottom.nix b/home_manager/modules/bottom.nix
new file mode 100644
index 0000000..d83d4c5
--- /dev/null
+++ b/home_manager/modules/bottom.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+let
+  tomlGenerate = (pkgs.formats.toml { }).generate "bottom-toml";
+in
+{
+  home.packages = with pkgs; [ bottom ];
+  xdg.configFile."bottom/bottom.toml".source = tomlGenerate {
+    "flags" = {
+      "left_legend" = true;
+      "color" = "nord";
+    };
+  };
+}
diff --git a/modules/nix-index.nix b/home_manager/modules/broot.nix
similarity index 79%
rename from modules/nix-index.nix
rename to home_manager/modules/broot.nix
index c38d223..93b6086 100644
--- a/modules/nix-index.nix
+++ b/home_manager/modules/broot.nix
@@ -1,5 +1,5 @@
 {
-  programs.nix-index = {
+  programs.broot = {
     enable = true;
     enableBashIntegration = true;
     enableZshIntegration = true;
diff --git a/home_manager/modules/bspwm.nix b/home_manager/modules/bspwm.nix
new file mode 100644
index 0000000..cb6467a
--- /dev/null
+++ b/home_manager/modules/bspwm.nix
@@ -0,0 +1,48 @@
+{ pkgs, lib, ... }:
+
+let
+  monitorPages = [ "I" "II" "III" "IV" "V" "VI" "VII" "VIII" "IX" "X" ];
+  monitorPagesString = lib.strings.concatStringsSep " " monitorPages;
+  strPalette = pkgs.lib.rice.palette.toRGBHex pkgs.rice.colorPalette;
+  xrandr = "${pkgs.xorg.xrandr}/bin/xrandr";
+  xsetroot = "${pkgs.xorg.xsetroot}/bin/xsetroot";
+in
+{
+  xsession.windowManager.bspwm = {
+    enable = true;
+    settings = {
+      border_width = 2;
+      border_radius = 8;
+      window_gap = 4;
+      split_ratio = 0.5;
+      top_padding = 0;
+      borderless_monocle = true;
+      gapless_monocle = false;
+      normal_border_color = strPalette.normal.blue;
+      focused_border_color = strPalette.bright.blue;
+    };
+    # monitors = builtins.foldl' (acc: monitor: acc // { ${monitor} = monitorPages; }) { } monitors;
+    rules = {
+      "*" = { follow = true; };
+      "Zathura" = { state = "tiled"; };
+    };
+    extraConfig = ''
+      for monitor in $(${xrandr} --listactivemonitors | cut -d " " -f 6); do
+        bspc monitor $monitor -d ${monitorPagesString}
+      done
+
+      autorandr -c
+      ${xsetroot} -solid black -cursor_name left_ptr
+
+      systemctl --user restart \
+        polybar.service \
+        update-background.service
+    '';
+    startupPrograms = [ ];
+  };
+  services = {
+    network-manager-applet.enable = true;
+    blueman-applet.enable = true;
+  };
+  home.packages = with pkgs; [ blueman ];
+}
diff --git a/modules/configurations.nix b/home_manager/modules/configurations.nix
similarity index 100%
rename from modules/configurations.nix
rename to home_manager/modules/configurations.nix
diff --git a/home_manager/modules/cpp.nix b/home_manager/modules/cpp.nix
new file mode 100644
index 0000000..08fa37c
--- /dev/null
+++ b/home_manager/modules/cpp.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    clang-tools
+  ];
+}
diff --git a/home_manager/modules/dircolors.nix b/home_manager/modules/dircolors.nix
new file mode 100644
index 0000000..6d231c1
--- /dev/null
+++ b/home_manager/modules/dircolors.nix
@@ -0,0 +1,7 @@
+{
+  programs.dircolors = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+  };
+}
diff --git a/modules/direnv.nix b/home_manager/modules/direnv.nix
similarity index 100%
rename from modules/direnv.nix
rename to home_manager/modules/direnv.nix
diff --git a/modules/dunst.nix b/home_manager/modules/dunst.nix
similarity index 89%
rename from modules/dunst.nix
rename to home_manager/modules/dunst.nix
index 23c8371..38ba672 100644
--- a/modules/dunst.nix
+++ b/home_manager/modules/dunst.nix
@@ -1,9 +1,6 @@
 { pkgs, ... }:
 let
-  rofi_dmenu = "${pkgs.rofi} -dmenu";
-  firefox = "${pkgs.firefox}/bin/firefox";
-  dmenu = "${pkgs.dmenu}/bin/dmenu";
-  palette = pkgs.rice.palette.toRGBHex pkgs.rice.colorPalette;
+  palette = pkgs.lib.rice.palette.toRGBHex pkgs.rice.colorPalette;
 in
 {
   home.packages = with pkgs; [ dunst rice.font.normal.package ];
@@ -47,8 +44,8 @@ in
         max_icon_size = 32;
         sticky_history = "yes";
         history_length = 20;
-        dmenu = "${dmenu} -p dunst:";
-        browser = "${firefox} -new-tab";
+        dmenu = "dmenu -p dunst:";
+        browser = "google-chrome-stable";
         always_run_script = "true";
         title = "Dunst";
         class = "Dunst";
diff --git a/home_manager/modules/easyeffects.nix b/home_manager/modules/easyeffects.nix
new file mode 100644
index 0000000..6a94385
--- /dev/null
+++ b/home_manager/modules/easyeffects.nix
@@ -0,0 +1,3 @@
+{
+  services.easyeffects.enable = true;
+}
diff --git a/modules/fonts.nix b/home_manager/modules/fonts.nix
similarity index 70%
rename from modules/fonts.nix
rename to home_manager/modules/fonts.nix
index 9e7e5e8..c85dac8 100644
--- a/modules/fonts.nix
+++ b/home_manager/modules/fonts.nix
@@ -7,7 +7,9 @@
     dejavu_fonts
     noto-fonts
     noto-fonts-extra
-    noto-fonts-cjk
+    noto-fonts-cjk-sans
     font-awesome
+    corefonts # Microsoft fonts
+    vistafonts
   ];
 }
diff --git a/home_manager/modules/fzf.nix b/home_manager/modules/fzf.nix
new file mode 100644
index 0000000..a421031
--- /dev/null
+++ b/home_manager/modules/fzf.nix
@@ -0,0 +1,8 @@
+{
+  programs.fzf = {
+    enable = true;
+    tmux.enableShellIntegration = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+  };
+}
diff --git a/modules/git.nix b/home_manager/modules/git.nix
similarity index 94%
rename from modules/git.nix
rename to home_manager/modules/git.nix
index 82f0ceb..c65db70 100644
--- a/modules/git.nix
+++ b/home_manager/modules/git.nix
@@ -1,7 +1,5 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, ... }:
 let
-  kak = "${pkgs.kakoune}/bin/kak";
-  meld = "${pkgs.meld}/bin/meld";
   shellAliases = {
     "g" = "git";
     "ga" = "git add";
@@ -99,11 +97,13 @@ in
     # };
     extraConfig = {
       commit.gpgSign = true;
-      core.editor = kak;
-      credential.helper = "cache --timeout = 3600 ";
-      diff.guitool = meld;
+      # core.editor = kak;
+      credential.helper = "cache --timeout=3600 ";
+      delta.navigate = true;
+      diff.guitool = "meld";
       init.defaultBranch = "main";
-      merge.guitool = meld;
+      merge.guitool = "meld";
+      merge.tool = "meld";
       pull.rebase = true;
       rebase.autoStash = true;
       user.signingKey = "berto.f@protonmail.com";
@@ -117,5 +117,6 @@ in
     gh
     git-secret
     glab
+    meld
   ];
 }
diff --git a/home_manager/modules/go.nix b/home_manager/modules/go.nix
new file mode 100644
index 0000000..9f7fe72
--- /dev/null
+++ b/home_manager/modules/go.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }: {
+  programs.go = {
+    enable = true;
+  };
+
+  home.packages = with pkgs; [
+    gopls
+  ];
+}
diff --git a/home_manager/modules/gpg.nix b/home_manager/modules/gpg.nix
new file mode 100644
index 0000000..2a09965
--- /dev/null
+++ b/home_manager/modules/gpg.nix
@@ -0,0 +1,12 @@
+{
+  programs.gpg = {
+    enable = true;
+    settings = { };
+  };
+
+  services.gpg-agent = {
+    enable = true;
+    defaultCacheTtl = 600;
+    # extraConfig = "allow-loopback-pinentry";
+  };
+}
diff --git a/modules/grobi.nix b/home_manager/modules/grobi.nix
similarity index 94%
rename from modules/grobi.nix
rename to home_manager/modules/grobi.nix
index 14d1121..48f77b3 100644
--- a/modules/grobi.nix
+++ b/home_manager/modules/grobi.nix
@@ -1,4 +1,3 @@
-{ config, lib, pkgs, ... }:
 {
   services.grobi = {
     enable = true;
diff --git a/modules/gtk_theme.nix b/home_manager/modules/gtk_theme.nix
similarity index 83%
rename from modules/gtk_theme.nix
rename to home_manager/modules/gtk_theme.nix
index 63a607d..9cd79c2 100644
--- a/modules/gtk_theme.nix
+++ b/home_manager/modules/gtk_theme.nix
@@ -18,11 +18,13 @@
     platformTheme = "gtk";
   };
 
-  xsession = {
+  home = {
     pointerCursor = {
       package = pkgs.qogir-icon-theme;
       name = "Qogir";
-      size = 24;
+      # size = 64;
+      # x11.enable = true;
+      gtk.enable = true;
     };
   };
 }
diff --git a/home_manager/modules/helix.nix b/home_manager/modules/helix.nix
new file mode 100644
index 0000000..46577b1
--- /dev/null
+++ b/home_manager/modules/helix.nix
@@ -0,0 +1,86 @@
+{ pkgs, ... }:
+{
+  programs.bash.shellAliases = { x = "hx"; };
+  programs.zsh.shellAliases = { x = "hx"; };
+  home.sessionVariables = { EDITOR = "hx"; VISUAL = "hx"; };
+  home.packages = [
+    (pkgs.makeDesktopItem
+      {
+        name = "helix";
+        exec = "hx %F";
+        icon = "helix";
+        desktopName = "Helix";
+        comment = "Helix text editor";
+        terminal = true;
+        categories = [ "Development" ];
+      })
+  ];
+  programs.helix = {
+    enable = true;
+    package = pkgs.unstable.helix;
+    languages = [ ];
+    settings = {
+      theme = "monokai_pro_octagon";
+      editor.lsp.display-messages = true;
+      editor.scrolloff = 5;
+      editor.true-color = true;
+    };
+    themes =
+      let
+        transparent = "none";
+        gray = "#665c54";
+        dark-gray = "#3c3836";
+        white = "#fbf1c7";
+        black = "#282828";
+        red = "#fb4934";
+        green = "#b8bb26";
+        yellow = "#fabd2f";
+        orange = "#fe8019";
+        blue = "#83a598";
+        magenta = "#d3869b";
+        cyan = "#8ec07c";
+      in
+      {
+        base16 = {
+          "ui.menu" = transparent;
+          "ui.menu.selected" = { modifiers = [ "reversed" ]; };
+          "ui.linenr" = { fg = gray; bg = dark-gray; };
+          "ui.popup" = { modifiers = [ "reversed" ]; };
+          "ui.linenr.selected" = { fg = white; bg = black; modifiers = [ "bold" ]; };
+          "ui.selection" = { fg = black; bg = blue; };
+          "ui.selection.primary" = { modifiers = [ "reversed" ]; };
+          "comment" = { fg = gray; };
+          "ui.statusline" = { fg = white; bg = dark-gray; };
+          "ui.statusline.inactive" = { fg = dark-gray; bg = white; };
+          "ui.help" = { fg = dark-gray; bg = white; };
+          "ui.cursor" = { modifiers = [ "reversed" ]; };
+          "variable" = red;
+          "variable.builtin" = orange;
+          "constant.numeric" = orange;
+          "constant" = orange;
+          "attributes" = yellow;
+          "type" = yellow;
+          "ui.cursor.match" = { fg = yellow; modifiers = [ "underlined" ]; };
+          "string" = green;
+          "variable.other.member" = red;
+          "constant.character.escape" = cyan;
+          "function" = blue;
+          "constructor" = blue;
+          "special" = blue;
+          "keyword" = magenta;
+          "label" = magenta;
+          "namespace" = blue;
+          "diff.plus" = green;
+          "diff.delta" = yellow;
+          "diff.minus" = red;
+          "diagnostic" = { modifiers = [ "underlined" ]; };
+          "ui.gutter" = { bg = black; };
+          "info" = blue;
+          "hint" = dark-gray;
+          "debug" = dark-gray;
+          "warning" = yellow;
+          "error" = red;
+        };
+      };
+  };
+}
diff --git a/modules/info.nix b/home_manager/modules/info.nix
similarity index 100%
rename from modules/info.nix
rename to home_manager/modules/info.nix
diff --git a/home_manager/modules/java.nix b/home_manager/modules/java.nix
new file mode 100644
index 0000000..5910761
--- /dev/null
+++ b/home_manager/modules/java.nix
@@ -0,0 +1,3 @@
+{
+  programs.java.enable = true;
+}
diff --git a/home_manager/modules/javascript.nix b/home_manager/modules/javascript.nix
new file mode 100644
index 0000000..80e714a
--- /dev/null
+++ b/home_manager/modules/javascript.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    flow
+  ];
+}
+
diff --git a/modules/joystickwake.nix b/home_manager/modules/joystickwake.nix
similarity index 95%
rename from modules/joystickwake.nix
rename to home_manager/modules/joystickwake.nix
index 25f0aaf..5cc1113 100644
--- a/modules/joystickwake.nix
+++ b/home_manager/modules/joystickwake.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 let
   joystickwakeCmd = "${pkgs.joystickwake}/bin/joystickwake";
 in
diff --git a/modules/jq.nix b/home_manager/modules/jq.nix
similarity index 100%
rename from modules/jq.nix
rename to home_manager/modules/jq.nix
diff --git a/home_manager/modules/kakoune.nix b/home_manager/modules/kakoune.nix
new file mode 100644
index 0000000..12df5ab
--- /dev/null
+++ b/home_manager/modules/kakoune.nix
@@ -0,0 +1,256 @@
+{ pkgs, ... }:
+let
+  themeBuilder = palette: with palette; ''
+    set-face global value rgb:${normal.magenta},default
+    set-face global type rgb:${bright.white},default
+    set-face global identifier rgb:${normal.cyan},default
+    set-face global string rgb:${normal.green},default
+    set-face global error rgb:${normal.red},default
+    set-face global keyword rgb:${normal.blue},default
+    set-face global operator rgb:${normal.blue},default
+    set-face global attribute rgb:${bright.blue},default
+    set-face global comment rgb:${bright.blue},default
+    set-face global meta rgb:${normal.yellow},default
+    set-face global Default rgb:${normal.white},default
+    set-face global PrimarySelection rgb:${normal.black},rgb:${dark.yellow}
+    set-face global SecondarySelection rgb:${normal.black},rgb:${dark.white}
+    set-face global PrimaryCursor rgb:${normal.black},rgb:${normal.yellow}
+    set-face global SecondaryCursor rgb:${normal.black},rgb:${normal.white}
+    set-face global MenuForeground rgb:${normal.white},rgb:${bright.black}
+    set-face global MenuBackground default,rgb:${normal.black}
+    set-face global MenuInfo default,rgb:${normal.black}
+    set-face global Information rgb:${dark.black},rgb:${normal.cyan}
+    set-face global StatusLine rgb:${normal.white},rgb:${normal.black}
+    set-face global StatusLineMode rgb:${normal.blue},rgb:${normal.black}
+    set-face global StatusLineInfo rgb:${normal.blue},rgb:${normal.black}
+    set-face global StatusLineValue rgb:${normal.blue},rgb:${normal.black}
+    set-face global StatusCursor rgb:${dark.black},rgb:${normal.yellow}
+    set-face global Prompt rgb:${normal.cyan},rgb:${normal.black}
+    set-face global BufferPadding default,default
+  '';
+
+  packages = with pkgs; [
+    yaml-language-server
+    nodePackages.vscode-langservers-extracted
+    rnix-lsp
+    editorconfig-core-c
+    aspell
+    aspellDicts.en
+    aspellDicts.en-computers
+    aspellDicts.en-science
+    aspellDicts.it
+
+    (pkgs.makeDesktopItem
+      {
+        name = "kakoune";
+        exec = "kak %F";
+        icon = "kakoune";
+        desktopName = "Kakoune";
+        comment = "Kakoune text editor";
+        terminal = true;
+        categories = [ "Development" ];
+      })
+  ];
+
+in
+{
+  programs.bash.shellAliases = { k = "kak"; };
+  programs.zsh.shellAliases = { k = "kak"; };
+  home.packages = packages;
+  programs.kakoune = {
+    enable = true;
+    config = {
+      colorScheme = "nord";
+      tabStop = 2;
+      indentWidth = 2;
+      alignWithTabs = true;
+      scrollOff = { lines = 5; columns = 3; };
+      ui = { setTitle = true; changeColors = true; enableMouse = true; };
+      wrapLines = { enable = true; word = true; };
+      numberLines = { enable = true; highlightCursor = true; };
+      keyMappings = [
+        { mode = "normal"; docstring = "Edit file"; key = "<c-e>"; effect = ":edit<space>"; }
+        { mode = "user"; docstring = "Code actions"; key = "a"; effect = ":lsp-code-actions<ret>"; }
+        { mode = "user"; docstring = "Comment block"; key = "b"; effect = ":comment-block<ret>"; }
+        { mode = "user"; docstring = "Comment line"; key = "l"; effect = ":comment-line<ret>"; }
+        { mode = "user"; docstring = "Copy to clipboard"; key = "y"; effect = "<a-|>${pkgs.xclip}/bin/xclip -i -selection clipboard<ret>"; }
+        { mode = "user"; docstring = "Format code with formatter"; key = "f"; effect = ":format<ret>"; }
+        { mode = "user"; docstring = "Format code with LSP"; key = "F"; effect = ":lsp-formatting-sync<ret>"; }
+        { mode = "user"; docstring = "Jump to definition"; key = "d"; effect = ":lsp-definition<ret>"; }
+        { mode = "user"; docstring = "Rename object"; key = "r"; effect = ":lsp-rename-prompt<ret>"; }
+        { mode = "user"; docstring = "Jump to type definition"; key = "t"; effect = ":lsp-type-definition<ret>"; }
+        { mode = "user"; docstring = "List project diagnostics"; key = "i"; effect = ":lsp-diagnostics<ret>"; }
+        { mode = "user"; docstring = "Paste from clipboard (after)"; key = "P"; effect = "<a-!>${pkgs.xclip}/bin/xclip -selection clipboard -o<ret>"; }
+        { mode = "user"; docstring = "Paste from clipboard (before)"; key = "p"; effect = "!${pkgs.xclip}/bin/xclip -selection clipboard -o<ret>"; }
+        { mode = "user"; docstring = "Show hover info"; key = "q"; effect = ":lsp-hover<ret>"; }
+        { mode = "user"; docstring = "Spellcheck English"; key = "S"; effect = ":spell en<ret>"; }
+        { mode = "user"; docstring = "Spellcheck"; key = "s"; effect = ":spell "; }
+        { mode = "normal"; docstring = "Try next snippet placeholder"; key = "<c-n>"; effect = "<a-;>: insert-c-n<ret>"; }
+        # { mode = "normal"; docstring = "Search"; key = "/"; effect = "/(?i)"; }
+        # { mode = "normal"; docstring = "Reverse search"; key = "<a-/>"; effect = "<a-/>(?i)"; }
+      ];
+      hooks = with pkgs; [
+        { name = "BufCreate"; option = ".*"; commands = "editorconfig-load"; }
+        # { name = "ModuleLoaded"; option = "auto-pairs"; commands = "auto-pairs-enable"; }
+        { name = "ModuleLoaded"; option = "powerline"; commands = "powerline-enable; powerline-start"; }
+        { name = "BufSetOption"; option = "filetype=latex"; commands = "set-option buffer formatcmd latexindent"; }
+        { name = "BufSetOption"; option = "filetype=python"; commands = "set-option buffer formatcmd 'black -'"; }
+        { name = "BufSetOption"; option = "filetype=(markdown|html|json|yaml|css|scss|less)"; commands = "set-option buffer formatcmd prettier"; }
+        { name = "BufSetOption"; option = "filetype=rust"; commands = "set-option buffer formatcmd 'rustfmt'"; }
+        { name = "BufSetOption"; option = "filetype=sh"; commands = "set-option buffer formatcmd 'rustfmt'"; }
+      ];
+      # TODO add more formatters from https://github.com/mawww/kakoune/wiki/Format
+    };
+    extraConfig = builtins.concatStringsSep "\n" [
+      "# Custom commands"
+      "add-highlighter global/ regex \\h+$ 0:Error                   # Highlight trailing spaces"
+      "eval %sh{kak-lsp --kakoune -s $kak_session}"
+      "lsp-enable"
+      ''
+        def -hidden insert-c-n %{
+          try %{
+             lsp-snippets-select-next-placeholders
+             exec '<a-;>d'
+          } catch %{
+             exec -with-hooks '<c-n>'
+          }
+        }
+      ''
+      "require-module powerline"
+      "require-module connect-broot"
+      "require-module connect-lf"
+      "require-module connect-rofi"
+    ];
+    plugins = with pkgs.kakounePlugins; [
+      prelude-kak
+      kak-lsp
+      auto-pairs-kak
+      powerline-kak
+      connect-kak
+    ];
+  };
+
+  # THEME FILE
+  xdg.configFile."kak/colors/nord.kak".text = themeBuilder (pkgs.lib.rice.palette.toRgbShortHex pkgs.rice.colorPalette);
+
+  xdg.configFile."kak-lsp/kak-lsp.toml".text = ''
+    snippet_support = false
+    verbosity = 2
+    [server]
+    timeout = 1800 # seconds = 30 minutes
+
+    [language.c_cpp]
+    filetypes = ["c", "cpp"]
+    roots = ["compile_commands.json", ".clangd"]
+    command = "clangd"
+    offset_encoding = "utf-8"
+
+    [language.json]
+    filetypes = ["json"]
+    roots = ["package.json"]
+    command = "vscode-json-language-server"
+    args = ["--stdio"]
+
+    [language.yaml]
+    filetypes = ["yaml"]
+    roots = [".git"]
+    command = "yaml-language-server"
+    args = ["--stdio"]
+
+    [language.yaml.settings]
+    # See https://github.com/redhat-developer/yaml-language-server#language-server-settings
+    # Defaults are at https://github.com/redhat-developer/yaml-language-server/blob/master/src/yamlSettings.ts
+    yaml.format.enable = true
+
+    [language.go]
+    filetypes = ["go"]
+    roots = ["Gopkg.toml", "go.mod", ".git", ".hg"]
+    command = "gopls"
+    offset_encoding = "utf-8"
+    settings_section = "gopls"
+
+    [language.go.settings.gopls]
+    # See https://github.com/golang/tools/blob/master/gopls/doc/settings.md
+    # "build.buildFlags" = []
+
+    [language.html]
+    filetypes = ["html"]
+    roots = ["package.json"]
+    command = "vscode-html-language-server"
+    args = ["--stdio"]
+
+    [language.css]
+    filetypes = ["css"]
+    roots = ["package.json", ".git"]
+    command = "vscode-css-language-server"
+    args = ["--stdio"]
+
+    [language.less]
+    filetypes = ["less"]
+    roots = ["package.json", ".git"]
+    command = "vscode-css-language-server"
+    args = ["--stdio"]
+
+    [language.scss]
+    filetypes = ["scss"]
+    roots = ["package.json", ".git"]
+    command = "vscode-css-language-server"
+    args = ["--stdio"]
+
+    [language.javascript]
+    filetypes = ["javascript"]
+    roots = [".flowconfig"]
+    command = "flow"
+    args = ["lsp"]
+
+    [language.latex]
+    filetypes = ["latex"]
+    roots = [".git"]
+    command = "texlab"
+    settings_section = "texlab"
+
+    [language.latex.settings.texlab]
+    # See https://github.com/latex-lsp/texlab/blob/master/src/options.rs
+    # bibtexFormatter = "texlab"
+
+    [language.nix]
+    filetypes = ["nix"]
+    roots = ["flake.nix", "shell.nix", ".git"]
+    command = "rnix-lsp"
+
+    [language.python]
+    filetypes = ["python"]
+    roots = ["requirements.txt", "setup.py", ".git", ".hg"]
+    command = "pylsp"
+    offset_encoding = "utf-8"
+
+    [language.python.settings]
+    # See https://github.com/palantir/python-language-server#configuration
+    # and https://github.com/palantir/python-language-server/blob/develop/vscode-client/package.json
+    # "pyls.configurationSources" = ["flake8"]
+
+    [language.rust]
+    filetypes = ["rust"]
+    roots = ["Cargo.toml"]
+    command = "rust-analyzer"
+    settings_section = "rust-analyzer"
+
+    [language.rust.settings.rust-analyzer]
+    hoverActions.enable = false # kak-lsp doesn't support this at the moment
+    # cargo.features = []
+    # See https://rust-analyzer.github.io/manual.html#configuration
+    # If you get 'unresolved proc macro' warnings, you have two options
+    # 1. The safe choice is two disable the warning:
+    diagnostics.disabled = ["unresolved-proc-macro"]
+    # 2. Or you can opt-in for proc macro support
+    procMacro.enable = true
+    cargo.loadOutDirsFromCheck = true
+    # See https://github.com/rust-analyzer/rust-analyzer/issues/6448
+
+    [language.bash]
+    filetypes = ["sh"]
+    roots = [".git", ".hg"]
+    command = "bash-language-server"
+    args = ["start"]
+  '';
+}
diff --git a/modules/keepassxc.nix b/home_manager/modules/keepassxc.nix
similarity index 93%
rename from modules/keepassxc.nix
rename to home_manager/modules/keepassxc.nix
index 7d2f75b..f1effce 100644
--- a/modules/keepassxc.nix
+++ b/home_manager/modules/keepassxc.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 {
   config.systemd.user.services.keepassxc = {
     Unit = {
diff --git a/modules/keychain.nix b/home_manager/modules/keychain.nix
similarity index 100%
rename from modules/keychain.nix
rename to home_manager/modules/keychain.nix
diff --git a/modules/kitty.nix b/home_manager/modules/kitty.nix
similarity index 88%
rename from modules/kitty.nix
rename to home_manager/modules/kitty.nix
index a26e960..e0fa498 100644
--- a/modules/kitty.nix
+++ b/home_manager/modules/kitty.nix
@@ -1,5 +1,5 @@
-{ pkgs, lib, ... }:
-let strPalette = with pkgs.rice; palette.toRgbHex rec {
+{ pkgs, ... }:
+let strPalette = with pkgs.rice; pkgs.lib.rice.palette.toRgbHex rec {
   foreground = colorPalette.normal.white;
   background = colorPalette.normal.black;
   color0 = colorPalette.normal.black;
@@ -23,6 +23,7 @@ in
 {
   programs.kitty = {
     enable = true;
+    package = pkgs.unstable.kitty;
     settings = {
       scrollback_lines = 10000;
       enable_audio_bell = false;
@@ -37,6 +38,7 @@ in
     keybindings = {
       "ctrl+shift+t" = "new_tab_with_cwd";
       "ctrl+shift+enter" = "new_window_with_cwd";
+      "ctrl+shift+n" = "new_os_window_with_cwd";
     };
     font = pkgs.rice.font.monospace;
   };
diff --git a/home_manager/modules/latex.nix b/home_manager/modules/latex.nix
new file mode 100644
index 0000000..96e61ef
--- /dev/null
+++ b/home_manager/modules/latex.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    bibtool
+    tex2nix
+    texlab
+    texlive.combined.scheme-medium
+  ];
+}
diff --git a/modules/lf.nix b/home_manager/modules/lf.nix
similarity index 100%
rename from modules/lf.nix
rename to home_manager/modules/lf.nix
diff --git a/modules/libinput-gestures.nix b/home_manager/modules/libinput-gestures.nix
similarity index 96%
rename from modules/libinput-gestures.nix
rename to home_manager/modules/libinput-gestures.nix
index 4a6f522..c578c63 100644
--- a/modules/libinput-gestures.nix
+++ b/home_manager/modules/libinput-gestures.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 let
   libinputGesturesCmd = "${pkgs.libinput-gestures}/bin/libinput-gestures";
   xdotool = "${pkgs.xdotool}/bin/xdotool";
diff --git a/modules/lorri.nix b/home_manager/modules/lorri.nix
similarity index 100%
rename from modules/lorri.nix
rename to home_manager/modules/lorri.nix
diff --git a/modules/man.nix b/home_manager/modules/man.nix
similarity index 61%
rename from modules/man.nix
rename to home_manager/modules/man.nix
index 801cf1e..a2507e6 100644
--- a/modules/man.nix
+++ b/home_manager/modules/man.nix
@@ -1,6 +1,6 @@
 {
   programs.man = {
     enable = true;
-    generateCaches = true;
+    # generateCaches = true;
   };
 }
diff --git a/modules/mangohud.nix b/home_manager/modules/mangohud.nix
similarity index 58%
rename from modules/mangohud.nix
rename to home_manager/modules/mangohud.nix
index 6b6c175..cde1857 100644
--- a/modules/mangohud.nix
+++ b/home_manager/modules/mangohud.nix
@@ -1,7 +1,9 @@
-{ ... }:
 {
   programs.mangohud = {
     enable = true;
     enableSessionWide = true;
+    settings = {
+      toggle_hud = "Shift_R+F12";
+    };
   };
 }
diff --git a/modules/megasync.nix b/home_manager/modules/megasync.nix
similarity index 94%
rename from modules/megasync.nix
rename to home_manager/modules/megasync.nix
index 239e93a..363d9d9 100644
--- a/modules/megasync.nix
+++ b/home_manager/modules/megasync.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 let
   megasyncCmd = "${pkgs.megacmd}/bin/mega-cmd-server";
 in
diff --git a/home_manager/modules/nautilus.nix b/home_manager/modules/nautilus.nix
new file mode 100644
index 0000000..a6f4e75
--- /dev/null
+++ b/home_manager/modules/nautilus.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [ gnome.nautilus ];
+}
diff --git a/home_manager/modules/nix-index.nix b/home_manager/modules/nix-index.nix
new file mode 100644
index 0000000..975c5ac
--- /dev/null
+++ b/home_manager/modules/nix-index.nix
@@ -0,0 +1,27 @@
+{ pkgs, ... }:
+{
+  programs.nix-index = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+  };
+
+  systemd.user = {
+    services."nix-index" = {
+      Unit = {
+        Description = "Update the nix-locate database";
+        After = [ "network.target" ];
+      };
+      Service = {
+        Type = "oneshot";
+        ExecStart = "${pkgs.nix-index}/bin/nix-index";
+      };
+    };
+
+    timers."nix-index" = {
+      Unit.Description = "Daily update the nix-locate database";
+      Timer = { OnCalendar = "daily"; Persistent = true; Unit = "nix-index.service"; };
+      Install.WantedBy = [ "timers.target" ];
+    };
+  };
+}
diff --git a/modules/noti.nix b/home_manager/modules/noti.nix
similarity index 100%
rename from modules/noti.nix
rename to home_manager/modules/noti.nix
diff --git a/modules/obs-studio.nix b/home_manager/modules/obs-studio.nix
similarity index 100%
rename from modules/obs-studio.nix
rename to home_manager/modules/obs-studio.nix
diff --git a/home_manager/modules/office.nix b/home_manager/modules/office.nix
new file mode 100644
index 0000000..7813c0a
--- /dev/null
+++ b/home_manager/modules/office.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    # libreoffice-fresh
+    onlyoffice-bin
+    hunspellDicts.en_GB-large
+    hunspellDicts.en_US-large
+    hunspellDicts.it_IT
+    hunspell.bin
+  ];
+}
diff --git a/modules/onedrive.nix b/home_manager/modules/onedrive.nix
similarity index 100%
rename from modules/onedrive.nix
rename to home_manager/modules/onedrive.nix
diff --git a/home_manager/modules/pass.nix b/home_manager/modules/pass.nix
new file mode 100644
index 0000000..23de304
--- /dev/null
+++ b/home_manager/modules/pass.nix
@@ -0,0 +1,5 @@
+{
+  programs.password-store = {
+    enable = true;
+  };
+}
diff --git a/modules/picom.nix b/home_manager/modules/picom.nix
similarity index 95%
rename from modules/picom.nix
rename to home_manager/modules/picom.nix
index 2e613ce..89f6265 100644
--- a/modules/picom.nix
+++ b/home_manager/modules/picom.nix
@@ -1,4 +1,3 @@
-{ pkgs, ... }:
 {
   services.picom = {
     enable = true;
diff --git a/modules/polybar.nix b/home_manager/modules/polybar.nix
similarity index 60%
rename from modules/polybar.nix
rename to home_manager/modules/polybar.nix
index 2a072b8..e9cfe67 100644
--- a/modules/polybar.nix
+++ b/home_manager/modules/polybar.nix
@@ -1,5 +1,7 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, lib, ... }:
+with lib;
 let
+  inherit (pkgs.rice) colorPalette opacity;
   grep = "${pkgs.gnugrep}/bin/grep";
   cut = "${pkgs.coreutils}/bin/cut";
   head = "${pkgs.coreutils}/bin/head";
@@ -8,22 +10,34 @@ let
   pkill = "${pkgs.procps}/bin/pkill";
   playerCtl = "${pkgs.playerctl}/bin/playerctl";
   playerStatus = "${playerCtl} -f '{{emoji(status)}} {{title}} - {{artist}}' metadata | ${head} -c 60";
-  alacritty = "${pkgs.alacritty}/bin/alacritty";
-  btm = "${pkgs.bottom}/bin/btm";
-  colors = with pkgs.rice; palette.toARGBHex rec {
+  systemctl = "${pkgs.systemd}/bin/systemctl";
+  loginctl = "${pkgs.systemd}/bin/loginctl";
+  shutdown = "${pkgs.systemd}/bin/shutdown";
+  logout = pkgs.writeShellScript "logout" ''
+    session=`${loginctl} session-status | ${pkgs.coreutils}/bin/head -n 1 | ${pkgs.gawk}/bin/awk '{print $1}'`
+    ${loginctl} terminate-session $session
+  '';
+  colors = with pkgs.lib.rice; let
+    alpha = 255 * opacity;
+  in
+  palette.toARGBHex rec {
 
     normal = {
       foreground = colorPalette.normal.white;
-      background = colorPalette.normal.black;
-      underline = colorPalette.normal.blue;
+      background = color.setAlphaRgba alpha (colorPalette.normal.black);
+      underline = colorPalette.dark.blue;
     };
 
-    active = palette.brighten "50%" normal;
+    active = {
+      foreground = colorPalette.bright.white;
+      background = color.setAlphaRgba alpha (colorPalette.normal.black);
+      underline = colorPalette.bright.blue;
+    };
 
     selected = {
       foreground = colorPalette.bright.white;
-      background = color.tAlphaRgba (v: 240) colorPalette.dark.blue;
-      underline = colorPalette.dark.white;
+      background = color.setAlphaRgba alpha (color.brighten 10 colorPalette.bright.black);
+      underline = colorPalette.bright.red;
     };
 
     alert = colorPalette.bright.red;
@@ -47,10 +61,7 @@ let
     foreground = colors.normal.foreground;
     line-size = 2;
     line-color = colors.normal.underline;
-    padding = {
-      left = 0;
-      right = 0;
-    };
+    padding = { left = 0; right = 0; };
     module.margin = { left = 0; right = 0; };
     separator = " ";
     border = {
@@ -62,8 +73,11 @@ let
     };
     font = [
       "${pkgs.rice.font.monospace.name}:size=${toString pkgs.rice.font.monospace.size};2"
-      "Material Design Icons:size=${toString pkgs.rice.font.monospace.size};2"
-      "NotoEmoji Nerd Font Mono:size=${toString pkgs.rice.font.monospace.size};0"
+      # "Font Awesome 6 Free:size=14;0"
+      # "Noto Color Emoji:size=2;2"
+      "Noto Sans Symbols2:size=${toString pkgs.rice.font.monospace.size};2"
+      # "Material Design Icons:size=${toString pkgs.rice.font.monospace.size};2"
+      # "EmojiOne Color:size=${toString pkgs.rice.font.monospace.size};0"
     ];
     wm-restack = "bspwm";
   };
@@ -73,9 +87,11 @@ in
 {
   home.packages = with pkgs; [
     pkgs.rice.font.monospace.package
-    emojione
-    noto-fonts-emoji
-    material-design-icons
+    # emojione
+    # noto-fonts-emoji
+    noto-fonts
+    # material-design-icons
+    # font-awesome
   ];
   services.polybar = {
     enable = true;
@@ -95,7 +111,7 @@ in
         screenchange-reload = false;
       };
 
-      "bar/primary" = commonBar // {
+      "bar/primary" = recursiveUpdate commonBar {
         modules-left = "bspwm";
         # modules-center =
         modules-right = "player pulseaudio temperature cpu memory battery date powermenu";
@@ -106,7 +122,7 @@ in
         };
       };
 
-      "bar/secondary" = commonBar // {
+      "bar/secondary" = recursiveUpdate commonBar {
         modules-left = "bspwm";
         # modules-center =
         modules-right = "player pulseaudio temperature cpu memory battery date powermenu";
@@ -132,52 +148,42 @@ in
         };
 
         format = {
-          charging = colors.selected // {
-            padding = 1;
-            text = "<animation-charging> <label-charging>";
-          };
-          discharging = colors.active // {
-            padding = 1;
-            text = "<animation-discharging> <label-discharging>";
-          };
-          full = colors.normal // {
-            padding = 1;
-            text = " <label-full>";
-          };
+          charging = recursiveUpdate colors.selected { text = "<animation-charging> <label-charging>"; };
+          discharging = recursiveUpdate colors.active { text = "<animation-discharging> <label-discharging>"; };
+          full = recursiveUpdate colors.normal { text = " <label-full>"; };
         };
 
-        label = {
-          chargin = "%percentage%%";
-          dischargin = "%percentage%%";
-          full = "%percentage%%";
-        };
+        label.text = "%percentage%%";
+        #   = {
+        #   chargin = "%percentage%%";
+        #   dischargin = "%percentage%%";
+        #   full = "%percentage%%";
+        # };
       };
 
       "module/bspwm" = {
         type = "internal/bspwm";
         format = "<label-state>";
 
-        label = let
-          common = {
-            padding = 1;
-            separator = " ";
-            text = "%name%";
-          };
-        in
+        label =
+          let
+            common = {
+              padding = 1;
+              separator = " ";
+              text = "%name%";
+            };
+          in
           {
-            focused = colors.selected // common;
-            occupied = colors.active // common;
-            urgent = colors.active // common // { background = colors.alert; };
-            empty = colors.normal // common // { text = "󰧟"; padding = 0; };
+            focused = recursiveUpdate colors.selected common;
+            occupied = recursiveUpdate colors.active common;
+            urgent = recursiveUpdate (recursiveUpdate colors.active common) { background = colors.alert; };
+            empty = recursiveUpdate (recursiveUpdate colors.normal common) { text = "󰧟"; padding = 0; };
           };
       };
 
       "module/cpu" = {
         type = "internal/cpu";
-        format = colors.normal // {
-          text = "󰍛 <label>";
-          padding = 1;
-        };
+        format = recursiveUpdate colors.normal { text = " <label>"; };
         interval = 2;
         label = "%percentage-sum%%";
         ramp-load = ramp;
@@ -195,32 +201,24 @@ in
           alt = "%H:%M:%S";
           text = "%H:%M";
         };
-        format = colors.normal // {
-          padding = 1;
-        };
+        format = colors.normal;
       };
 
       "module/memory" = {
         type = "internal/memory";
-        format = colors.normal // {
-          padding = 1;
-          text = "󰍜 <label>";
-        };
+        format = recursiveUpdate colors.normal { text = " <label>"; };
         interval = 2;
         label = "%percentage_used%%";
         ramp-used = ramp;
       };
 
       "module/pulseaudio" = {
+        interval = 2;
         bar.volume = {
-          empty = {
-            font = "2";
-            text = "─";
-          };
-          fill = {
-            text = "─";
-            font = "2";
-          };
+          empty = { text = "─"; };
+          fill = { text = "─"; };
+          indicator = { text = "|"; };
+          width = "10";
           foreground = [
             colors.green
             colors.green
@@ -231,39 +229,23 @@ in
             colors.orange
             colors.red
           ];
-          indicator = {
-            text = "|";
-            font = "2";
-          };
-          width = "10";
         };
         click.right = "${pgrep} pavucontrol && ${pkill} pavucontrol || ${pavucontrol}";
         format = {
           padding = 1;
-          muted = colors.active // {
-            padding = 1;
-          };
-          volume = colors.normal // {
-            padding = 1;
-            text = "<ramp-volume> <label-volume>";
-          };
+          muted = colors.active;
+          volume = recursiveUpdate colors.normal { text = "<ramp-volume> <label-volume>"; };
         };
-        label.muted = {
-          text = "󰖁";
-        };
-        label.volume = {
-          text = "%percentage%%";
-        };
-        ramp.volume = [ "󰕿" "󰖀" "󰕾" ];
+        label.muted.text = "婢 muted";
+        label.volume.text = "%percentage%%";
+        ramp.volume = [ "奄" "奔" "墳" ];
         type = "internal/pulseaudio";
       };
 
       "module/temperature" = {
-        format = colors.normal // {
-          padding = 1;
+        format = recursiveUpdate colors.normal {
           text = "<ramp> <label>";
           warn = {
-            padding = 1;
             text = "<ramp> <label-warn>";
             underline = colors.alert;
           };
@@ -273,9 +255,7 @@ in
           text = "%temperature-c%";
           warn = "%temperature-c%";
         };
-        ramp = {
-          text = [ "" "" "" "" "" ];
-        };
+        ramp.text = [ "" "" "" "" "" ];
         thermal.zone = "0";
         type = "internal/temperature";
         warn.temperature = "90";
@@ -289,15 +269,9 @@ in
           suffix = " ";
         };
         label = {
-          open = colors.normal // {
-            text = " ⏻ ";
-          };
-          close = colors.normal // {
-            text = "Cancel";
-          };
-          separator = {
-            text = "|";
-          };
+          open = recursiveUpdate colors.normal { text = " ⏻ "; };
+          close = recursiveUpdate colors.normal { text = "Cancel"; };
+          separator = { text = "|"; };
         };
         menu = [
           [
@@ -307,25 +281,23 @@ in
             ({ text = "Power off"; exec = "#powermenu.open.4"; })
           ]
           [
-            ({ text = "Logout"; exec = "${pkgs.systemd}/bin/loginctl terminate-session self"; })
+            ({ text = "Logout"; exec = logout; })
           ]
           [
-            ({ text = "Reboot"; exec = "${pkgs.systemd}/bin/systemctl reboot"; })
+            ({ text = "Reboot"; exec = "${systemctl} reboot"; })
           ]
           [
-            ({ text = "Hibernate"; exec = "${pkgs.systemd}/bin/systemctl hibernate"; })
+            ({ text = "Hibernate"; exec = "${systemctl} hibernate"; })
           ]
           [
-            ({ text = "Power off"; exec = "${pkgs.systemd}/bin/shutdown now"; })
+            ({ text = "Power off"; exec = "${shutdown} now"; })
           ]
         ];
       };
 
       "module/player" = {
         type = "custom/script";
-        format = colors.normal // {
-          padding = 1;
-        };
+        format = recursiveUpdate colors.normal { padding = 0; };
         exec = playerStatus;
         click.left = "${playerCtl} play-pause";
         scroll = {
diff --git a/home_manager/modules/pro_audio.nix b/home_manager/modules/pro_audio.nix
new file mode 100644
index 0000000..b561e2b
--- /dev/null
+++ b/home_manager/modules/pro_audio.nix
@@ -0,0 +1,47 @@
+{ pkgs, ... }:
+let
+  variables = {
+    DSSI_PATH = "$HOME/.dssi:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/dssi:/run/current-system/sw/lib/dssi";
+    LADSPA_PATH = "$HOME/.ladspa:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/ladspa:/run/current-system/sw/lib/ladspa";
+    LV2_PATH = "$HOME/.lv2:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/lv2:/run/current-system/sw/lib/lv2";
+    LXVST_PATH = "$HOME/.lxvst:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/lxvst:/run/current-system/sw/lib/lxvst";
+    VST_PATH = "$HOME/.vst:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/vst:/run/current-system/sw/lib/vst";
+    VST3_PATH = "$HOME/.vst3:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/vst3:/run/current-system/sw/lib/vst3";
+  };
+in
+{
+  home.packages = with pkgs; [
+    carla
+    rnnoise
+    ardour
+    unstable.zrythm
+    unstable.breeze-icons
+    mixxx
+
+    # Plugins
+    # artyFX
+    autotalent
+    boops
+    unstable.cardinal
+    geonkick
+    helm
+    lsp-plugins
+    # noise-repellent
+    samplv1
+    # speech-denoiser
+    # stochas
+    # sunvox
+    # surge
+    unstable.giada
+    unstable.surge-XT
+    talentedhack
+    tunefish
+    vocproc
+    x42-plugins
+    zita-at1
+    zynaddsubfx
+    zyn-fusion
+  ];
+
+  home.sessionVariables = variables;
+}
diff --git a/modules/pycharm.nix b/home_manager/modules/pycharm.nix
similarity index 89%
rename from modules/pycharm.nix
rename to home_manager/modules/pycharm.nix
index c59ebcf..3f98070 100644
--- a/modules/pycharm.nix
+++ b/home_manager/modules/pycharm.nix
@@ -2,8 +2,7 @@
 {
   home.packages = with pkgs; [
     jetbrains.pycharm-professional
-
     python3
-    pypy3
+    # pypy3
   ];
 }
diff --git a/home_manager/modules/python.nix b/home_manager/modules/python.nix
new file mode 100644
index 0000000..a6ab8fa
--- /dev/null
+++ b/home_manager/modules/python.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    black
+  ] ++ (with pkgs.python3Packages; [
+    python-lsp-server
+    # pyls-black # not updated to the new pylsp
+    pyls-flake8
+    pyls-isort
+  ]);
+}
diff --git a/modules/rofi.nix b/home_manager/modules/rofi.nix
similarity index 61%
rename from modules/rofi.nix
rename to home_manager/modules/rofi.nix
index cab8166..e59f498 100644
--- a/modules/rofi.nix
+++ b/home_manager/modules/rofi.nix
@@ -12,13 +12,14 @@
   xdg.configFile."rofi/config.rasi".text = ''
     configuration {
       font: "${pkgs.rice.font.monospace.name} 12";
-    	location: 0;
-    	yoffset: 0;
-    	xoffset: 0;
-    	modi: "drun,run,ssh,window";
+      location: 0;
+      yoffset: 0;
+      xoffset: 0;
+      modi: "drun,run,ssh,window";
     }
 
-    @theme "nord"
+    @theme "onedark"
   '';
-  xdg.configFile."rofi/nord.rasi".source = ../configs/rofi/nord.rasi;
+  xdg.configFile."rofi/nord.rasi".source = ../../configs/rofi/nord.rasi;
+  xdg.configFile."rofi/onedark.rasi".source = ../../configs/rofi/onedark.rasi;
 }
diff --git a/modules/rofimoji.nix b/home_manager/modules/rofimoji.nix
similarity index 100%
rename from modules/rofimoji.nix
rename to home_manager/modules/rofimoji.nix
diff --git a/home_manager/modules/rust.nix b/home_manager/modules/rust.nix
new file mode 100644
index 0000000..ce75c16
--- /dev/null
+++ b/home_manager/modules/rust.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    bacon
+    cargo
+    clippy
+    rust-analyzer
+    rustfmt
+  ];
+}
diff --git a/modules/screen_locker.nix b/home_manager/modules/screen_locker.nix
similarity index 100%
rename from modules/screen_locker.nix
rename to home_manager/modules/screen_locker.nix
diff --git a/modules/security.nix b/home_manager/modules/security.nix
similarity index 100%
rename from modules/security.nix
rename to home_manager/modules/security.nix
diff --git a/modules/shell_aliases.nix b/home_manager/modules/shell_aliases.nix
similarity index 54%
rename from modules/shell_aliases.nix
rename to home_manager/modules/shell_aliases.nix
index 3c8e564..f98f430 100644
--- a/modules/shell_aliases.nix
+++ b/home_manager/modules/shell_aliases.nix
@@ -1,19 +1,17 @@
-{ pkgs, ... }:
-let
-  shellAliases = {
-    "dk" = "docker";
+{
+  home.shellAliases = {
     "dkc" = "docker-compose";
+    "dk" = "docker";
     "hm" = "home-manager";
     "jc" = "sudo journalctl";
     "jcu" = "journalctl --user";
     "nf" = "find /nix/store/ -maxdepth 1 | grep";
-    "ns" = "nix search github:NixOS/nixpkgs/release-21.11";
-    "nS" = "nix-shell";
+    "nr" = "nix run";
+    "ns" = "nix search nixpkgs";
+    "nS" = "nix shell";
     "sc" = "sudo systemctl";
     "scu" = "systemctl --user";
   };
-in
-{
-  programs.bash = { inherit shellAliases; };
-  programs.zsh = { inherit shellAliases; };
+  # programs.bash = { inherit shellAliases; };
+  # programs.zsh = { inherit shellAliases; };
 }
diff --git a/modules/ssh.nix b/home_manager/modules/ssh.nix
similarity index 100%
rename from modules/ssh.nix
rename to home_manager/modules/ssh.nix
diff --git a/modules/starship.nix b/home_manager/modules/starship.nix
similarity index 100%
rename from modules/starship.nix
rename to home_manager/modules/starship.nix
diff --git a/home_manager/modules/sxhkd.nix b/home_manager/modules/sxhkd.nix
new file mode 100644
index 0000000..3d9f6f0
--- /dev/null
+++ b/home_manager/modules/sxhkd.nix
@@ -0,0 +1,60 @@
+{ pkgs, ... }:
+{
+  imports = [ ./nautilus.nix ];
+  home.packages = with pkgs; [
+    unstable.kitty
+    lockscreen
+    pamixer
+    playerctl
+    terminator
+    update-background
+    xorg.xbacklight
+  ];
+  services.sxhkd =
+    let
+      primaryTerminal = "kitty";
+      secondaryTerminal = "terminator";
+      fileManager = "nautilus";
+      emojiChooser = "rofimoji --skin-tone light -a copy";
+    in
+    {
+      enable = true;
+      keybindings = {
+        "super + b" = "update-background";
+        "super + alt + {h,j,k,l}" = "bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}";
+        "super + alt + p" = "autorandr -c";
+        "super + alt + {q,r}" = "bspc {quit,wm -r}";
+        "super + alt + shift + {h,j,k,l}" = "bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}";
+        "super + alt + m" = "lockscreen";
+        "super + bracket{left,right}" = "bspc desktop -f {prev,next}.local";
+        "super + ctrl + {1-9}" = "bspc node -o 0.{1-9}";
+        "super + ctrl + {h,j,k,l}" = "bspc node -p {west,south,north,east}";
+        "super + ctrl + {m,x,y,z}" = "bspc node -g {marked,locked,sticky,private}";
+        "super + ctrl + shift + space" = "bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel";
+        "super + ctrl + space" = "bspc node -p cancel";
+        "super + e" = fileManager;
+        "super + shift + e" = emojiChooser;
+        "super + Escape" = "pkill -USR1 -x sxhkd";
+        "super + g" = "bspc node -s biggest";
+        "super + {grave,Tab}" = "bspc {node,desktop} -f last";
+        "super + {Left,Down,Up,Right}" = "bspc node -v {-20 0,0 20,0 -20,20 0}";
+        "super + m" = "bspc desktop -l next";
+        "super + {o,i}" = "bspc wm -h off;bspc node {older,newer} -f;bspc wm -h on";
+        "super + {p,b,comma,period}" = "bspc node -f @{parent,brother,first,second}";
+        "super + {_,shift + } Return" = "{${primaryTerminal} , ${secondaryTerminal}}";
+        "super + {_,shift + }{1-9,0}" = "bspc {desktop -f,node -d} 'focused:^{1-9,10}'";
+        "super + {_,shift + }c" = "bspc node -f {next,prev}.local";
+        "super + {h,j,k,l}" = "dir={west,south,north,east}; bspc node -f $dir || bspc monitor -f $dir";
+        "super + shift + {h,j,k,l}" = ''dir={west,south,north,east}; bspc node -s "$dir.local" --follow || bspc node -m "$dir" --follow'';
+        "super + {_,shift + }w" = "bspc node -{c,k}";
+        "super + {_,shift + }@space " = "rofi -show {drun,run}";
+        "alt + Tab" = "rofi -show window";
+        "super + {t,shift + t,s,f}" = "bspc node -t {tiled,pseudo_tiled,floating,fullscreen}";
+        "super + y" = "bspc node newest.marked.local -n newest.!automatic.local";
+        "{XF86AudioLowerVolume,XF86AudioMute,XF86AudioRaiseVolume}" = "pamixer {-d 2 -u,-t,-i 2 -u} && dunstify -r 1 Volume `pamixer --get-volume-human`";
+        "XF86Audio{Next,Play,Prev}" = "playerctl {next,play-pause,previous}";
+        "super + alt + {Right,Down,Left}" = "playerctl {next,play-pause,previous}";
+        "XF86MonBrightness{Up,Down}" = "xbacklight {+,-}10%";
+      };
+    };
+}
diff --git a/modules/syncthing.nix b/home_manager/modules/syncthing.nix
similarity index 100%
rename from modules/syncthing.nix
rename to home_manager/modules/syncthing.nix
diff --git a/modules/terminator.nix b/home_manager/modules/terminator.nix
similarity index 94%
rename from modules/terminator.nix
rename to home_manager/modules/terminator.nix
index b9bbb6c..eb73588 100644
--- a/modules/terminator.nix
+++ b/home_manager/modules/terminator.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 let
-  strPalette = with pkgs.rice; palette.toRgbHex rec {
-    inherit (colorPalette) normal bright dark;
+  strPalette = pkgs.lib.rice.palette.toRgbHex rec {
+    inherit (pkgs.rice.colorPalette) normal bright dark;
     background = normal.black;
     foreground = normal.white;
   };
diff --git a/home_manager/modules/thunar.nix b/home_manager/modules/thunar.nix
new file mode 100644
index 0000000..92d40b6
--- /dev/null
+++ b/home_manager/modules/thunar.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs.xfce; [
+    thunar
+    tumbler
+    xfconf
+  ];
+}
diff --git a/modules/tmux.nix b/home_manager/modules/tmux.nix
similarity index 100%
rename from modules/tmux.nix
rename to home_manager/modules/tmux.nix
diff --git a/modules/update_background.nix b/home_manager/modules/update_background.nix
similarity index 84%
rename from modules/update_background.nix
rename to home_manager/modules/update_background.nix
index 3613757..5a8a556 100644
--- a/modules/update_background.nix
+++ b/home_manager/modules/update_background.nix
@@ -1,8 +1,10 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 let
   update_time = "10m";
 in
 {
+  home.packages = [ pkgs.update-background ];
+
   systemd.user.services."update-background" = {
     Unit = {
       Description = "Set random desktop background using feh";
@@ -16,7 +18,7 @@ in
     Service = {
       Type = "oneshot";
       IOSchedulingClass = "idle";
-      ExecStart = "${pkgs.update-background}";
+      ExecStart = "${pkgs.update-background}/bin/update-background";
     };
   };
 
diff --git a/home_manager/modules/webapp.nix b/home_manager/modules/webapp.nix
new file mode 100644
index 0000000..5d083cf
--- /dev/null
+++ b/home_manager/modules/webapp.nix
@@ -0,0 +1,32 @@
+{ pkgs, lib, ... }:
+# Categories: https://specifications.freedesktop.org/menu-spec/latest/apa.html#main-category-registry
+let
+  cmd = link: "google-chrome-stable --app=${link}";
+  links = [
+    { desktopName = "Google Calendar"; link = "https://google.com/calendar"; categories = [ "Office" ]; }
+    { desktopName = "Google Keep"; link = "https://keep.google.com"; categories = [ "Office" ]; }
+    { desktopName = "Monkeytype"; link = "https://monkeytype.com/"; }
+    { desktopName = "Netflix"; link = "https://www.netflix.com"; categories = [ "AudioVideo" ]; }
+    { desktopName = "Notion"; link = "https://notion.so"; categories = [ "Office" ]; }
+    { desktopName = "Prime Video"; link = "https://primevideo.com"; categories = [ "AudioVideo" ]; }
+    { desktopName = "Protonmail"; link = "https://mail.protonmail.com"; categories = [ "Office" ]; }
+    { desktopName = "Twitch"; link = "https://www.twitch.tv"; categories = [ "AudioVideo" ]; }
+    { desktopName = "WhatsApp"; link = "https://web.whatsapp.com/"; }
+    { desktopName = "YouTube"; link = "https://www.youtube.com"; categories = [ "AudioVideo" ]; }
+    { desktopName = "Plex"; link = "https://app.plex.tv"; categories = [ "AudioVideo" ]; }
+  ];
+  webAppBuilder =
+    { desktopName
+    , name ? builtins.replaceStrings [ " " ] [ "_" ] desktopName
+    , link
+    , icon ? lib.toLower name
+    , comment ? null
+    , categories ? [ "Network" ]
+    }: pkgs.makeDesktopItem {
+      inherit name icon desktopName comment categories;
+      exec = cmd link;
+    };
+in
+{
+  home.packages = map webAppBuilder links;
+}
diff --git a/modules/xidlehook.nix b/home_manager/modules/xidlehook.nix
similarity index 87%
rename from modules/xidlehook.nix
rename to home_manager/modules/xidlehook.nix
index 51bcea7..bcb2878 100644
--- a/modules/xidlehook.nix
+++ b/home_manager/modules/xidlehook.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
   xscreensaverCmd = "${pkgs.xscreensaver}/bin/xscreensaver-command -activate";
-  lockCmd = "${pkgs.lockscreen}";
+  lockCmd = "${pkgs.lockscreen}/bin/lockscreen";
 in
 {
   services.xidlehook = {
@@ -18,7 +18,7 @@ in
       }
       {
         command = xscreensaverCmd;
-        delay = 300;
+        delay = 120;
       }
     ];
   };
diff --git a/home_manager/modules/zathura.nix b/home_manager/modules/zathura.nix
new file mode 100644
index 0000000..e41559b
--- /dev/null
+++ b/home_manager/modules/zathura.nix
@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+let
+  strPalette = pkgs.lib.rice.palette.toRgbHex pkgs.rice.colorPalette;
+in
+{
+  programs.zathura = {
+    enable = true;
+    options = {
+      completion-bg = strPalette.bright.black;
+      default-bg = strPalette.normal.black;
+      font = "${pkgs.rice.font.normal.name} 10";
+      inputbar-bg = strPalette.bright.black;
+      inputbar-fg = strPalette.normal.cyan;
+      page-padding = 10;
+      recolor-lightcolor = strPalette.dark.cyan;
+      statusbar-bg = strPalette.bright.black;
+      selection-clipboard = "clipboard";
+    };
+  };
+}
diff --git a/modules/zoxide.nix b/home_manager/modules/zoxide.nix
similarity index 70%
rename from modules/zoxide.nix
rename to home_manager/modules/zoxide.nix
index 560e415..111c8bf 100644
--- a/modules/zoxide.nix
+++ b/home_manager/modules/zoxide.nix
@@ -1,7 +1,4 @@
-{ pkgs, ... }:
-let
-  zoxideCmd = "zoxide";
-in {
+{
   programs.zoxide = {
     enable = true;
     enableBashIntegration = true;
diff --git a/modules/zsh.nix b/home_manager/modules/zsh.nix
similarity index 100%
rename from modules/zsh.nix
rename to home_manager/modules/zsh.nix
diff --git a/home_manager/odin.nix b/home_manager/odin.nix
new file mode 100644
index 0000000..502a75b
--- /dev/null
+++ b/home_manager/odin.nix
@@ -0,0 +1,163 @@
+{ pkgs, ... }:
+{
+  home = {
+    language.base = "it_IT.UTF-8";
+    keyboard = {
+      layout = "it";
+      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
+    };
+    packages = with pkgs; [
+      pulseaudio
+
+      arandr
+      authy
+      bitwarden
+      btop
+      cava
+      unstable.discord
+      docker-compose
+      docker-machine
+      droidcam
+      easyeffects
+      # element-desktop # matrix client
+      # evince
+      evolution
+      file
+      # firefox
+      freecad
+      gallery-dl
+      gnome.eog
+      gnome.file-roller
+      gnome.geary
+      gnome.gnome-calendar
+      gnome.gnome-font-viewer
+      gnome.gnome-screenshot
+      # gnome.gnome-sound-recorder
+      gnome.gnome-sound-recorder
+      # gnome.gnome-sudoku
+      gnome.gnome-sudoku
+      # gnome.gnome-system-monitor
+      # gnome.gnome-tweaks
+      # gnome.nautilus
+      # gnome.quadrapassel
+      # gnome.seahorse
+      # gnome.sushi
+      (google-chrome.override { commandLineArgs = [ "--password-store=gnome" "--force-dark-mode" ]; })
+      gucharmap
+      handbrake
+      htop
+      httpie
+      # hyperspace-cli
+      inkscape
+      jetbrains.datagrip
+      # keepassxc
+      krita
+      kubectl
+      lutris
+      meld
+      minecraft
+      mmv-go
+      mpv
+      # mycrypto
+      neofetch
+      nixos-option
+      nix-prefetch-scripts
+      nix-tree
+      obsidian
+      openvpn
+      p7zip
+      pavucontrol
+      # pcmanfm
+      pentablet-driver
+      procps
+      # pulseaudio
+      retroarchFull
+      ripgrep
+      signal-desktop
+      skypeforlinux
+      # slack
+      spotify
+      teams
+      tex2nix
+      transmission-gtk
+      unrar
+      # (unstable.blender.override { cudaSupport = true; })
+      unstable.tdesktop
+      unstable.zotero
+      unzip
+      virt-manager
+      wget
+      # wineFull
+      wireguard-tools
+      xclip
+      xournalpp
+      yq
+      zip
+      zoom-us
+    ];
+  };
+
+  services = { gnome-keyring.enable = true; };
+
+  xsession = {
+    enable = true;
+    numlock.enable = true;
+    initExtra = ''
+      ## Touchpad
+      ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Natural Scrolling Enabled' 1
+      ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Tapping Enabled' 1
+      ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Disable While Typing Enabled' 1
+    '';
+  };
+
+  imports = [
+    ./basic_env.nix
+
+    ./modules/cpp.nix
+    # ./modules/go.nix
+    ./modules/java.nix
+    ./modules/javascript.nix
+    ./modules/latex.nix
+    ./modules/python.nix
+    ./modules/rust.nix
+
+    ./modules/alacritty.nix
+    ./modules/autorandr.nix
+    ./modules/bspwm.nix
+    ./modules/easyeffects.nix
+    ./modules/dunst.nix
+    # ./modules/grobi.nix
+    ./modules/gtk_theme.nix
+    ./modules/helix.nix
+    # ./modules/joystickwake.nix
+    ./modules/kakoune.nix
+    # ./modules/keepassxc.nix
+    ./modules/kitty.nix
+    ./modules/libinput-gestures.nix
+    ./modules/mangohud.nix
+    ./modules/megasync.nix
+    ./modules/nautilus.nix
+    ./modules/nix-index.nix
+    ./modules/noti.nix
+    ./modules/obs-studio.nix
+    ./modules/office.nix
+    ./modules/onedrive.nix
+    ./modules/pass.nix
+    ./modules/picom.nix
+    ./modules/polybar.nix
+    ./modules/pro_audio.nix
+    # ./modules/pycharm.nix
+    ./modules/rofimoji.nix
+    ./modules/rofi.nix
+    ./modules/screen_locker.nix
+    # ./modules/security.nix
+    ./modules/sxhkd.nix
+    ./modules/syncthing.nix
+    ./modules/terminator.nix
+    # ./modules/thunar.nix
+    ./modules/update_background.nix
+    ./modules/webapp.nix
+    ./modules/xidlehook.nix
+    ./modules/zathura.nix
+  ];
+}
diff --git a/home_manager/thor.nix b/home_manager/thor.nix
new file mode 100644
index 0000000..2441a9c
--- /dev/null
+++ b/home_manager/thor.nix
@@ -0,0 +1,133 @@
+{ pkgs, ... }:
+{
+  home = {
+    language.base = "it_IT.UTF-8";
+    keyboard = {
+      layout = "en";
+      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
+    };
+    packages = with pkgs; [
+      pulseaudio
+
+      arandr
+      authy
+      bitwarden
+      btop
+      catgirl # IRC
+      cava
+      discord
+      docker-compose
+      docker-machine
+      droidcam
+      easyeffects
+      # electrum
+      # element-desktop # matrix client
+      evolution
+      filelight
+      # firefox
+      freecad
+      gallery-dl
+      gnome.file-roller
+      gnome.gnome-font-viewer
+      gnome.geary
+      gnome.gnome-calendar
+      gnome.gnome-screenshot
+      gnome.gnome-sound-recorder
+      # gnome.gnome-system-monitor
+      (google-chrome.override { commandLineArgs = [ "--password-store=gnome" "--force-dark-mode" ]; })
+      gucharmap
+      handbrake
+      httpie
+      hyperspace-cli
+      inkscape
+      jetbrains.datagrip
+      krita
+      kubectl
+      lutris
+      meld
+      minecraft
+      mpv
+      mycrypto
+      nix-prefetch-scripts
+      obsidian
+      okular
+      openvpn
+      p7zip
+      pavucontrol
+      pcmanfm
+      pentablet-driver
+      procps
+      # pulseaudio
+      retroarchFull
+      ripgrep
+      shotwell
+      signal-desktop
+      skypeforlinux
+      # slack
+      spotify
+      tdesktop
+      teams
+      transmission-gtk
+      (unstable.blender.override { cudaSupport = true; })
+      unstable.zotero
+      virt-manager
+      # wineFull
+      wireguard-tools
+      xournalpp
+      zoom-us
+    ];
+  };
+
+  services = {
+    gnome-keyring.enable = true;
+  };
+
+  imports = [
+    ./basic_env.nix
+
+    ./modules/cpp.nix
+    # ./modules/go.nix
+    ./modules/java.nix
+    ./modules/javascript.nix
+    ./modules/latex.nix
+    ./modules/python.nix
+    ./modules/rust.nix
+
+    ./modules/alacritty.nix
+    ./modules/autorandr.nix
+    ./modules/bspwm.nix
+    ./modules/easyeffects.nix
+    ./modules/dunst.nix
+    # ./modules/grobi.nix
+    ./modules/gtk_theme.nix
+    ./modules/helix.nix
+    # ./modules/joystickwake.nix
+    ./modules/kakoune.nix
+    # ./modules/keepassxc.nix
+    ./modules/kitty.nix
+    ./modules/mangohud.nix
+    ./modules/megasync.nix
+    ./modules/nautilus.nix
+    ./modules/nix-index.nix
+    ./modules/noti.nix
+    ./modules/obs-studio.nix
+    ./modules/office.nix
+    ./modules/onedrive.nix
+    ./modules/pass.nix
+    ./modules/picom.nix
+    ./modules/polybar.nix
+    ./modules/pro_audio.nix
+    ./modules/rofimoji.nix
+    ./modules/rofi.nix
+    ./modules/screen_locker.nix
+    # ./modules/security.nix
+    ./modules/sxhkd.nix
+    ./modules/syncthing.nix
+    ./modules/terminator.nix
+    # ./modules/thunar.nix
+    ./modules/update_background.nix
+    ./modules/webapp.nix
+    ./modules/xidlehook.nix
+    ./modules/zathura.nix
+  ];
+}
diff --git a/nixos/loki.nix b/loki/configuration.nix
similarity index 65%
rename from nixos/loki.nix
rename to loki/configuration.nix
index d189fa8..d29e88d 100644
--- a/nixos/loki.nix
+++ b/loki/configuration.nix
@@ -1,47 +1,36 @@
 { config, pkgs, lib, ... }:
-
+with lib;
 {
-  imports = [
-    /etc/nixos/hardware-configuration.nix
-  ];
-
-  boot.loader = {
-    systemd-boot.enable = true;
-    efi.canTouchEfiVariables = true;
+  boot = {
+    binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ];
+    kernelPackages = pkgs.linuxPackages_5_18;
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
   };
 
-  networking = {
-    hostName = "loki";
-    networkmanager.enable = true;
-    useDHCP = false;
-    interfaces = { eno1.useDHCP = true; wlp7s0.useDHCP = true; };
-  };
-
-  time.timeZone = "Europe/Rome";
-
-  i18n.defaultLocale = "it_IT.UTF-8";
   console = {
     font = "Lat2-Terminus16";
     keyMap = "it";
   };
 
-  services.xserver = {
-    enable = true;
-    videoDrivers = [ "nvidia" ];
-    layout = "it";
-    xkbOptions = "eurosign:e;";
-    libinput.enable = true;
+  environment = {
+    pathsToLink = [ "/share/zsh" ];
+    systemPackages = with pkgs; [ kakoune tmux vim ];
   };
 
-
   hardware = {
+    enableRedistributableFirmware = true;
+
     nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470;
-    nvidia.prime = {
-      offload.enable = false;
-      sync.enable = true;
-      intelBusId = "PCI:0:2:0";
-      nvidiaBusId = "PCI:1:0:0";
-    };
+    # nvidia.nvidiaPersistenced = true; # HEADLESS
+    # nvidia.prime = {
+    #   offload.enable = false;
+    #   sync.enable = true;
+    #   intelBusId = "PCI:0:2:0";
+    #   nvidiaBusId = "PCI:1:0:0";
+    # };
 
     opengl = {
       enable = true;
@@ -51,24 +40,22 @@
     bluetooth.enable = true;
   };
 
-  users.users = {
-    bertof = {
-      isNormalUser = true;
-      extraGroups = [ "audio" "input" "docker" "libvirtd" "network" "usb" "video" "wheel" ];
-      openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN+zsSWZFFzQKnATCAvtG+iuSm4qkZHjCtHzGa9B/71W" ];
-      shell = pkgs.zsh;
-    };
-    tiziano = {
-      isNormalUser = true;
-      openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMExwtJFk6HjySrTZwJH67SOHC3hlL28NO4oe2GXsv6k" ];
-    };
-  };
+  i18n.defaultLocale = "it_IT.UTF-8";
 
   programs = {
+    dconf.enable = true;
     gnupg.agent = { enable = true; enableSSHSupport = true; };
     zsh = { enable = true; syntaxHighlighting.enable = true; };
   };
-  environment.pathsToLink = [ "/share/zsh" ];
+
+  networking = {
+    hostName = "loki";
+    interfaces = { eno1.useDHCP = true; wlp7s0.useDHCP = true; };
+    networkmanager.enable = true;
+    useDHCP = false;
+  };
+
+  time.timeZone = "Europe/Rome";
 
   services = {
     avahi = {
@@ -84,42 +71,23 @@
       };
       extraServiceFiles = {
         ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service";
-        smb = ''<?xml version="1.0" standalone='no'?><!--*-nxml-*--><!DOCTYPE service-group SYSTEM "avahi-service.dtd"><service-group><name replace-wildcards="yes">%h</name><service><type>_smb._tcp</type><port>445</port></service></service-group>'';
       };
     };
-    bazarr = {
-      enable = true;
-      openFirewall = true;
-      group = "users";
-    };
+    bazarr = { enable = true; openFirewall = true; group = "users"; };
     blueman.enable = true;
-    dbus.packages = with pkgs; [ gnome.dconf ];
+    dbus.packages = with pkgs; [ dconf ];
     fail2ban = { enable = true; bantime-increment.enable = true; };
     gnome.gnome-keyring.enable = true;
-    gvfs = { enable = true; package = lib.mkForce pkgs.gnome3.gvfs; };
-    jackett = {
-      enable = true;
-      openFirewall = true;
-      group = "users";
-    };
+    gvfs = { enable = true; package = mkForce pkgs.gnome3.gvfs; };
+    jackett = { enable = true; openFirewall = true; group = "users"; };
+    jellyfin = { enable = true; openFirewall = true; group = "users"; };
     logind.lidSwitch = "ignore";
-    node-red = {
-      enable = true;
-      openFirewall = true;
-      withNpmAndGcc = true;
-    };
+    node-red = { enable = true; openFirewall = true; withNpmAndGcc = true; };
     openssh = { enable = true; openFirewall = true; permitRootLogin = "no"; passwordAuthentication = false; };
     plex = { enable = true; openFirewall = true; group = "users"; };
     power-profiles-daemon.enable = true;
-    radarr = {
-      enable = true;
-      openFirewall = true;
-      group = "users";
-    };
-    samba-wsdd = {
-      enable = true;
-      discovery = true;
-    };
+    radarr = { enable = true; openFirewall = true; group = "users"; };
+    samba-wsdd = { enable = true; discovery = true; };
     samba = {
       enable = true;
       enableNmbd = true;
@@ -141,20 +109,20 @@
         "force group" = "users";
       }; in
         {
-          bertof = common // {
-            path = "/mnt/raid/bertof";
+          bertof = recursiveUpdate common {
+            path = "/mnt/raid0/bertof";
             comment = "Bertof samba share";
             "force user" = "bertof";
             "valid users" = "bertof";
           };
-          tiziano = common // {
-            path = "/mnt/raid/tiziano";
+          tiziano = recursiveUpdate common {
+            path = "/mnt/raid0/tiziano";
             comment = "Tiziano samba share";
             "force user" = "tiziano";
             "valid users" = "tiziano";
           };
-          condiviso = common // {
-            path = "/mnt/raid/condiviso";
+          condiviso = recursiveUpdate common {
+            path = "/mnt/raid0/condiviso";
             comment = "Samba share condiviso";
             "valid users" = "bertof tiziano";
             "create mask" = "0770";
@@ -162,19 +130,19 @@
             "force create mode" = "0660";
             "force directory mode" = "2770";
           };
-          bertof_safe = common // {
+          bertof_safe = recursiveUpdate common {
             path = "/mnt/raid1/bertof";
             comment = "Bertof samba share";
             "force user" = "bertof";
             "valid users" = "bertof";
           };
-          tiziano_safe = common // {
+          tiziano_safe = recursiveUpdate common {
             path = "/mnt/raid1/tiziano";
             comment = "Tiziano samba share";
             "force user" = "tiziano";
             "valid users" = "tiziano";
           };
-          condiviso_safe = common // {
+          condiviso_safe = recursiveUpdate common {
             path = "/mnt/raid1/condiviso";
             comment = "Samba share condiviso";
             "valid users" = "bertof tiziano";
@@ -186,49 +154,103 @@
         };
     };
     smartd = { enable = true; notifications.x11.enable = true; };
-    sonarr = {
-      enable = true;
-      openFirewall = true;
-      group = "users";
-    };
+    sonarr = { enable = true; openFirewall = true; group = "users"; };
     thermald.enable = true;
     transmission = {
       enable = true;
       openFirewall = true;
       group = "users";
       settings = {
-        download-dir = "/mnt/raid/condiviso/Scaricati/Torrent";
-        incomplete-dir = "/mnt/raid/condiviso/Scaricati/Torrent/.incomplete";
+        download-dir = "/mnt/raid0/condiviso/Scaricati/Torrent";
+        incomplete-dir = "/mnt/raid0/condiviso/Scaricati/Torrent/.incomplete";
       };
     };
+    xserver = {
+      # enable = true;
+      videoDrivers = [ "nvidia" ];
+      # layout = "it";
+      # xkbOptions = "eurosign:e;";
+      # libinput.enable = true;
+    };
     zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; };
+
+    zoneminder = {
+      enable = true;
+      openFirewall = true;
+      cameras = 3;
+      hostname = "0.0.0.0";
+      database = { username = "zoneminder"; createLocally = true; };
+    };
+
+    mysql = {
+      # enable = true;
+      ensureUsers = [{ name = "bertof"; ensurePermissions = { "*.*" = "ALL PRIVILEGES"; }; }];
+    };
   };
 
-  # services.snapper = {
-  #   configs =
-  #     let
-  #       bertofExtraConfig = ''
-  #         ALLOW_USERS="bertof"
-  #         TIMELINE_CREATE=yes
-  #         TIMELINE_CLEANUP=yes
-  #       '';
-  #       common = { extraConfig = bertofExtraConfig; };
-  #     in
-  #     {
-  #       bertof_home = common // { subvolume = "/home/bertof"; };
-  #     };
-  # };
+  users.users = {
+    bertof = {
+      isNormalUser = true;
+      extraGroups = [ "audio" "input" "docker" "libvirtd" "network" "usb" "video" "wheel" ];
+      openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN+zsSWZFFzQKnATCAvtG+iuSm4qkZHjCtHzGa9B/71W" ];
+      shell = pkgs.zsh;
+    };
+    tiziano = {
+      isNormalUser = true;
+      openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMExwtJFk6HjySrTZwJH67SOHC3hlL28NO4oe2GXsv6k" ];
+    };
+    jellyfin.extraGroups = [ "video" ];
+  };
+
+  services.snapper = {
+    configs =
+      let
+        commonExtraConfig = ''
+          ALLOW_USERS="bertof"
+          TIMELINE_CREATE=yes
+          TIMELINE_CLEANUP=yes
+        '';
+      in
+      {
+        bertof_raid0 = {
+          subvolume = "/mnt/raid0/bertof";
+          extraConfig = ''
+            ALLOW_USERS="bertof"
+            ${commonExtraConfig}
+          '';
+        };
+        tiziano_raid0 = {
+          subvolume = "/mnt/raid0/tiziano";
+          extraConfig = ''
+            ALLOW_USERS="tiziano"
+            ${commonExtraConfig}
+          '';
+        };
+        condiviso_raid0 = {
+          subvolume = "/mnt/raid0/condiviso";
+          extraConfig = ''
+            ALLOW_USERS="bertof tiziano"
+            ${commonExtraConfig}
+          '';
+        };
+      };
+  };
 
 
   systemd.packages = with pkgs; [ syncthing ];
   systemd.services = let common = {
+    documentation = [ "man:syncthing(1)" ];
+    startLimitIntervalSec = 60;
+    startLimitBurst = 4;
     after = [ "network.target" ];
     environment = { STNORESTART = "yes"; STNOUPGRADE = "yes"; };
     wantedBy = [ "default.target" ];
     serviceConfig = {
       Restart = "on-failure";
-      SuccessExitStatus = "2 3 4";
+      RestartSec = 1;
+      SuccessExitStatus = "3 4";
       RestartForceExitStatus = "3 4";
+
       Group = config.ids.gids.users;
       MemoryDenyWriteExecute = true;
       NoNewPrivileges = true;
@@ -247,13 +269,13 @@
     };
   }; in
     {
-      syncthing-bertof = common // {
+      syncthing-bertof = recursiveUpdate common {
         description = "Syncthing service bertof";
-        serviceConfig = { User = "bertof"; ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -gui-address=0.0.0.0:8384 -home=/mnt/raid/bertof/Syncthing/.config"; };
+        serviceConfig = { User = "bertof"; ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -gui-address=0.0.0.0:8384 -home=/mnt/raid0/bertof/Syncthing/.config"; };
       };
-      syncthing-tiziano = common // {
+      syncthing-tiziano = recursiveUpdate common {
         description = "Syncthing service tiziano";
-        serviceConfig = { User = "tiziano"; ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -gui-address=0.0.0.0:8385 -home=/mnt/raid/tiziano/Syncthing/.config"; };
+        serviceConfig = { User = "tiziano"; ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -gui-address=0.0.0.0:8385 -home=/mnt/raid0/tiziano/Syncthing/.config"; };
       };
     };
 
@@ -281,7 +303,7 @@
     kvmgt.enable = true;
     libvirtd.enable = true;
     podman.enable = true;
-    virtualbox.host.enable = true;
+    # virtualbox.host.enable = true;
 
     oci-containers.containers = {
       hass = {
@@ -293,13 +315,12 @@
         ports = [ "8123:8123" ];
         volumes = [
           "/var/lib/hass:/config"
-          "/mnt/raid/condiviso:/media"
+          "/mnt/raid0/condiviso:/media"
         ];
       };
     };
   };
 
-  environment.systemPackages = with pkgs; [ htop kakoune vim tmux ];
 
   security.sudo.extraConfig = ''
     Defaults pwfeedback
@@ -308,7 +329,7 @@
   nixpkgs.config.allowUnfree = true;
   nix = {
     package = pkgs.nixFlakes;
-    extraOptions = lib.optionalString (config.nix.package == pkgs.nixFlakes)
+    extraOptions = optionalString (config.nix.package == pkgs.nixFlakes)
       "experimental-features = nix-command flakes";
     gc.automatic = true;
   };
diff --git a/loki/hardware-configuration.nix b/loki/hardware-configuration.nix
new file mode 100644
index 0000000..7ff4764
--- /dev/null
+++ b/loki/hardware-configuration.nix
@@ -0,0 +1,83 @@
+# 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, modulesPath, ... }:
+
+{
+  imports =
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "uas" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    {
+device = "/dev/disk/by-uuid/44c53e75-a00d-47bc-a99b-2544fe513e51";
+      fsType = "btrfs";
+    };
+
+  fileSystems."/boot" =
+    {
+      device = "/dev/disk/by-uuid/8A71-E5EB";
+      fsType = "vfat";
+    };
+
+  fileSystems."/mnt/raid1" =
+    {
+      device = "/dev/disk/by-uuid/c84a38dc-9cc7-4762-b509-8fce1c1d95c8";
+      fsType = "btrfs";
+    };
+
+  fileSystems."/var/lib/docker/btrfs" =
+    {
+      device = "/var/lib/docker/btrfs";
+      fsType = "none";
+      options = [ "bind" ];
+    };
+
+  fileSystems."/mnt/raid0/bertof" =
+    {
+      device = "/dev/disk/by-uuid/7ca4d382-eed7-4b49-b7d8-4b5ca139dd9c";
+      fsType = "btrfs";
+      options = [ "subvol=@bertof" ];
+    };
+
+  fileSystems."/mnt/raid0/tiziano" =
+    {
+      device = "/dev/disk/by-uuid/7ca4d382-eed7-4b49-b7d8-4b5ca139dd9c";
+      fsType = "btrfs";
+      options = [ "subvol=@tiziano" ];
+    };
+
+  fileSystems."/mnt/raid0/condiviso" =
+    {
+      device = "/dev/disk/by-uuid/7ca4d382-eed7-4b49-b7d8-4b5ca139dd9c";
+      fsType = "btrfs";
+      options = [ "subvol=@condiviso" ];
+    };
+
+  fileSystems."/mnt/zoneminder" =
+    {
+      device = "/dev/disk/by-uuid/7ca4d382-eed7-4b49-b7d8-4b5ca139dd9c";
+      fsType = "btrfs";
+      options = [ "subvol=@zoneminder" ];
+    };
+
+  swapDevices = [ ];
+
+  # 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 false;
+  # networking.interfaces.docker0.useDHCP = lib.mkDefault true;
+  networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+  networking.interfaces.wlp7s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.ztmjfdwjkp.useDHCP = lib.mkDefault true;
+
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/modules/bottom.nix b/modules/bottom.nix
deleted file mode 100644
index 8c556f3..0000000
--- a/modules/bottom.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, lib, ... }:
-let
-	tomlGenerate = (pkgs.formats.toml {}).generate "bottom-toml";
-in {
-	home.packages = with pkgs; [ bottom ];
-	xdg.configFile."bottom/bottom.toml".source = tomlGenerate {
-		"flags" = {
-			"left_legend" = true;
-			"color" = "nord";
-		};
-	};
-}
diff --git a/modules/broot.nix b/modules/broot.nix
deleted file mode 100644
index fed74a5..0000000
--- a/modules/broot.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	programs.broot = {
-  	enable = true;
-  	enableBashIntegration = true;
-  	enableZshIntegration = true;
-	};
-}
diff --git a/modules/bspwm.nix b/modules/bspwm.nix
deleted file mode 100644
index 32789ec..0000000
--- a/modules/bspwm.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ pkgs, ... }:
-
-let
-  monitorPages = [ "I" "II" "III" "IV" "V" "VI" "VII" "VIII" "IX" "X" ];
-  strPalette = pkgs.rice.palette.toRGBHex pkgs.rice.colorPalette;
-  xrandr = "${pkgs.xorg.xrandr}/bin/xrandr";
-in
-{
-  xsession.windowManager.bspwm = {
-    enable = true;
-    settings = {
-      border_width = 2;
-      border_radius = 8;
-      window_gap = 4;
-      split_ratio = 0.5;
-      top_padding = 0;
-      borderless_monocle = true;
-      gapless_monocle = false;
-      normal_border_color = strPalette.normal.blue;
-      focused_border_color = strPalette.bright.blue;
-    };
-    monitors = {
-      # Intel
-      "eDP1" = monitorPages;
-      "DP1" = monitorPages;
-
-      # Nvidia
-      "eDP-1-1" = monitorPages;
-      "HDMI-0" = monitorPages;
-      "DP-1-1" = monitorPages;
-    };
-    extraConfig = ''
-      ${pkgs.wmname}/bin/wmname LG3D
-      ${pkgs.polybar}/bin/polybar-msg cmd restart
-
-      if grep DP-1-1 <(${xrandr} --listactivemonitors); then
-        ${xrandr} --output DP-1-1 --auto --left-of HDMI-0 --rotate right ||
-        ${xrandr} --output DP-1-1 --auto --left-of eDP-1-1 --rotate right
-      elif grep DP1 <(${xrandr} --listactivemonitors); then
-        ${xrandr} --output DP-1-1 --auto --above eDP1;
-      fi
-
-      systemctl --user restart polybar.service update-background.service || true
-    '';
-    startupPrograms = [];
-  };
-
-  # xdg.configFile."bspwm/bspwmrc" = {
-  #   executable = true;
-  #   text = ''
-  #     #!/bin/sh
-
-  #     bspc monitor DP1 -d I II III IV V VI VII VIII IX X
-  #     bspc monitor HDMI-0 -d I II III IV V VI VII VIII IX X
-  #     bspc monitor eDP-1-1 -d I II III IV V VI VII VIII IX X
-  #     bspc monitor eDP1 -d I II III IV V VI VII VIII IX X
-  #     bspc config border_radius 8
-  #     bspc config border_width 2
-  #     bspc config borderless_monocle true
-  #     bspc config focused_border_color '#678EBD'
-  #     bspc config gapless_monocle false
-  #     bspc config normal_border_color '#5E81AC'
-  #     bspc config split_ratio 0.500000
-  #     bspc config top_padding 0
-  #     bspc config window_gap 4
-  #     # java gui fixes
-  #     export _JAVA_AWT_WM_NONREPARENTING=1
-  #     bspc rule -a sun-awt-X11-XDialogPeer state=floating
-
-  #     sleep 2
-  #     polybar-msg cmd restart
-  #   '';
-  # };
-}
diff --git a/modules/dircolors.nix b/modules/dircolors.nix
deleted file mode 100644
index 8467404..0000000
--- a/modules/dircolors.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	programs.dircolors = {
-  	enable = true;
-  	enableBashIntegration = true;
-  	enableZshIntegration = true;
-	};
-}
diff --git a/modules/fzf.nix b/modules/fzf.nix
deleted file mode 100644
index 53accd0..0000000
--- a/modules/fzf.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  programs.fzf = {
-		enable = true;
-		tmux.enableShellIntegration = true;
-		enableBashIntegration = true;
-		enableZshIntegration = true;
-  };
-}
diff --git a/modules/go.nix b/modules/go.nix
deleted file mode 100644
index f8d8c26..0000000
--- a/modules/go.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	programs.go = {
-		enable = true;
-	};
-}
diff --git a/modules/gpg.nix b/modules/gpg.nix
deleted file mode 100644
index 6ad7fee..0000000
--- a/modules/gpg.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	programs.gpg = {
-		enable = true;
-		settings = {
-
-		};
-	};
-
-	services.gpg-agent = {
-		enable = true;
-		defaultCacheTtl = 600;
-		# extraConfig = "allow-loopback-pinentry";
-	};
-}
diff --git a/modules/java.nix b/modules/java.nix
deleted file mode 100644
index 0a78d8a..0000000
--- a/modules/java.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ...}:
-{
-  programs.java.enable = pkgs.devEnvironment.enableJava ? false;
-}
diff --git a/modules/kakoune.nix b/modules/kakoune.nix
deleted file mode 100644
index 82a99d8..0000000
--- a/modules/kakoune.nix
+++ /dev/null
@@ -1,473 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  strPalette = with pkgs.rice;
-    palette.toRgbShortHex colorPalette;
-  packages = with pkgs;
-    [
-      (pkgs.makeDesktopItem
-        {
-          name = "kakoune";
-          exec = "kak %U";
-          icon = "kakoune";
-          desktopName = "Kakoune";
-          comment = "Kakoune text editor";
-          terminal = true;
-          categories = [ "Development" ];
-        })
-    ] ++ [
-      # editorconfig-core-c
-      python3.pkgs.editorconfig
-    ] ++ (
-      lib.optionals (pkgs.devEnvironment.enableCpp) [
-        clang-tools
-      ]
-    ) ++ (
-      lib.optionals (pkgs.devEnvironment.enableData) [
-        yaml-language-server
-        nodePackages.vscode-langservers-extracted
-      ]
-    ) ++ (
-      lib.optionals (pkgs.devEnvironment.enableHtml) [
-        nodePackages.vscode-langservers-extracted
-      ]
-    ) ++ (
-      lib.optionals (pkgs.devEnvironment.enableJavascript) [
-        flow
-      ]
-    ) ++ (
-      lib.optionals (pkgs.devEnvironment.enableLatex) [
-        texlab
-      ]
-    ) ++ (
-      lib.optionals (pkgs.devEnvironment.enableNix) [
-        rnix-lsp
-      ]
-    ) ++ (
-      with python3.pkgs;
-      lib.optionals (pkgs.devEnvironment.enablePython) [
-        black
-        # pyls-black
-        pyls-flake8
-        pyls-isort
-        # pyls-mypy
-        python-lsp-server
-      ]
-    ) ++ (
-      lib.optionals (pkgs.devEnvironment.enableRust) [
-        cargo
-        cargo-watch
-        clippy
-        rust-analyzer
-        rustc
-        rustfmt
-      ]
-    ) ++ (
-      lib.optionals (pkgs.devEnvironment.enableShell) [
-        nodePackages.bash-language-server
-      ]
-    ) ++ (
-      lib.optionals (pkgs.devEnvironment.enableSpelling) [
-        aspell
-        aspellDicts.en
-        aspellDicts.en-computers
-        aspellDicts.en-science
-        aspellDicts.it
-      ]
-    );
-  plugins = with pkgs;
-    [
-      kakounePlugins.prelude-kak
-      kakounePlugins.kak-lsp
-      kakounePlugins.auto-pairs-kak
-      kakounePlugins.powerline-kak
-      kakounePlugins.connect-kak
-    ];
-in
-{
-  home.sessionVariables = {
-    EDITOR = "kak";
-    VISUAL = "kak";
-  };
-  programs.bash.shellAliases = {
-    k = "kak";
-  };
-  programs.zsh.shellAliases = {
-    k = "kak";
-  };
-  home.packages = packages;
-  programs.kakoune = {
-    enable = true;
-    config = {
-      colorScheme = "nord";
-      tabStop = 2;
-      indentWidth = 2;
-      alignWithTabs = true;
-      scrollOff = {
-        lines = 5;
-        columns = 3;
-      };
-      ui = {
-        setTitle = true;
-        changeColors = true;
-        enableMouse = true;
-      };
-      wrapLines = {
-        enable = true;
-        word = true;
-      };
-      numberLines = {
-        enable = true;
-        highlightCursor = true;
-      };
-      keyMappings = with pkgs;
-        [
-          {
-            mode = "normal";
-            docstring = "Edit file";
-            key = "<c-e>";
-            effect = ":edit<space>";
-          }
-          {
-            mode = "user";
-            docstring = "Code actions";
-            key = "a";
-            effect = ":lsp-code-actions<ret>";
-          }
-          {
-            mode = "user";
-            docstring = "Comment block";
-            key = "b";
-            effect = ":comment-block<ret>";
-          }
-          {
-            mode = "user";
-            docstring = "Comment line";
-            key = "l";
-            effect = ":comment-line<ret>";
-          }
-          {
-            mode = "user";
-            docstring = "Copy to clipboard";
-            key = "y";
-            effect = "<a-|>${xclip}/bin/xclip -i -selection clipboard<ret>";
-          }
-          {
-            mode = "user";
-            docstring = "Format code with formatter";
-            key = "f";
-            effect = ":format<ret>";
-          }
-          {
-            mode = "user";
-            docstring = "Format code with LSP";
-            key = "F";
-            effect = ":lsp-formatting-sync<ret>";
-          }
-          {
-            mode = "user";
-            docstring = "Jump to definition";
-            key = "d";
-            effect = ":lsp-definition<ret>";
-          }
-          {
-            mode = "user";
-            docstring = "Rename object";
-            key = "r";
-            effect = ":lsp-rename-prompt<ret>";
-          }
-          {
-            mode = "user";
-            docstring = "Jump to type definition";
-            key = "t";
-            effect = ":lsp-type-definition<ret>";
-          }
-          {
-            mode = "user";
-            docstring = "List project diagnostics";
-            key = "i";
-            effect = ":lsp-diagnostics<ret>";
-          }
-          {
-            mode = "user";
-            docstring = "Paste from clipboard (after)";
-            key = "P";
-            effect = "<a-!>${xclip}/bin/xclip -selection clipboard -o<ret>";
-          }
-          {
-            mode = "user";
-            docstring = "Paste from clipboard (before)";
-            key = "p";
-            effect = "!${xclip}/bin/xclip -selection clipboard -o<ret>";
-          }
-          {
-            mode = "user";
-            docstring = "Show hover info";
-            key = "q";
-            effect = ":lsp-hover<ret>";
-          }
-          {
-            mode = "user";
-            docstring = "Spellcheck English";
-            key = "S";
-            effect = ":spell en<ret>";
-          }
-          {
-            mode = "user";
-            docstring = "Spellcheck";
-            key = "s";
-            effect = ":spell ";
-          }
-          {
-            mode = "normal";
-            docstring = "Try next snippet placeholder";
-            key = "<c-n>";
-            effect = "<a-;>: insert-c-n<ret>";
-          }
-          # {
-          #   mode = "normal";
-          #   docstring = "Search";
-          #   key = "/";
-          #   effect = "/(?i)";
-          # }
-          # {
-          #   mode = "normal";
-          #   docstring = "Reverse search";
-          #   key = "<a-/>";
-          #   effect = "<a-/>(?i)";
-          # }
-        ];
-      hooks = with pkgs;
-        [
-          {
-            name = "BufCreate";
-            option = ".*";
-            commands = "editorconfig-load";
-          }
-          # {
-          #   name = "ModuleLoaded";
-          #   option = "auto-pairs";
-          #   commands = "auto-pairs-enable";
-          # }
-          {
-            name = "ModuleLoaded";
-            option = "powerline";
-            commands = builtins.concatStringsSep "\n" [ "powerline-enable" ];
-          }
-        ] ++ (
-          lib.optionals (pkgs.devEnvironment.enableLatex) [
-            {
-              name = "BufSetOption";
-              option = "filetype=latex";
-              commands = "set-option buffer formatcmd ${texlive.bin.latexindent}/bin/latexindent";
-            }
-          ]
-        ) ++ (
-          lib.optionals (pkgs.devEnvironment.enablePython) [
-            {
-              name = "BufSetOption";
-              option = "filetype=python";
-              commands = "set-option buffer formatcmd '${python3.pkgs.black}/bin/black -'";
-            }
-          ]
-        ) ++ (
-          lib.optionals (pkgs.devEnvironment.enableData) [
-            {
-              name = "BufSetOption";
-              option = "filetype=(markdown|html|json|yaml|css|scss|less)";
-              commands = "set-option buffer formatcmd ${nodePackages.prettier}/bin/prettier";
-            }
-          ]
-        );
-      # TODO add more formatters from https://github.com/mawww/kakoune/wiki/Format
-    };
-    extraConfig = builtins.concatStringsSep "\n" [
-      "# Custom commands"
-      "add-highlighter global/ regex \\h+$ 0:Error                   # Highlight trailing spaces"
-      "eval %sh{kak-lsp --kakoune -s $kak_session}"
-      "lsp-enable"
-      ''
-        def -hidden insert-c-n %{
-         try %{
-           lsp-snippets-select-next-placeholders
-           exec '<a-;>d'
-         } catch %{
-           exec -with-hooks '<c-n>'
-         }
-        }
-      ''
-      "require-module powerline"
-      "powerline-start"
-      "require-module connect-broot"
-      "require-module connect-lf"
-      "require-module connect-rofi"
-    ];
-    plugins = plugins;
-  };
-  xdg.configFile."kak/colors/nord.kak".text = with strPalette;
-    ''
-      set-face global value rgb:${normal.magenta},default
-      set-face global type rgb:${bright.white},default
-      set-face global identifier rgb:${normal.cyan},default
-      set-face global string rgb:${normal.green},default
-      set-face global error rgb:${normal.red},default
-      set-face global keyword rgb:${normal.blue},default
-      set-face global operator rgb:${normal.blue},default
-      set-face global attribute rgb:${bright.blue},default
-      set-face global comment rgb:${bright.blue},default
-      set-face global meta rgb:${normal.yellow},default
-      set-face global Default rgb:${normal.white},default
-      set-face global PrimarySelection rgb:${normal.black},rgb:${dark.yellow}
-      set-face global SecondarySelection rgb:${normal.black},rgb:${dark.white}
-      set-face global PrimaryCursor rgb:${normal.black},rgb:${normal.yellow}
-      set-face global SecondaryCursor rgb:${normal.black},rgb:${normal.white}
-      set-face global MenuForeground rgb:${normal.white},rgb:${bright.black}
-      set-face global MenuBackground default,rgb:${normal.black}
-      set-face global MenuInfo default,rgb:${normal.black}
-      set-face global Information rgb:${dark.black},rgb:${normal.cyan}
-      set-face global StatusLine rgb:${normal.white},rgb:${normal.black}
-      set-face global StatusLineMode rgb:${normal.blue},rgb:${normal.black}
-      set-face global StatusLineInfo rgb:${normal.blue},rgb:${normal.black}
-      set-face global StatusLineValue rgb:${normal.blue},rgb:${normal.black}
-      set-face global StatusCursor rgb:${dark.black},rgb:${normal.yellow}
-      set-face global Prompt rgb:${normal.cyan},rgb:${normal.black}
-      set-face global BufferPadding default,default
-    '';
-  xdg.configFile."kak-lsp/kak-lsp.toml".text = with pkgs;
-    builtins.concatStringsSep "\n" (
-      [
-        ''
-          snippet_support = false
-          verbosity = 2
-          [server]
-          timeout = 1800 # seconds = 30 minutes
-        ''
-      ]
-      ++ (
-        lib.optional (pkgs.devEnvironment.enableCpp) ''
-          [language.c_cpp]
-          filetypes = ["c", "cpp"]
-          roots = ["compile_commands.json", ".clangd"]
-          command = "${clang-tools}/bin/clangd"
-          offset_encoding = "utf-8"
-        ''
-      ) ++ (
-        lib.optional (pkgs.devEnvironment.enableData) ''
-          [language.json]
-          filetypes = ["json"]
-          roots = ["package.json"]
-          command = "${nodePackages.vscode-langservers-extracted}/bin/vscode-json-language-server"
-          args = ["--stdio"]
-          [language.yaml]
-          filetypes = ["yaml"]
-          roots = [".git"]
-          command = "${yaml-language-server}/bin/yaml-language-server"
-          args = ["--stdio"]
-          [language.yaml.settings]
-          # See https://github.com/redhat-developer/yaml-language-server#language-server-settings
-          # Defaults are at https://github.com/redhat-developer/yaml-language-server/blob/master/src/yamlSettings.ts
-          yaml.format.enable = true
-        ''
-      ) ++ (
-        lib.optional (pkgs.devEnvironment.enableGo) ''
-          [language.go]
-          filetypes = ["go"]
-          roots = ["Gopkg.toml", "go.mod", ".git", ".hg"]
-          command = "gopls"
-          offset_encoding = "utf-8"
-          settings_section = "gopls"
-          [language.go.settings.gopls]
-          # See https://github.com/golang/tools/blob/master/gopls/doc/settings.md
-          # "build.buildFlags" = []
-        ''
-      )
-      ++ (
-        lib.optional (pkgs.devEnvironment.enableHtml) ''
-          [language.html]
-          filetypes = ["html"]
-          roots = ["package.json"]
-          command = "${nodePackages.vscode-langservers-extracted}/bin/vscode-html-language-server"
-          args = ["--stdio"]
-          [language.css]
-          filetypes = ["css"]
-          roots = ["package.json", ".git"]
-          command = "${nodePackages.vscode-langservers-extracted}/bin/vscode-css-language-server"
-          args = ["--stdio"]
-          [language.less]
-          filetypes = ["less"]
-          roots = ["package.json", ".git"]
-          command = "${nodePackages.vscode-langservers-extracted}/bin/vscode-css-language-server"
-          args = ["--stdio"]
-          [language.scss]
-          filetypes = ["scss"]
-          roots = ["package.json", ".git"]
-          command = "${nodePackages.vscode-langservers-extracted}/bin/vscode-css-language-server"
-          args = ["--stdio"]
-        ''
-      ) ++ (
-        lib.optional (pkgs.devEnvironment.enableJavascript) ''
-          [language.javascript]
-          filetypes = ["javascript"]
-          roots = [".flowconfig"]
-          command = "${flow}/bin/flow"
-          args = ["lsp"]
-        ''
-      ) ++ (
-        lib.optional (pkgs.devEnvironment.enableLatex) ''
-          [language.latex]
-          filetypes = ["latex"]
-          roots = [".git"]
-          command = "${texlab}/bin/texlab"
-          settings_section = "texlab"
-          [language.latex.settings.texlab]
-          # See https://github.com/latex-lsp/texlab/blob/master/src/options.rs
-          # bibtexFormatter = "${texlab}/bin/texlab"
-        ''
-      ) ++ (
-        lib.optional (pkgs.devEnvironment.enableNix) ''
-          [language.nix]
-          filetypes = ["nix"]
-          roots = ["flake.nix", "shell.nix", ".git"]
-          command = "${rnix-lsp}/bin/rnix-lsp"
-        ''
-      ) ++ (
-        lib.optional (pkgs.devEnvironment.enablePython) ''
-          [language.python]
-          filetypes = ["python"]
-          roots = ["requirements.txt", "setup.py", ".git", ".hg"]
-          command = "${python3.pkgs.python-lsp-server}/bin/pylsp"
-          offset_encoding = "utf-8"
-          [language.python.settings]
-          # See https://github.com/palantir/python-language-server#configuration
-          # and https://github.com/palantir/python-language-server/blob/develop/vscode-client/package.json
-          # "pyls.configurationSources" = ["flake8"]
-        ''
-      ) ++ (
-        lib.optional (pkgs.devEnvironment.enableRust) ''
-          [language.rust]
-          filetypes = ["rust"]
-          roots = ["Cargo.toml"]
-          command = "${rust-analyzer}/bin/rust-analyzer"
-          settings_section = "rust-analyzer"
-          [language.rust.settings.rust-analyzer]
-          hoverActions.enable = false # kak-lsp doesn't support this at the moment
-          # cargo.features = []
-          # See https://rust-analyzer.github.io/manual.html#configuration
-          # If you get 'unresolved proc macro' warnings, you have two options
-          # 1. The safe choice is two disable the warning:
-          diagnostics.disabled = ["unresolved-proc-macro"]
-          # 2. Or you can opt-in for proc macro support
-          procMacro.enable = true
-          cargo.loadOutDirsFromCheck = true
-          # See https://github.com/rust-analyzer/rust-analyzer/issues/6448
-        ''
-      ) ++ (
-        lib.optional (pkgs.devEnvironment.enableShell) ''
-          [language.bash]
-          filetypes = ["sh"]
-          roots = [".git", ".hg"]
-          command = "${nodePackages.bash-language-server}/bin/bash-language-server"
-          args = ["start"]
-        ''
-      )
-    );
-}
diff --git a/modules/latex.nix b/modules/latex.nix
deleted file mode 100644
index 8ef3b29..0000000
--- a/modules/latex.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, lib, ...}:
-{
-  home.packages = lib.optionals pkgs.devEnvironment.enableLatex [
-    pkgs.texlive.combined.scheme-full
-  ];
-}
diff --git a/modules/office.nix b/modules/office.nix
deleted file mode 100644
index fd95577..0000000
--- a/modules/office.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{pkgs, lib,...}:
-with pkgs;
-{
-  home.packages = (lib.optionals pkgs.devEnvironment.enableOffice [
-      # libreoffice-fresh
-      onlyoffice-bin
-  ]) ++ (lib.optionals pkgs.devEnvironment.enableSpelling [
-      hunspellDicts.en_GB-large
-      hunspellDicts.en_US-large
-      hunspellDicts.it_IT
-  ]);
-}
diff --git a/modules/pro_audio.nix b/modules/pro_audio.nix
deleted file mode 100644
index 661cb74..0000000
--- a/modules/pro_audio.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ pkgs, ... }:
-let
-  variables = {
-    DSSI_PATH = "$HOME/.dssi:$HOME/.nix-profile/lib/dssi:/run/current-system/sw/lib/dssi";
-    LADSPA_PATH = "$HOME/.ladspa:$HOME/.nix-profile/lib/ladspa:/run/current-system/sw/lib/ladspa";
-    LV2_PATH = "$HOME/.lv2:$HOME/.nix-profile/lib/lv2:/run/current-system/sw/lib/lv2";
-    LXVST_PATH = "$HOME/.lxvst:$HOME/.nix-profile/lib/lxvst:/run/current-system/sw/lib/lxvst";
-    VST_PATH = "$HOME/.vst:$HOME/.nix-profile/lib/vst:/run/current-system/sw/lib/vst";
-    VST3_PATH = "$HOME/.vst3:$HOME/.nix-profile/lib/vst3:/run/current-system/sw/lib/vst3";
-  };
-in
-{
-  home.packages = with pkgs; [
-    carla
-    rnnoise
-    ardour
-    # zrythm
-
-    # Plugins
-    # artyFX
-    autotalent
-    boops
-    cardinal
-    geonkick
-    helm
-    (lsp-plugins.overrideAttrs (old: { version = "1.2.0"; }))
-    # noise-repellent
-    samplv1
-    # speech-denoiser
-    # stochas
-    sunvox
-    # surge
-    surge-XT
-    talentedhack
-    tunefish
-    vocproc
-    x42-plugins
-    zita-at1
-    zynaddsubfx
-    zyn-fusion
-  ];
-
-  home.sessionVariables = variables;
-}
diff --git a/modules/sxhkd.nix b/modules/sxhkd.nix
deleted file mode 100644
index 02247be..0000000
--- a/modules/sxhkd.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  services.sxhkd = let
-    alacritty = "${pkgs.alacritty}/bin/alacritty";
-    bspc = "${pkgs.bspwm}/bin/bspc";
-    dunstify = "${pkgs.dunst}/bin/dunstify";
-    playerctl = "${pkgs.playerctl}/bin/playerctl";
-    pulseaudio-ctl = "${pkgs.pulseaudio-ctl}/bin/pulseaudio-ctl";
-    rofi = "${pkgs.rofi}/bin/rofi";
-    terminator = "${pkgs.terminator}/bin/terminator";
-    nautilus = "${pkgs.gnome.nautilus}/bin/nautilus";
-    pcmanfm = "${pkgs.pcmanfm}/bin/pcmanfm";
-    update-backgroundCmd = "${pkgs.update-background}";
-    xbacklight = "${pkgs.xorg.xbacklight}/bin/xbacklight";
-  in
-    {
-      enable = true;
-      keybindings = {
-        "super + b" = update-backgroundCmd;
-        "super + alt + {h,j,k,l}" = "${bspc} node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}";
-        "super + alt + {q,r}" = "${bspc} {quit,wm -r}";
-        "super + alt + shift + {h,j,k,l}" = "${bspc} node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}";
-        "super + alt + m" = "${pkgs.lockscreen}";
-        "super + bracket{left,right}" = "${bspc} desktop -f {prev,next}.local";
-        "super + ctrl + {1-9}" = "${bspc} node -o 0.{1-9}";
-        "super + ctrl + {h,j,k,l}" = "${bspc} node -p {west,south,north,east}";
-        "super + ctrl + {m,x,y,z}" = "${bspc} node -g {marked,locked,sticky,private}";
-        "super + ctrl + shift + space" = "${bspc} query -N -d | xargs -I id -n 1 ${bspc} node id -p cancel";
-        "super + ctrl + space" = "${bspc} node -p cancel";
-        "super + {_,shift +} e" = "{${nautilus} -w, ${pcmanfm} -n}";
-        "super + Escape" = "pkill -USR1 -x sxhkd";
-        "super + g" = "${bspc} node -s biggest";
-        "super + {grave,Tab}" = "${bspc} {node,desktop} -f last";
-        "super + {Left,Down,Up,Right}" = "${bspc} node -v {-20 0,0 20,0 -20,20 0}";
-        "super + m" = "${bspc} desktop -l next";
-        "super + {o,i}" = "${bspc} wm -h off;${bspc} node {older,newer} -f;${bspc} wm -h on";
-        "super + {p,b,comma,period}" = "${bspc} node -f @{parent,brother,first,second}";
-        "super + {_,shift + } Return" = "{${alacritty} , ${terminator}}";
-        "super + {_,shift + }{1-9,0}" = "${bspc} {desktop -f,node -d} 'focused:^{1-9,10}'";
-        "super + {_,shift + }c" = "${bspc} node -f {next,prev}.local";
-        "super + {h,j,k,l}" = "${bspc} node -f {west,south,north,east}";
-        "super + shift + {h,j,k,l}" = ''dir={west,south,north,east}; bspc node -s "$dir.local" --follow || bspc node -m "$dir" --follow'';
-        "super + {_,shift + }w" = "${bspc} node -{c,k}";
-        "super + @space" = "rofi -show drun";
-        "super + {t,shift + t,s,f}" = "${bspc} node -t {tiled,pseudo_tiled,floating,fullscreen}";
-        "super + y" = "${bspc} node newest.marked.local -n newest.!automatic.local";
-        "{XF86AudioLowerVolume,XF86AudioMute,XF86AudioRaiseVolume}" = "${pulseaudio-ctl} {down,mute,up}";
-        "XF86Audio{Next,Play,Prev}" = "${playerctl} {next,play-pause,previous}";
-        "XF86MonBrightness{Up,Down}" = "${xbacklight} {+,-}10%";
-      };
-    };
-}
diff --git a/modules/webapp.nix b/modules/webapp.nix
deleted file mode 100644
index 96b9796..0000000
--- a/modules/webapp.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ pkgs, lib, ... }:
-# Categories: https://specifications.freedesktop.org/menu-spec/latest/apa.html#main-category-registry
-let
-  cmd = link: "${pkgs.google-chrome}/bin/google-chrome-stable --app=${link}";
-  links = [
-    { desktopName = "Protonmail"; link = "https://mail.protonmail.com"; categories = [ "Office" ]; icon = builtins.fetchurl "https://mail.protonmail.com/assets/coast-228x228.png"; }
-    { desktopName = "YouTube"; link = "https://www.youtube.com"; categories = [ "AudioVideo" ]; }
-    { desktopName = "Twitch"; link = "https://www.twitch.tv"; icon = builtins.fetchurl "https://static.twitchcdn.net/assets/favicon-32-e29e246c157142c94346.png"; categories = [ "AudioVideo" ]; }
-    { desktopName = "Netflix"; link = "https://www.netflix.com"; categories = [ "AudioVideo" ]; icon = builtins.fetchurl "https://assets.nflxext.com/us/ffe/siteui/common/icons/nficon2016.png"; }
-    { desktopName = "Prime Video"; link = "https://primevideo.com"; categories = [ "AudioVideo" ]; icon = builtins.fetchurl "https://m.media-amazon.com/images/G/01/digital/video/DVUI/favicons/apple-touch-icon-152x152._CB527404565_.png"; }
-    { desktopName = "Google Keep"; link = "https://keep.google.com"; categories = [ "Office" ]; icon = builtins.fetchurl "https://ssl.gstatic.com/keep/keep_2020q4v2.ico"; }
-    { desktopName = "Google Calendar"; link = "https://google.com/calendar"; categories = [ "Calendar" "Office" ]; icon = builtins.fetchurl "https://calendar.google.com/googlecalendar/images/favicons_2020q4/calendar_31_256.ico"; }
-    { desktopName = "Notion"; link = "https://notion.so"; categories = [ "Office" ]; icon = builtins.fetchurl "https://www.notion.so/images/logo-ios.png"; }
-    { desktopName = "WhatsApp"; link = "https://web.whatsapp.com/"; }
-    { desktopName = "Monkeytype"; link = "https://monkeytype.com/"; icon = builtins.fetchurl "https://monkeytype.com/images/favicon/apple-touch-icon.png"; }
-  ];
-  webAppBuilder =
-    { desktopName
-    , name ? builtins.replaceStrings [ " " ] [ "_" ] desktopName
-    , link
-    , icon ? lib.toLower name
-    , comment ? null
-    , categories ? [ "Network" ]
-    }: pkgs.makeDesktopItem {
-      inherit name icon desktopName comment categories;
-      exec = cmd link;
-    };
-in
-{
-  home.packages = map webAppBuilder links;
-}
diff --git a/nixos/laptop.nix b/nixos/laptop.nix
deleted file mode 100644
index 98b5971..0000000
--- a/nixos/laptop.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ config, lib, ... }:
-{
-  # SSD swappines
-  boot.kernel.sysctl = {
-    "vm.swappiness" = lib.mkDefault 1;
-  };
-
-  # Atheros WiFi module
-  boot.blacklistedKernelModules = lib.optionals (!config.hardware.enableRedistributableFirmware) [
-    "ath3k"
-  ];
-
-  # ACPI support
-  boot = {
-    kernelModules = [ "acpi_call" ];
-    extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
-  };
-
-  # Touchpad support
-  services.xserver.libinput.enable = lib.mkDefault true;
-
-  # SSD trim service
-  services.fstrim.enable = lib.mkDefault true;
-
-  # Hard disk protection if the laptop falls:
-  services.hdapsd.enable = lib.mkDefault true;
-}
diff --git a/nixos/big_data.nix b/nixos_modules/big_data.nix
similarity index 82%
rename from nixos/big_data.nix
rename to nixos_modules/big_data.nix
index a734dbc..5e38d21 100644
--- a/nixos/big_data.nix
+++ b/nixos_modules/big_data.nix
@@ -1,27 +1,27 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 let
-  setup_scirpt = ''
-    sudo mkdir -p /hdfs
-    sudo chown -R hdfs:hadoop /hdfs
+  # setup_script = ''
+  #   sudo mkdir -p /hdfs
+  #   sudo chown -R hdfs:hadoop /hdfs
 
-    for p in {nn,dn,jn,rm,nm,jhs,HTTP}; do
-    	sudo kadmin.local -q "ank -randkey $p/my.engine";
-    	sudo kadmin.local -q "xst -k /etc/hadoop.keytab $p/my.engine";
-    	sudo kadmin.local -q "ktrem -k /etc/hadoop.keytab $p/my.engine old"
-    done
-    sudo chown hdfs:hadoop /etc/hadoop.keytab
+  #   for p in {nn,dn,jn,rm,nm,jhs,HTTP}; do
+  #     sudo kadmin.local -q "ank -randkey $p/my.engine";
+  #     sudo kadmin.local -q "xst -k /etc/hadoop.keytab $p/my.engine";
+  #     sudo kadmin.local -q "ktrem -k /etc/hadoop.keytab $p/my.engine old"
+  #   done
+  #   sudo chown hdfs:hadoop /etc/hadoop.keytab
 
 
-    sudo kadmin.local -q "ank -randkey spark/my.engine";
-    sudo kadmin.local -q "xst -k /etc/spark.keytab spark/my.engine";
-    sudo kadmin.local -q "ktrem -k /etc/spark.keytab spark/my.engine old"
-    sudo chown spark:spark /etc/spark.keytab
-  '';
+  #   sudo kadmin.local -q "ank -randkey spark/my.engine";
+  #   sudo kadmin.local -q "xst -k /etc/spark.keytab spark/my.engine";
+  #   sudo kadmin.local -q "ktrem -k /etc/spark.keytab spark/my.engine old"
+  #   sudo chown spark:spark /etc/spark.keytab
+  # '';
   hadoop_keytab_path = "/etc/hadoop.keytab";
   spark_keytab_path = "/etc/spark.keytab";
   pysparkPackageSelector = p: with p; [ numpy pyspark ];
   pysparkEnv = pkgs.python3.withPackages pysparkPackageSelector;
-  hadoopConf = import <nixos/nixos/modules/services/cluster/hadoop/conf.nix> {
+  hadoopConf = import (modulesPath + "/services/cluster/hadoop/conf.nix") {
     inherit pkgs lib;
     cfg = config.services.hadoop;
   };
@@ -63,17 +63,17 @@ let
       STOP
 
       cat > $out/spark-defaults.conf <<- STOP
-      spark.eventLog.enabled									true
-      spark.eventLog.dir											hdfs://localhost:/logs/spark
-      spark.history.fs.logDirectory						hdfs://localhost:/logs/spark
-      # spark.yarn.keytab											${spark_keytab_path}
-      # spark.yarn.principal									spark/my.engine@MY.ENGINE
-      spark.history.ui.acls.enable						true
-      spark.history.kerberos.enabled					true
-      spark.history.kerberos.keytab						${spark_keytab_path}
-      spark.history.kerberos.principal				spark/my.engine@MY.ENGINE
-      spark.yarn.appMasterEnv.PYSPARK_PYTHON	${pysparkEnv.outPath}/bin/${pysparkEnv.executable}
-      spark.yarn.appMasterEnv.PYTHONPATH			${pysparkEnv.outPath}/lib/${pysparkEnv.executable}/site-packages
+      spark.eventLog.enabled  true
+      spark.eventLog.dir  hdfs://localhost:/logs/spark
+      spark.history.fs.logDirectory  hdfs://localhost:/logs/spark
+      # spark.yarn.keytab  ${spark_keytab_path}
+      # spark.yarn.principal  spark/my.engine@MY.ENGINE
+      spark.history.ui.acls.enable  true
+      spark.history.kerberos.enabled  true
+      spark.history.kerberos.keytab  ${spark_keytab_path}
+      spark.history.kerberos.principal  spark/my.engine@MY.ENGINE
+      spark.yarn.appMasterEnv.PYSPARK_PYTHON  ${pysparkEnv.outPath}/bin/${pysparkEnv.executable}
+      spark.yarn.appMasterEnv.PYTHONPATH  ${pysparkEnv.outPath}/lib/${pysparkEnv.executable}/site-packages
       spark.executorEnv.PYSPARK_PYTHON        ${pysparkEnv.outPath}/bin/${pysparkEnv.executable}
       STOP
     '';
@@ -132,6 +132,7 @@ in
 
         # HDFS SECURITY
         "dfs.block.access.token.enable" = "true";
+        "dfs.cluster.administrators" = "hdfs,HTTP,bertof";
 
         # NAME NODE SECURITY
         "dfs.namenode.keytab.file" = hadoop_keytab_path;
@@ -194,6 +195,14 @@ in
         # "yarn.scheduler.capacity.root.default.state" = "RUNNING";
         "yarn.scheduler.capacity.root.acl_submit_applications" = "hadoop,yarn,mapred,hdfs";
       };
+      httpfsSite = {
+        "kerberos.realm" = "MY.ENGINE";
+        "httpfs.authentication.type" = "kerberos";
+        "httpfs.authentication.kerberos.principal  " = "HTTP/my.engine@MY.ENGINE";
+        "httpfs.authentication.kerberos.keytab" = hadoop_keytab_path;
+        "httpfs.hadoop.kerberos.principal  " = "HTTP/my.engine@MY.ENGINE";
+        "httpfs.hadoop.kerberos.keytab" = hadoop_keytab_path;
+      };
       extraConfDirs = [ ];
 
       hdfs = {
@@ -205,7 +214,7 @@ in
       };
       yarn = {
         resourcemanager = { enable = true; restartIfChanged = true; };
-        nodemanager = { enable = true; restartIfChanged = true; };
+        nodemanager = { enable = true; restartIfChanged = true; useCGroups = false; };
       };
     };
 
diff --git a/nixos/defcon.nix b/nixos_modules/defcon.nix
similarity index 100%
rename from nixos/defcon.nix
rename to nixos_modules/defcon.nix
diff --git a/nixos/k3s.nix b/nixos_modules/k3s.nix
similarity index 100%
rename from nixos/k3s.nix
rename to nixos_modules/k3s.nix
diff --git a/nixos/mind.nix b/nixos_modules/mind.nix
similarity index 83%
rename from nixos/mind.nix
rename to nixos_modules/mind.nix
index dda7a42..c167458 100644
--- a/nixos/mind.nix
+++ b/nixos_modules/mind.nix
@@ -8,7 +8,7 @@
       {
         name = "bertof";
         ensurePermissions = {
-           "DATABASE \"mfh\"" = "ALL PRIVILEGES";
+          "DATABASE \"mfh\"" = "ALL PRIVILEGES";
         };
       }
     ];
diff --git a/nixos/pentablet.nix b/nixos_modules/pentablet.nix
similarity index 86%
rename from nixos/pentablet.nix
rename to nixos_modules/pentablet.nix
index 98e2995..a39911a 100644
--- a/nixos/pentablet.nix
+++ b/nixos_modules/pentablet.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, ...}:
+{ pkgs, ... }:
 {
   # udev rules
   services.udev.extraRules = ''
diff --git a/nixos/pro_audio.nix b/nixos_modules/pro_audio.nix
similarity index 98%
rename from nixos/pro_audio.nix
rename to nixos_modules/pro_audio.nix
index fd2f706..d0e0259 100644
--- a/nixos/pro_audio.nix
+++ b/nixos_modules/pro_audio.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }: {
+{
   boot = {
     # kernelModules = [ "snd-seq" "snd-rawmidi" ];
     # kernel.sysctl = { "vm.swappiness" = 10; "fs.inotify.max_user_watches" = 524288; };
diff --git a/nixos_modules/sesar.nix b/nixos_modules/sesar.nix
new file mode 100644
index 0000000..39d19b5
--- /dev/null
+++ b/nixos_modules/sesar.nix
@@ -0,0 +1,11 @@
+{
+  networking = {
+    hosts = {
+      "datanode1" = [ "172.20.28.210" ];
+      "datanode2" = [ "172.20.28.210" ];
+      "datanode3" = [ "172.20.28.210" ];
+      "*.engine.sesar.int" = [ "172.20.28.210" ];
+      "vcenter.sesar.int" = [ "159.149.147.137" ];
+    };
+  };
+}
diff --git a/odin.nix b/odin.nix
deleted file mode 100644
index 528bf04..0000000
--- a/odin.nix
+++ /dev/null
@@ -1,208 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  nixpkgs.overlays = [
-    (final: prev: {
-      devEnvironment = (import ./environment.nix) {
-        enableCpp = true;
-        enableData = true;
-        enableGo = true;
-        enableHtml = true;
-        enableJavascript = true;
-        enableJava = true;
-        enableLatex = true;
-        enableNix = true;
-        enableOffice = true;
-        enablePython = true;
-        enableRust = true;
-        enableShell = true;
-        enableSpelling = true;
-      };
-
-      cocktail-bar-cli = final.callPackage ./custom/cocktail-bar-cli { };
-      update-background = final.callPackage ./custom/update-background { backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+"; };
-      lockscreen = final.callPackage ./custom/lockscreen {
-        palette = final.rice.colorPalette;
-        font = final.rice.font.normal;
-      };
-    })
-  ];
-
-  home = {
-    language.base = "it_IT.UTF-8";
-    keyboard = {
-      layout = "it";
-      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
-    };
-    packages = with pkgs; [
-      pulseaudio
-      easyeffects
-
-      kubectl
-      docker-compose
-      docker-machine
-
-      arandr
-      ark
-      authy
-      bitwarden
-      btop
-      catgirl # IRC
-      cava
-      discord
-      element-desktop
-      evolution
-      file
-      # firefox
-      # gallery-dl
-      gnome.dconf-editor
-      gnome.eog
-      gnome.evince
-      gnomeExtensions.appindicator
-      gnomeExtensions.caffeine
-      gnomeExtensions.dash-to-dock
-      # gnomeExtensions.dynamic-panel-transparency
-      gnomeExtensions.just-perfection
-      gnomeExtensions.gtile
-      gnomeExtensions.vitals
-      gnome.file-roller
-      gnome.gnome-screenshot
-      gnome.gnome-sound-recorder
-      gnome.gnome-sudoku
-      gnome.gnome-system-monitor
-      gnome.gnome-tweaks
-      gnome.nautilus
-      gnome.quadrapassel
-      gnome.seahorse
-      gnome.sushi
-      tracker
-      google-chrome
-      gucharmap
-      htop
-      httpie
-      # hyperspace-cli
-      inkscape
-      jetbrains.datagrip
-      # keepassxc
-      krita
-      # lutris
-      meld
-      mmv-go
-      mpv
-      neofetch
-      nix-prefetch-scripts
-      nix-tree
-      nixos-option
-      obsidian
-      openvpn
-      pavucontrol
-      pcmanfm
-      pentablet-driver
-      procps
-      p7zip
-      ripgrep
-      skypeforlinux
-      spotify
-      tdesktop
-      teams
-      transmission-gtk
-      unrar
-      unzip
-      virt-manager
-      wget
-      # wineFull
-      wireguard-tools
-      xclip
-      xournalpp
-      yq
-      zip
-      zoom-us
-      zotero
-
-    ];
-  };
-
-  imports = [
-    ./modules/configurations.nix
-    ./modules/fonts.nix
-
-    ./modules/alacritty.nix
-    ./modules/bash.nix
-    ./modules/bat.nix
-    ./modules/bottom.nix
-    ./modules/broot.nix
-    # ./modules/bspwm.nix
-    ./modules/dircolors.nix
-    ./modules/direnv.nix
-    # ./modules/dunst.nix
-    # ./modules/fzf.nix
-    ./modules/git.nix
-    ./modules/go.nix
-    ./modules/gpg.nix
-    ./modules/grobi.nix
-    ./modules/info.nix
-    ./modules/java.nix
-    # ./modules/joystickwake.nix
-    ./modules/jq.nix
-    ./modules/kakoune.nix
-    # ./modules/keepassxc.nix
-    ./modules/keychain.nix
-    ./modules/kitty.nix
-    ./modules/latex.nix
-    ./modules/lf.nix
-    ./modules/libinput-gestures.nix
-    # ./modules/lorri.nix
-    ./modules/man.nix
-    # ./modules/mangohud.nix
-    # ./modules/megasync.nix
-    # ./modules/nix-index.nix
-    # ./modules/noti.nix
-    ./modules/obs-studio.nix
-    ./modules/office.nix
-    ./modules/onedrive.nix
-    # ./modules/picom.nix
-    # ./modules/polybar.nix
-    ./modules/pycharm.nix
-    ./modules/gtk_theme.nix
-    ./modules/rofi.nix
-    ./modules/rofimoji.nix
-    # ./modules/screen_locker.nix
-    ./modules/ssh.nix
-    ./modules/starship.nix
-    # ./modules/sxhkd.nix
-    ./modules/syncthing.nix
-    ./modules/terminator.nix
-    ./modules/tmux.nix
-    ./modules/update_background.nix
-    ./modules/webapp.nix
-    # ./modules/xidlehook.nix
-    ./modules/zoxide.nix
-    ./modules/zsh.nix
-
-    ./modules/pro_audio.nix
-    # ./modules/security.nix
-
-    ./modules/shell_aliases.nix
-  ];
-
-
-  services = {
-    # blueman-applet.enable = true;
-    # caffeine.enable = true;
-    # cbatticon.enable = true;
-    gnome-keyring.enable = true;
-    # network-manager-applet.enable = true;
-    # playerctld.enable = true;
-    # poweralertd.enable = true;
-  };
-
-  # xsession = {
-  #   enable = true;
-  #   numlock.enable = true;
-  #   initExtra = ''
-  #     ## Touchpad
-  #     ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Natural Scrolling Enabled' 1
-  #     ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Tapping Enabled' 1
-  #   '';
-  # };
-
-}
diff --git a/nixos/base.nix b/odin/common_configuration.nix
similarity index 81%
rename from nixos/base.nix
rename to odin/common_configuration.nix
index 0b5ded8..57bf3d1 100644
--- a/nixos/base.nix
+++ b/odin/common_configuration.nix
@@ -1,29 +1,20 @@
 { config, pkgs, lib, ... }:
+with lib;
 {
-  imports = [
-    <nixos-hardware/common/cpu/intel>
-    <nixos-hardware/common/pc/laptop>
-    <nixos-hardware/common/pc/laptop/ssd>
-    /etc/nixos/hardware-configuration.nix
-    # ./laptop.nix
-    # ./pentablet.nix
-    ./pro_audio.nix
-    # ./defcon.nix
-    # ./mind.nix
-    # ./k3s.nix
-    ./big_data.nix
-  ];
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.initrd.checkJournalingFS = true;
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_16;
+  # boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_18;
+  # boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_17;
   boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
 
   # # Cross-build arm
   boot.binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ];
 
+  hardware.enableRedistributableFirmware = true;
+
   # Use same ACPI identifier as Dell Ubuntu
   boot.kernelParams = [
     "acpi_osi=Linux-Dell-Video"
@@ -48,10 +39,6 @@
     # firewall.allowedUDPPorts = [ ... ];
     # Or disable the firewall altogether.
     # firewall.enable = false;
-    hosts = {
-      "*.engine.sesar.int" = [ "172.20.28.210" ];
-      "vcenter.sesar.int" = [ "159.149.147.137" ];
-    };
   };
 
   # Set your time zone.
@@ -74,22 +61,29 @@
     #   wayland = true;
     #   nvidiaWayland = true;
     # };
-    desktopManager.gnome.enable = true;
-    # windowManager.bspwm.enable = true;
+    # desktopManager.gnome.enable = true;
+    # desktopManager.plasma5 = {
+    #   enable = true;
+    #   runUsingSystemd = true;
+    # };
+    windowManager.bspwm.enable = true;
 
     # Configure keymap in X11
     layout = "it";
     extraLayouts = {
       eng = { languages = [ "eng" ]; description = "English layout for external keyboard"; };
     };
-    xkbOptions = "eurosign:e;";
+    xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl";
     libinput.enable = true;
   };
 
   # Enable CUPS to print documents.
   services.printing = {
     enable = true;
-    drivers = with pkgs; [ gutenprint cups-kyocera ];
+    drivers = with pkgs; [
+      gutenprint
+      # cups-kyocera
+    ];
   };
 
   services.fwupd.enable = true;
@@ -127,7 +121,7 @@
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
-  environment.systemPackages = with pkgs; [ tmux firefox kakoune vim ];
+  environment.systemPackages = with pkgs; [ tmux firefox kakoune vim git ];
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
@@ -158,22 +152,22 @@
         common = { extraConfig = bertofExtraConfig; };
       in
       {
-        bertof_home = common // { subvolume = "/home/bertof"; };
-        bertof_music = common // { subvolume = "/home/bertof/Musica"; };
-        bertof_downloads = common // { subvolume = "/home/bertof/Scaricati"; };
-        bertof_images = common // { subvolume = "/home/bertof/Immagini"; };
-        bertof_videos = common // { subvolume = "/home/bertof/Video"; };
-        bertof_documents = common // { subvolume = "/home/bertof/Documenti"; };
-        bertof_games_ssd = common // { subvolume = "/home/bertof/Giochi/SSD"; };
-        # bertof_games_hdd = common // { subvolume = "/home/bertof/Giochi/HDD"; };
-        bertof_git = common // { subvolume = "/home/bertof/Documenti/Git"; };
+        bertof_home = recursiveUpdate common { subvolume = "/home/bertof"; };
+        bertof_music = recursiveUpdate common { subvolume = "/home/bertof/Musica"; };
+        bertof_downloads = recursiveUpdate common { subvolume = "/home/bertof/Scaricati"; };
+        bertof_images = recursiveUpdate common { subvolume = "/home/bertof/Immagini"; };
+        bertof_videos = recursiveUpdate common { subvolume = "/home/bertof/Video"; };
+        bertof_documents = recursiveUpdate common { subvolume = "/home/bertof/Documenti"; };
+        bertof_games_ssd = recursiveUpdate common { subvolume = "/home/bertof/Giochi/SSD"; };
+        # bertof_games_hdd = recursiveUpdate common { subvolume = "/home/bertof/Giochi/HDD"; };
+        bertof_git = recursiveUpdate common { subvolume = "/home/bertof/Documenti/Git"; };
       };
   };
 
   services.dbus.packages = with pkgs; [ dconf ];
   services.gnome.gnome-keyring.enable = true;
   hardware.bluetooth.enable = true;
-  # services.blueman.enable = true;
+  services.blueman.enable = true;
   services.zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; };
   services.gvfs = { enable = true; package = lib.mkForce pkgs.gnome3.gvfs; };
   # services.tlp.enable = false;
@@ -218,7 +212,7 @@
     kvmgt.enable = true;
     libvirtd.enable = true;
     podman.enable = true;
-    virtualbox.host.enable = true;
+    # virtualbox.host.enable = true;
   };
 
   # Allow completion for system packages
@@ -228,6 +222,7 @@
     Defaults pwfeedback
   '';
   security.pam.services.sddm.enableGnomeKeyring = true;
+  security.pam.services.autoUnlockKwallet.enableKwallet = true;
 
   nixpkgs.config = {
     allowUnfree = true;
diff --git a/nixos/odin-intel.nix b/odin/configuration-intel.nix
similarity index 82%
rename from nixos/odin-intel.nix
rename to odin/configuration-intel.nix
index 893c506..0f11acf 100644
--- a/nixos/odin-intel.nix
+++ b/odin/configuration-intel.nix
@@ -5,14 +5,8 @@
 { config, pkgs, ... }:
 
 {
-  imports = [
-    ./base.nix
-  ];
-
   boot.initrd.kernelModules = [ "i915" ];
 
-  hardware.cpu.intel.updateMicrocode = config.hardware.enableRedistributableFirmware;
-
   hardware.opengl.enable = true;
   hardware.opengl.extraPackages = with pkgs; [
     intel-media-driver
@@ -22,9 +16,14 @@
   ];
 
   services.xserver = {
-    displayManager.gdm = {
+    # displayManager.gdm = {
+    #   enable = true;
+    #   wayland = true;
+    # };
+    displayManager.sddm = {
       enable = true;
-      wayland = true;
+      autoNumlock = true;
+      # enableHidpi = true;
     };
   };
 
diff --git a/nixos/odin-nvidia.nix b/odin/configuration-nvidia.nix
similarity index 74%
rename from nixos/odin-nvidia.nix
rename to odin/configuration-nvidia.nix
index c21ef24..6e34b1f 100644
--- a/nixos/odin-nvidia.nix
+++ b/odin/configuration-nvidia.nix
@@ -2,26 +2,22 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
-  imports =
-    [
-      <nixos-hardware/common/cpu/amd>
-      <nixos-hardware/common/pc/laptop/ssd>
-      ./base.nix
-    ];
-
   boot.initrd.kernelModules = [ "i915" ];
 
-  hardware.cpu.intel.updateMicrocode = config.hardware.enableRedistributableFirmware;
-
   services.xserver = {
     videoDrivers = [ "nvidia" ];
     displayManager.sddm = {
       enable = true;
       autoNumlock = true;
+      # enableHidpi = true;
     };
+    # displayManager.gdm = {
+    #   enable = true;
+    #   wayland = false;
+    # };
   };
 
   hardware.nvidia.prime = {
diff --git a/odin/hardware-configuration.nix b/odin/hardware-configuration.nix
new file mode 100644
index 0000000..9dac5dd
--- /dev/null
+++ b/odin/hardware-configuration.nix
@@ -0,0 +1,98 @@
+# 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, modulesPath, ... }:
+
+{
+  imports =
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    {
+      device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c";
+      fsType = "btrfs";
+      options = [ "subvol=@root" "x-gvfs-hide" ];
+    };
+
+  fileSystems."/nix" =
+    {
+      device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c";
+      fsType = "btrfs";
+      options = [ "subvol=@nix" "x-gvfs-hide" ];
+    };
+
+  fileSystems."/home/bertof" =
+    {
+      device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c";
+      fsType = "btrfs";
+      options = [ "subvol=@bertof" "x-gvfs-hide" ];
+    };
+
+  fileSystems."/home/bertof/Giochi/SSD" =
+    {
+      device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c";
+      fsType = "btrfs";
+      options = [ "subvol=@bertof_games" "x-gvfs-hide" ];
+    };
+
+  fileSystems."/boot" =
+    {
+      device = "/dev/disk/by-uuid/82DB-3444";
+      fsType = "vfat";
+    };
+
+  fileSystems."/home/bertof/Musica" =
+    {
+      device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c";
+      fsType = "btrfs";
+      options = [ "subvol=@bertof_music" "x-gvfs-hide" ];
+    };
+
+  fileSystems."/home/bertof/Video" =
+    {
+      device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c";
+      fsType = "btrfs";
+      options = [ "subvol=@bertof_videos" "x-gvfs-hide" ];
+    };
+
+  fileSystems."/home/bertof/Immagini" =
+    {
+      device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c";
+      fsType = "btrfs";
+      options = [ "subvol=@bertof_images" "x-gvfs-hide" ];
+    };
+
+  fileSystems."/home/bertof/Scaricati" =
+    {
+      device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c";
+      fsType = "btrfs";
+      options = [ "subvol=@bertof_downloads" "x-gvfs-hide" ];
+    };
+
+  fileSystems."/home/bertof/Documenti" =
+    {
+      device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c";
+      fsType = "btrfs";
+      options = [ "subvol=@bertof_documents" "x-gvfs-hide" ];
+    };
+
+  fileSystems."/home/bertof/Documenti/Git" =
+    {
+      device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c";
+      fsType = "btrfs";
+      options = [ "subvol=@bertof_git" "x-gvfs-hide" ];
+    };
+
+  swapDevices =
+    [{ device = "/dev/disk/by-uuid/5f3cf424-2bd8-4352-a778-1bb067cb5700"; }];
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/overlays.nix b/overlays.nix
deleted file mode 100644
index d09297c..0000000
--- a/overlays.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-  (import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"))
-]
diff --git a/rice.nix b/rice.nix
index a284b57..6b24cca 100644
--- a/rice.nix
+++ b/rice.nix
@@ -1,39 +1,28 @@
 final: prev:
 let
-  nix-rice = final.callPackage (
-    fetchTarball {
-      url = "https://github.com/bertof/nix-rice/archive/refs/tags/v0.2.1.tar.gz";
-      sha256 = "1is70gjf59sxccwhz1hl9hdxsd4z8vqsr2rdk3imnmxj9n3jf6j8";
-    }
-  ) {};
-  nord = with nix-rice; palette.tPalette color.hexToRgba (import ./themes/nord.nix);
-  # onedark = with nix-rice; palette.tPalette color.hexToRgba (import ./themes/onedark.nix);
+  # nord = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/nord.nix);
+  # onedark = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/onedark.nix);
+  # tomorrow-night = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/tomorrow-night.nix);
+  mkpm = with prev.lib.rice; palette.tPalette color.hexToRgba (import ./themes/monokai-pro-machine.nix);
 in
 (
   rec {
-    rice = nix-rice // {
-      colorPalette = with nix-rice; rec {
-        normal = {
-          black = nord.n1;
-          blue = nord.n10;
-          cyan = nord.n8;
-          green = nord.n14;
-          magenta = nord.n15;
-          red = nord.n11;
-          white = nord.n5;
-          yellow = nord.n13;
+    rice = {
+      colorPalette = with prev.lib.rice; rec {
+        normal = palette.defaultPalette // {
+          black = mkpm.base2;
+          blue = mkpm.blue;
+          green = mkpm.green;
+          red = mkpm.red;
+          white = mkpm.base8;
+          yellow = mkpm.yellow;
         };
         bright = palette.brighten 10 normal // {
-          blue = nord.n9;
-          black = nord.n2;
-          red = nord.n12;
-          white = nord.n6;
+          red = mkpm.orange;
+          black = mkpm.base3;
         };
         dark = palette.darken 10 normal // {
-          black = nord.n0;
-          blue = nord.n3;
-          cyan = nord.n7;
-          white = nord.n4;
+          black = mkpm.base0;
         };
       };
       font = {
diff --git a/setup.sh b/setup.sh
deleted file mode 100755
index 13b07db..0000000
--- a/setup.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-sudo nix-channel --add https://nixos.org/channels/nixos-21.11 nixos
-sudo nix-channel --add https://github.com/NixOS/nixos-hardware/archive/master.tar.gz nixos-hardware
-
-nix-channel --add https://nixos.org/channels/nixos-21.11 nixos
-nix-channel --add https://github.com/nix-community/home-manager/archive/release-21.11.tar.gz home-manager
-nix-channel --add https://github.com/NixOS/nixpkgs/archive/master.tar.gz nixpkgs
diff --git a/themes/amethyst.kix.tmp b/themes/amethyst.kix.tmp
new file mode 100644
index 0000000..7d63fb6
--- /dev/null
+++ b/themes/amethyst.kix.tmp
@@ -0,0 +1,147 @@
+[ColorEffects:Disabled] 
+ Color=23,23,23 
+ ColorAmount=0 
+ ColorEffect=0 
+ ContrastAmount=0.65 
+ ContrastEffect=1 
+ IntensityAmount=0.1 
+ IntensityEffect=2 
+  
+ [ColorEffects:Inactive] 
+ ChangeSelectionColor=true 
+ Color=112,111,110 
+ ColorAmount=0.025 
+ ColorEffect=2 
+ ContrastAmount=0.1 
+ ContrastEffect=2 
+ Enable=false 
+ IntensityAmount=0 
+ IntensityEffect=0 
+  
+ [Colors:Button] 
+ BackgroundAlternate=64,69,82 
+ BackgroundNormal=22,22,46 
+ DecorationFocus=39,119,255 
+ DecorationHover=39,119,255 
+ ForegroundActive=61,174,233 
+ ForegroundInactive=102,106,115 
+ ForegroundLink=41,128,185 
+ ForegroundNegative=39,109,251 
+ ForegroundNeutral=255,106,0 
+ ForegroundNormal=195,199,209 
+ ForegroundPositive=113,247,159 
+ ForegroundVisited=2,224,132 
+  
+ [Colors:Complementary] 
+ BackgroundAlternate=24,24,41 
+ BackgroundNormal=39,39,69 
+ DecorationFocus=39,119,255 
+ DecorationHover=39,119,255 
+ ForegroundActive=0,193,228 
+ ForegroundInactive=102,106,115 
+ ForegroundLink=2,224,132 
+ ForegroundNegative=39,109,251 
+ ForegroundNeutral=255,106,0 
+ ForegroundNormal=211,218,227 
+ ForegroundPositive=113,247,159 
+ ForegroundVisited=124,183,255 
+  
+ [Colors:Header] 
+ BackgroundAlternate=24,24,41 
+ BackgroundNormal=38,38,67,204 
+ DecorationFocus=39,119,255 
+ DecorationHover=39,119,255 
+ ForegroundActive=0,193,228 
+ ForegroundInactive=102,106,115 
+ ForegroundLink=2,224,132 
+ ForegroundNegative=39,109,251 
+ ForegroundNeutral=255,106,0 
+ ForegroundNormal=211,218,227 
+ ForegroundPositive=113,247,159 
+ ForegroundVisited=124,183,255 
+  
+ [Colors:Header][Inactive] 
+ BackgroundAlternate=24,24,41 
+ BackgroundNormal=39,39,69,204 
+ DecorationFocus=39,119,255 
+ DecorationHover=39,119,255 
+ ForegroundActive=0,193,228 
+ ForegroundInactive=102,106,115 
+ ForegroundLink=2,224,132 
+ ForegroundNegative=39,109,251 
+ ForegroundNeutral=255,106,0 
+ ForegroundNormal=211,218,227 
+ ForegroundPositive=113,247,159 
+ ForegroundVisited=124,183,255 
+  
+ [Colors:Selection] 
+ BackgroundAlternate=34,130,109 
+ BackgroundNormal=39,119,255 
+ DecorationFocus=132,76,98 
+ DecorationHover=132,76,98 
+ ForegroundActive=252,252,252 
+ ForegroundInactive=211,218,227 
+ ForegroundLink=2,39,200 
+ ForegroundNegative=212,32,35 
+ ForegroundNeutral=255,247,0 
+ ForegroundNormal=8,27,25 
+ ForegroundPositive=23,69,0 
+ ForegroundVisited=126,9,199 
+  
+ [Colors:Tooltip] 
+ BackgroundAlternate=39,39,69 
+ BackgroundNormal=53,57,69 
+ DecorationFocus=39,119,255 
+ DecorationHover=39,119,255 
+ ForegroundActive=61,174,233 
+ ForegroundInactive=102,106,115 
+ ForegroundLink=41,128,185 
+ ForegroundNegative=39,109,251 
+ ForegroundNeutral=255,106,0 
+ ForegroundNormal=211,218,227 
+ ForegroundPositive=113,247,159 
+ ForegroundVisited=2,224,132 
+  
+ [Colors:View] 
+ BackgroundAlternate=24,24,41 
+ BackgroundNormal=39,39,69 
+ DecorationFocus=39,119,255 
+ DecorationHover=39,119,255 
+ ForegroundActive=0,193,228 
+ ForegroundInactive=102,106,115 
+ ForegroundLink=2,224,132 
+ ForegroundNegative=39,109,251 
+ ForegroundNeutral=255,106,0 
+ ForegroundNormal=211,218,227 
+ ForegroundPositive=113,247,159 
+ ForegroundVisited=124,183,255 
+  
+ [Colors:Window] 
+ BackgroundAlternate=39,39,69 
+ BackgroundNormal=38,38,67 
+ DecorationFocus=112,120,135 
+ DecorationHover=39,119,255 
+ ForegroundActive=61,174,233 
+ ForegroundInactive=102,106,115 
+ ForegroundLink=41,128,185 
+ ForegroundNegative=39,109,251 
+ ForegroundNeutral=255,106,0 
+ ForegroundNormal=211,218,227 
+ ForegroundPositive=113,247,159 
+ ForegroundVisited=179,13,191 
+  
+ [General] 
+ ColorScheme=Amethyst 
+ Name=Amethyst 
+ shadeSortColumn=true 
+  
+ [KDE] 
+ contrast=4 
+  
+ [WM] 
+ activeBackground=38,38,67,204 
+ activeBlend=39,39,69 
+ activeForeground=211,218,227 
+ inactiveBackground=39,39,69,204 
+ inactiveBlend=39,39,69 
+ inactiveForeground=102,106,115
diff --git a/themes/catppuccin-frappe.nix b/themes/catppuccin-frappe.nix
new file mode 100644
index 0000000..cdb7021
--- /dev/null
+++ b/themes/catppuccin-frappe.nix
@@ -0,0 +1,29 @@
+# Catppuccin Frappé theme (https://github.com/catppuccin/catppuccin)
+{
+  Rosewater = "#dc8a78"; # rgb(220, 138, 120) hsl(11, 59%, 67%)
+  Flamingo = "#dd7878"; # rgb(221, 120, 120) hsl(0, 60%, 67%)
+  Pink = "#ea76cb"; # rgb(234, 118, 203) hsl(316, 73%, 69%)
+  Mauve = "#8839ef"; # rgb(136, 57, 239) hsl(266, 85%, 58%)
+  Red = "#d20f39"; # rgb(210, 15, 57) hsl(347, 87%, 44%)
+  Maroon = "#e64553"; # rgb(230, 69, 83) hsl(355, 76%, 59%)
+  Peach = "#fe640b"; # rgb(254, 100, 11) hsl(22, 99%, 52%)
+  Yellow = "#df8e1d"; # rgb(223, 142, 29) hsl(35, 77%, 49%)
+  Green = "#40a02b"; # rgb(64, 160, 43) hsl(109, 58%, 40%)
+  Teal = "#179299"; # rgb(23, 146, 153) hsl(183, 74%, 35%)
+  Sky = "#04a5e5"; # rgb(4, 165, 229) hsl(197, 97%, 46%)
+  Sapphire = "#209fb5"; # rgb(32, 159, 181) hsl(189, 70%, 42%)
+  Blue = "#1e66f5"; # rgb(30, 102, 245) hsl(220, 91%, 54%)
+  Lavender = "#7287fd"; # rgb(114, 135, 253) hsl(231, 97%, 72%)
+  Text = "#4c4f69"; # rgb(76, 79, 105) hsl(234, 16%, 35%)
+  Subtext1 = "#5c5f77"; # rgb(92, 95, 119) hsl(233, 13%, 41%)
+  Subtext0 = "#6c6f85"; # rgb(108, 111, 133) hsl(233, 10%, 47%)
+  Overlay2 = "#7c7f93"; # rgb(124, 127, 147) hsl(232, 10%, 53%)
+  Overlay1 = "#8c8fa1"; # rgb(140, 143, 161) hsl(231, 10%, 59%)
+  Overlay0 = "#9ca0b0"; # rgb(156, 160, 176) hsl(228, 11%, 65%)
+  Surface2 = "#acb0be"; # rgb(172, 176, 190) hsl(227, 12%, 71%)
+  Surface1 = "#bcc0cc"; # rgb(188, 192, 204) hsl(225, 14%, 77%)
+  Surface0 = "#ccd0da"; # rgb(204, 208, 218) hsl(223, 16%, 83%)
+  Base = "#eff1f5"; # rgb(239, 241, 245) hsl(220, 23%, 95%)
+  Mantle = "#e6e9ef"; # rgb(230, 233, 239) hsl(220, 22%, 92%)
+  Crust = "#dce0e8"; # rgb(220, 224, 232) hsl(220, 21%, 89%)
+}
diff --git a/themes/catppuccin-latte.nix b/themes/catppuccin-latte.nix
new file mode 100644
index 0000000..75e4f1b
--- /dev/null
+++ b/themes/catppuccin-latte.nix
@@ -0,0 +1,29 @@
+# Catppuccin Latte theme (https://github.com/catppuccin/catppuccin)
+{
+  Rosewater = "#dc8a78"; # rgb(220, 138, 120) hsl(11, 59%, 67%)
+  Flamingo = "#dd7878"; # rgb(221, 120, 120) hsl(0, 60%, 67%)
+  Pink = "#ea76cb"; # rgb(234, 118, 203) hsl(316, 73%, 69%)
+  Mauve = "#8839ef"; # rgb(136, 57, 239)  hsl(266, 85%, 58%)
+  Red = "#d20f39"; # rgb(210, 15, 57)   hsl(347, 87%, 44%)
+  Maroon = "#e64553"; # rgb(230, 69, 83)   hsl(355, 76%, 59%)
+  Peach = "#fe640b"; # rgb(254, 100, 11)  hsl(22, 99%, 52%)
+  Yellow = "#df8e1d"; # rgb(223, 142, 29)  hsl(35, 77%, 49%)
+  Green = "#40a02b"; # rgb(64, 160, 43)   hsl(109, 58%, 40%)
+  Teal = "#179299"; # rgb(23, 146, 153)  hsl(183, 74%, 35%)
+  Sky = "#04a5e5"; # rgb(4, 165, 229)   hsl(197, 97%, 46%)
+  Sapphire = "#209fb5"; # rgb(32, 159, 181)  hsl(189, 70%, 42%)
+  Blue = "#1e66f5"; # rgb(30, 102, 245)  hsl(220, 91%, 54%)
+  Lavender = "#7287fd"; # rgb(114, 135, 253) hsl(231, 97%, 72%)
+  Text = "#4c4f69"; # rgb(76, 79, 105)   hsl(234, 16%, 35%)
+  Subtext1 = "#5c5f77"; # rgb(92, 95, 119)   hsl(233, 13%, 41%)
+  Subtext0 = "#6c6f85"; # rgb(108, 111, 133) hsl(233, 10%, 47%)
+  Overlay2 = "#7c7f93"; # rgb(124, 127, 147) hsl(232, 10%, 53%)
+  Overlay1 = "#8c8fa1"; # rgb(140, 143, 161) hsl(231, 10%, 59%)
+  Overlay0 = "#9ca0b0"; # rgb(156, 160, 176) hsl(228, 11%, 65%)
+  Surface2 = "#acb0be"; # rgb(172, 176, 190) hsl(227, 12%, 71%)
+  Surface1 = "#bcc0cc"; # rgb(188, 192, 204) hsl(225, 14%, 77%)
+  Surface0 = "#ccd0da"; # rgb(204, 208, 218) hsl(223, 16%, 83%)
+  Base = "#eff1f5"; # rgb(239, 241, 245) hsl(220, 23%, 95%)
+  Mantle = "#e6e9ef"; # rgb(230, 233, 239) hsl(220, 22%, 92%)
+  Crust = "#dce0e8"; # rgb(220, 224, 232) hsl(220, 21%, 89%)
+}
diff --git a/themes/catppuccin-macchiato.nix b/themes/catppuccin-macchiato.nix
new file mode 100644
index 0000000..5b31d48
--- /dev/null
+++ b/themes/catppuccin-macchiato.nix
@@ -0,0 +1,29 @@
+# Catppuccin Macchiato theme (https://github.com/catppuccin/catppuccin)
+{
+  Rosewater = "#f4dbd6"; # rgb(244, 219, 214) hsl(10, 58%, 90%)
+  Flamingo = "#f0c6c6"; # rgb(240, 198, 198) hsl(0, 58%, 86%)
+  Pink = "#f5bde6"; # rgb(245, 189, 230) hsl(316, 74%, 85%)
+  Mauve = "#c6a0f6"; # rgb(198, 160, 246) hsl(267, 83%, 80%)
+  Red = "#ed8796"; # rgb(237, 135, 150) hsl(351, 74%, 73%)
+  Maroon = "#ee99a0"; # rgb(238, 153, 160) hsl(355, 71%, 77%)
+  Peach = "#f5a97f"; # rgb(245, 169, 127) hsl(21, 86%, 73%)
+  Yellow = "#eed49f"; # rgb(238, 212, 159) hsl(40, 70%, 78%)
+  Green = "#a6da95"; # rgb(166, 218, 149) hsl(105, 48%, 72%)
+  Teal = "#8bd5ca"; # rgb(139, 213, 202) hsl(171, 47%, 69%)
+  Sky = "#91d7e3"; # rgb(145, 215, 227) hsl(189, 59%, 73%)
+  Sapphire = "#7dc4e4"; # rgb(125, 196, 228) hsl(199, 66%, 69%)
+  Blue = "#8aadf4"; # rgb(138, 173, 244) hsl(220, 83%, 75%)
+  Lavender = "#b7bdf8"; # rgb(183, 189, 248) hsl(234, 82%, 85%)
+  Text = "#cad3f5"; # rgb(202, 211, 245) hsl(227, 68%, 88%)
+  Subtext1 = "#b8c0e0"; # rgb(184, 192, 224) hsl(228, 39%, 80%)
+  Subtext0 = "#a5adcb"; # rgb(165, 173, 203) hsl(227, 27%, 72%)
+  Overlay2 = "#939ab7"; # rgb(147, 154, 183) hsl(228, 20%, 65%)
+  Overlay1 = "#8087a2"; # rgb(128, 135, 162) hsl(228, 15%, 57%)
+  Overlay0 = "#6e738d"; # rgb(110, 115, 141) hsl(230, 12%, 49%)
+  Surface2 = "#5b6078"; # rgb(91, 96, 120) hsl(230, 14%, 41%)
+  Surface1 = "#494d64"; # rgb(73, 77, 100) hsl(231, 16%, 34%)
+  Surface0 = "#363a4f"; # rgb(54, 58, 79) hsl(230, 19%, 26%)
+  Base = "#24273a"; # rgb(36, 39, 58) hsl(232, 23%, 18%)
+  Mantle = "#1e2030"; # rgb(30, 32, 48) hsl(233, 23%, 15%)
+  Crust = "#181926"; # rgb(24, 25, 38) hsl(236, 23%, 12%)
+}
diff --git a/themes/catppuccin-mocha.nix b/themes/catppuccin-mocha.nix
new file mode 100644
index 0000000..ce398ae
--- /dev/null
+++ b/themes/catppuccin-mocha.nix
@@ -0,0 +1,30 @@
+# Catppuccin Mocha theme (https://github.com/catppuccin/catppuccin)
+{
+  Rosewater = "#f5e0dc"; # rgb(245, 224, 220) hsl(10, 56%, 91%)
+  Flamingo = "#f2cdcd"; # rgb(242, 205, 205) hsl(0, 59%, 88%)
+  Pink = "#f5c2e7"; # rgb(245, 194, 231) hsl(316, 72%, 86%)
+  Mauve = "#cba6f7"; # rgb(203, 166, 247) hsl(267, 84%, 81%)
+  Red = "#f38ba8"; # rgb(243, 139, 168) hsl(343, 81%, 75%)
+  Maroon = "#eba0ac"; # rgb(235, 160, 172) hsl(350, 65%, 77%)
+  Peach = "#fab387"; # rgb(250, 179, 135) hsl(23, 92%, 75%)
+  Yellow = "#f9e2af"; # rgb(249, 226, 175) hsl(41, 86%, 83%)
+  Green = "#a6e3a1"; # rgb(166, 227, 161) hsl(115, 54%, 76%)
+  Teal = "#94e2d5"; # rgb(148, 226, 213) hsl(170, 57%, 73%)
+  Sky = "#89dceb"; # rgb(137, 220, 235) hsl(189, 71%, 73%)
+  Sapphire = "#74c7ec"; # rgb(116, 199, 236) hsl(199, 76%, 69%)
+  Blue = "#89b4fa"; # rgb(137, 180, 250) hsl(217, 92%, 76%)
+  Lavender = "#b4befe"; # rgb(180, 190, 254) hsl(232, 97%, 85%)
+  Text = "#cdd6f4"; # rgb(205, 214, 244) hsl(226, 64%, 88%)
+  Subtext1 = "#bac2de"; # rgb(186, 194, 222) hsl(227, 35%, 80%)
+  Subtext0 = "#a6adc8"; # rgb(166, 173, 200) hsl(228, 24%, 72%)
+  Overlay2 = "#9399b2"; # rgb(147, 153, 178) hsl(228, 17%, 64%)
+  Overlay1 = "#7f849c"; # rgb(127, 132, 156) hsl(230, 13%, 55%)
+  Overlay0 = "#6c7086"; # rgb(108, 112, 134) hsl(231, 11%, 47%)
+  Surface2 = "#585b70"; # rgb(88, 91, 112) hsl(233, 12%, 39%)
+  Surface1 = "#45475a"; # rgb(69, 71, 90) hsl(234, 13%, 31%)
+  Surface0 = "#313244"; # rgb(49, 50, 68) hsl(237, 16%, 23%)
+  Base = "#1e1e2e"; # rgb(30, 30, 46) hsl(240, 21%, 15%)
+  Mantle = "#181825"; # rgb(24, 24, 37) hsl(240, 21%, 12%)
+  Crust = "#11111b"; # rgb(17, 17, 27) hsl(240, 23%, 9%)
+}
+
diff --git a/themes/monokai-pro-machine.nix b/themes/monokai-pro-machine.nix
new file mode 100644
index 0000000..9e267dc
--- /dev/null
+++ b/themes/monokai-pro-machine.nix
@@ -0,0 +1,22 @@
+# Monokai Pro Machine palette (https://github.com/helix-editor/helix/blob/9be810fd01f495c795ab5e5b7240a32708d19f5c/runtime/themes/monokai_pro_machine.toml)
+{
+  # primary colors
+  red = "#ff6d7e";
+  orange = "#ffb270";
+  yellow = "#ffed72";
+  green = "#a2e57b";
+  blue = "#7cd5f1";
+  purple = "#baa0f8";
+  # base colors
+  base0 = "#161b1e";
+  base1 = "#1d2528";
+  base2 = "#273136";
+  base3 = "#3a4449";
+  base4 = "#545f62";
+  base5 = "#6b7678";
+  base6 = "#798384";
+  base7 = "#b8c4c3";
+  base8 = "#f2fffc";
+  # variants
+  base8x0c = "#303a3e";
+}
diff --git a/themes/nord.nix b/themes/nord.nix
index b7292fd..673eac8 100644
--- a/themes/nord.nix
+++ b/themes/nord.nix
@@ -1,15 +1,15 @@
 # Nord palette (https://www.nordtheme.com)
 {
-  n0  = "#2e3440";
-  n1  = "#3b4252";
-  n2  = "#434c5e";
-  n3  = "#4c566a";
-  n4  = "#d8dee9";
-  n5  = "#e5e9f0";
-  n6  = "#eceff4";
-	n7  = "#8fbcbb";
-  n8  = "#88c0d0";
-  n9  = "#81a1c1";
+  n0 = "#2e3440";
+  n1 = "#3b4252";
+  n2 = "#434c5e";
+  n3 = "#4c566a";
+  n4 = "#d8dee9";
+  n5 = "#e5e9f0";
+  n6 = "#eceff4";
+  n7 = "#8fbcbb";
+  n8 = "#88c0d0";
+  n9 = "#81a1c1";
   n10 = "#5e81ac";
   n11 = "#bf616a";
   n12 = "#d08770";
diff --git a/themes/tomorrow-night.nix b/themes/tomorrow-night.nix
new file mode 100644
index 0000000..48df0a0
--- /dev/null
+++ b/themes/tomorrow-night.nix
@@ -0,0 +1,19 @@
+# Onedark palette (https://github.com/chriskempson/tomorrow-theme)
+rec {
+  background = "#1d1f21";
+  currentLine = "#282a2e";
+  selection = "#373b41";
+  foreground = "#c5c8c6";
+  comment = "#969896";
+  red = "#cc6666";
+  orange = "#de935f";
+  yellow = "#f0c674";
+  green = "#b5bd68";
+  aqua = "#8abeb7";
+  blue = "#81a2be";
+  purple = "#b294bb";
+
+  black = background;
+  white = foreground;
+  cyan = aqua;
+}
diff --git a/thor.nix b/thor.nix
deleted file mode 100644
index 095be58..0000000
--- a/thor.nix
+++ /dev/null
@@ -1,209 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  nixpkgs.overlays = [
-    (final: prev: {
-      devEnvironment = (import ./environment.nix) {
-        enableCpp = true;
-        enableData = true;
-        enableGo = true;
-        enableHtml = true;
-        enableJavascript = true;
-        enableJava = true;
-        enableLatex = true;
-        enableNix = true;
-        enableOffice = true;
-        enablePython = true;
-        enableRust = true;
-        enableShell = true;
-        enableSpelling = true;
-      };
-
-      cocktail-bar-cli = final.callPackage ./custom/cocktail-bar-cli { };
-      update-background = final.callPackage ./custom/update-background { backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+"; };
-      lockscreen = final.callPackage ./custom/lockscreen {
-        palette = final.rice.colorPalette;
-        font = final.rice.font.normal;
-      };
-    })
-  ];
-
-  home = {
-    language.base = "it_IT.UTF-8";
-    keyboard = {
-      layout = "it";
-      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
-    };
-    packages = with pkgs; [
-      pulseaudio
-      easyeffects
-
-      kubectl
-      docker-compose
-      docker-machine
-
-      arandr
-      ark
-      authy
-      bitwarden
-      (blender.override { cudaSupport = true; })
-      btop
-      catgirl # IRC
-      cava
-      discord
-      # electrum
-      element-desktop
-      evolution
-      file
-      # firefox
-      freecad
-      gallery-dl
-      gnome.gnome-calendar
-      gnome.geary
-      gnomeExtensions.appindicator
-      gnomeExtensions.caffeine
-      gnomeExtensions.dash-to-dock
-      # gnomeExtensions.dynamic-panel-transparency
-      gnomeExtensions.just-perfection
-      gnomeExtensions.gtile
-      gnomeExtensions.vitals
-      google-chrome
-      gucharmap
-      handbrake
-      htop
-      httpie
-      # hyperspace-cli
-      inkscape
-      jetbrains.datagrip
-      kdiff3
-      kmail
-      kontact
-      korganizer
-      krita
-      lutris
-      minecraft
-      mmv-go
-      mpv
-      mycrypto
-      neofetch
-      nix-prefetch-scripts
-      nix-tree
-      obsidian
-      okular
-      openvpn
-      pavucontrol
-      pentablet-driver
-      procps
-      ripgrep
-      skypeforlinux
-      # slack
-      spotify
-      tdesktop
-      teams
-      transmission-gtk
-      unrar
-      virt-manager
-      wget
-      # wineFull
-      wireguard-tools
-      xclip
-      xournalpp
-      zoom-us
-      zotero
-
-      (
-        retroarch.override {
-          cores = with pkgs.libretro; [
-            mgba
-            pcsx_rearmed
-            ppsspp
-          ];
-        }
-      )
-
-    ];
-  };
-
-  imports = [
-    ./modules/configurations.nix
-    ./modules/fonts.nix
-
-    ./modules/alacritty.nix
-    ./modules/bash.nix
-    ./modules/bat.nix
-    ./modules/bottom.nix
-    ./modules/broot.nix
-    # ./modules/bspwm.nix
-    ./modules/dircolors.nix
-    ./modules/direnv.nix
-    # ./modules/dunst.nix
-    # ./modules/fzf.nix
-    ./modules/git.nix
-    ./modules/go.nix
-    ./modules/gpg.nix
-    ./modules/grobi.nix
-    ./modules/info.nix
-    ./modules/java.nix
-    ./modules/joystickwake.nix
-    ./modules/jq.nix
-    ./modules/kakoune.nix
-    # ./modules/keepassxc.nix
-    ./modules/keychain.nix
-    ./modules/kitty.nix
-    # ./modules/latex.nix
-    ./modules/lf.nix
-    ./modules/lorri.nix
-    ./modules/man.nix
-    ./modules/mangohud.nix
-    ./modules/megasync.nix
-    ./modules/nix-index.nix
-    ./modules/noti.nix
-    ./modules/obs-studio.nix
-    ./modules/office.nix
-    ./modules/onedrive.nix
-    # ./modules/picom.nix
-    # ./modules/polybar.nix
-    # ./modules/pycharm.nix
-    ./modules/gtk_theme.nix
-    ./modules/rofi.nix
-    ./modules/rofimoji.nix
-    # ./modules/screen_locker.nix
-    ./modules/ssh.nix
-    ./modules/starship.nix
-    # ./modules/sxhkd.nix
-    ./modules/syncthing.nix
-    ./modules/terminator.nix
-    ./modules/tmux.nix
-    ./modules/update_background.nix
-    ./modules/webapp.nix
-    # ./modules/xidlehook.nix
-    ./modules/zoxide.nix
-    ./modules/zsh.nix
-
-    ./modules/pro_audio.nix
-    # ./modules/security.nix
-
-    ./modules/shell_aliases.nix
-  ];
-
-
-  services = {
-    # blueman-applet.enable = true;
-    # caffeine.enable = true;
-    # cbatticon.enable = true;
-    gnome-keyring.enable = true;
-    # network-manager-applet.enable = true;
-    # playerctld.enable = true;
-    # poweralertd.enable = true;
-  };
-
-  # xsession = {
-  #   enable = true;
-  #   numlock.enable = true;
-  #   initExtra = ''
-  #     ## Touchpad
-  #     ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Natural Scrolling Enabled' 1
-  #     ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Tapping Enabled' 1
-  #   '';
-  # };
-
-}
diff --git a/nixos/thor.nix b/thor/configuration.nix
similarity index 69%
rename from nixos/thor.nix
rename to thor/configuration.nix
index e681db1..81f889a 100644
--- a/nixos/thor.nix
+++ b/thor/configuration.nix
@@ -1,20 +1,9 @@
-# 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, lib, ... }:
-
+{ config, pkgs, ... }:
+with lib;
 {
-  imports = [
-    <nixos-hardware/common/cpu/amd>
-    <nixos-hardware/common/pc/ssd>
-    /etc/nixos/hardware-configuration.nix
-    ./pro_audio.nix
-    ./big_data.nix
-  ];
-
   boot = {
     binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ];
+    kernelPackages = pkgs.linuxPackages_5_18;
     extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
     loader = {
       systemd-boot.enable = true;
@@ -58,17 +47,9 @@
   programs = {
     dconf.enable = true;
     flashrom.enable = true;
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-    steam = {
-      enable = true;
-    };
-    zsh = {
-      enable = true;
-      syntaxHighlighting.enable = true;
-    };
+    gnupg.agent = { enable = true; enableSSHSupport = true; };
+    steam = { enable = true; };
+    zsh = { enable = true; syntaxHighlighting.enable = true; };
   };
 
   networking = {
@@ -79,10 +60,6 @@
     };
     networkmanager.enable = true;
     useDHCP = false;
-    hosts = {
-      "*.engine.sesar.int" = [ "172.20.28.210" ];
-      "vcenter.sesar.int" = [ "172.20.28.20" ];
-    };
   };
 
   time.timeZone = "Europe/Rome";
@@ -103,8 +80,9 @@
         ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service";
       };
     };
+    blueman.enable = true;
     clamav = { daemon.enable = true; updater.enable = true; };
-    dbus.packages = with pkgs; [ pkgs.dconf ];
+    dbus.packages = with pkgs; [ dconf ];
     gnome.gnome-keyring.enable = true;
     gvfs = { enable = true; package = pkgs.gnome3.gvfs; };
     fwupd.enable = true;
@@ -117,7 +95,7 @@
         enable = true;
         support32Bit = true;
       };
-      media-session.enable = true;
+      # media-session.enable = true;
     };
     power-profiles-daemon.enable = true;
     smartd = { enable = true; notifications.x11.enable = true; };
@@ -133,7 +111,7 @@
           };
         in
         {
-          bertof_home = common // { subvolume = "/home/bertof"; };
+          bertof_home = recursiveUpdate common { subvolume = "/home/bertof"; };
         };
     };
     thermald.enable = true;
@@ -142,43 +120,24 @@
       desktopManager = {
         # gnome.enable = true;
         # cinnamon.enable = true;
-        plasma5 = {
-          enable = true;
-          runUsingSystemd = true;
-          useQtScaling = true;
-        };
+        # plasma5 = { enable = true; runUsingSystemd = true; useQtScaling = true; };
       };
+      windowManager.bspwm = { enable = true; };
       # displayManager.gdm = { enable = true; nvidiaWayland = true; };
       displayManager.sddm.enable = true;
       layout = "us";
       videoDrivers = [ "nvidia" ];
-      xkbOptions = "eurosign:e";
+      xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl";
     };
     # gnome.gnome-remote-desktop.enable = true;
     zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; };
-
-    ethminer = {
-      enable = false;
-      wallet = "0x73b788882e1C182123333f42FFf275B7dd7f51bb";
-      toolkit = "opencl";
-      rig = "thor";
-      pool = "eth-eu1.nanopool.org";
-      stratumPort = 9999;
-
-      registerMail = "";
-    };
-
-
-    # teamviewer.enable = true;
   };
 
   services.teamviewer.enable = true;
 
   security = {
-    pam.services."kde" = {
-      enableKwallet = true;
-    };
     rtkit.enable = true;
+    pam.services = { autounlock_gnome_keyring.enableGnomeKeyring = true; };
     sudo.extraConfig = ''
       Defaults pwfeedback
     '';
@@ -199,23 +158,21 @@
     kvmgt.enable = true;
     libvirtd.enable = true;
     podman.enable = true;
-    virtualbox.host.enable = true;
+    # virtualbox.host.enable = true;
   };
 
   nixpkgs.config = {
     allowUnfree = true;
     packageOverrides = pkgs: {
       steam = pkgs.steam.override {
-        extraPkgs = pkgs: with pkgs; [ ];
-        extraLibraries = pkgs: with pkgs; [ fontconfig.lib icu freetype ];
+        extraPkgs = pkgs: with pkgs; [ icu ];
       };
     };
     # cudaSupport = true;
   };
   nix = {
     package = pkgs.nixFlakes;
-    extraOptions = lib.optionalString (config.nix.package == pkgs.nixFlakes)
-      "experimental-features = nix-command flakes";
+    extraOptions = "experimental-features = nix-command flakes";
     gc.automatic = true;
   };
 
diff --git a/thor/hardware-configuration.nix b/thor/hardware-configuration.nix
new file mode 100644
index 0000000..09029cb
--- /dev/null
+++ b/thor/hardware-configuration.nix
@@ -0,0 +1,47 @@
+# 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.
+{ modulesPath, ... }:
+
+{
+  imports =
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    {
+      device = "/dev/disk/by-uuid/6c06428e-c296-4ef1-8429-62bafb860126";
+      fsType = "btrfs";
+      options = [ "subvol=@root" "x-gvfs-hide" "space_cache=v2" "discard" "compress-force=zstd:1" ];
+    };
+
+  fileSystems."/boot" =
+    {
+      device = "/dev/disk/by-uuid/B9D2-255C";
+      fsType = "vfat";
+    };
+
+  fileSystems."/home/bertof" =
+    {
+      device = "/dev/disk/by-uuid/6c06428e-c296-4ef1-8429-62bafb860126";
+      fsType = "btrfs";
+      options = [ "subvol=@home_bertof" "x-gvfs-hide" "space_cache=v2" "discard" "compress-force=zstd:1" ];
+    };
+
+  fileSystems."/nix" =
+    {
+      device = "/dev/disk/by-uuid/6c06428e-c296-4ef1-8429-62bafb860126";
+      fsType = "btrfs";
+      options = [ "subvol=@nix" "x-gvfs-hide" "space_cache=v2" "discard" "compress-force=zstd:1" ];
+    };
+
+  swapDevices =
+    [{ device = "/dev/disk/by-uuid/dee188e4-4ff8-417c-9419-b7f00ecb9989"; }];
+
+}
diff --git a/upgrade.sh b/upgrade.sh
deleted file mode 100755
index be0dba5..0000000
--- a/upgrade.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env sh
-set -e
-
-HOST=`hostname`
-echo "Upgrading $HOST"
-case "$HOST" in
-  odin)
-    echo "Found odin"
-    sudo nixos-rebuild boot --upgrade -p Nvidia -I "nixos-config=./nixos/odin-nvidia.nix"
-    sudo nixos-rebuild boot --upgrade -p Intel -I "nixos-config=./nixos/odin-intel.nix"
-    ;;
-  thor | freya | loki)
-    echo "Found $HOST"
-    sudo nixos-rebuild boot --upgrade -I "nixos-config=./nixos/$HOST.nix"
-    ;;
-  *)
-    echo "localhost match not found"
-    exit 1
-    ;;
-esac
-
-nix-channel --update
-home-manager switch
-
-echo DONE