diff --git a/freya.nix b/freya.nix
new file mode 100644
index 0000000..0468e42
--- /dev/null
+++ b/freya.nix
@@ -0,0 +1,62 @@
+{ 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
index 1710386..da04741 100644
--- a/home.nix
+++ b/home.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, cfg, ... }:
+{ pkgs, lib, ... }:
 let
   hostname = lib.fileContents /etc/hostname;
   user = builtins.getEnv "USER";
@@ -9,5 +9,6 @@ in
     (import ./rice.nix)
   ];
   imports = [host_config ];
+
   programs.home-manager.enable = true;
 }
diff --git a/modules/kakoune.nix b/modules/kakoune.nix
index 9677764..4c22697 100644
--- a/modules/kakoune.nix
+++ b/modules/kakoune.nix
@@ -73,7 +73,6 @@ let
       aspellDicts.it
     ]
   );
-
   plugins = with pkgs; [
     kakounePlugins.prelude-kak
     kakounePlugins.kak-lsp
@@ -86,9 +85,7 @@ 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 = {
@@ -156,8 +153,6 @@ in
       "add-highlighter global/ regex \\h+$ 0:Error                   # Highlight trailing spaces"
       "eval %sh{kak-lsp --kakoune -s $kak_session}"
       "lsp-enable"
-
-      # Kak-lsp snippet support
       ''
         def -hidden insert-c-n %{
          try %{
@@ -168,7 +163,6 @@ in
          }
         }
       ''
-
       "powerline-start"
       "require-module connect-broot"
       "require-module connect-lf"
@@ -176,7 +170,6 @@ in
     ];
     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
@@ -205,13 +198,11 @@ in
     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
       ''
@@ -231,7 +222,6 @@ in
         roots = ["package.json"]
         command = "${nodePackages.vscode-langservers-extracted}/bin/vscode-json-language-server"
         args = ["--stdio"]
-
         [language.yaml]
         filetypes = ["yaml"]
         roots = [".git"]
@@ -262,19 +252,16 @@ in
         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"]