From c9eeeb9dc49e5858b4dd6bcf908bfd9806c547a8 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Thu, 2 Jun 2022 20:16:20 +0200
Subject: [PATCH] Extreme cleaup + new nix rice + commit hooks

---
 .envrc                                     |  2 +
 .gitignore                                 |  1 +
 configs/kak/colors/nord.kak                |  4 +-
 custom/cocktail-bar-cli/default.nix        |  2 +-
 custom/default.nix                         |  7 +-
 custom/joystickwake/default.nix            | 36 --------
 custom/lockscreen/default.nix              |  7 +-
 custom/update-background/default.nix       |  7 +-
 flake.lock                                 | 98 ++++++++++++++++++----
 flake.nix                                  | 70 ++++++++--------
 freya.nix                                  | 62 --------------
 home.nix                                   | 14 ----
 home_manager/loki.nix                      |  4 +-
 home_manager/modules/alacritty.nix         |  4 +-
 home_manager/modules/autorandr.nix         |  1 -
 home_manager/modules/bottom.nix            | 21 ++---
 home_manager/modules/broot.nix             | 10 +--
 home_manager/modules/bspwm.nix             |  2 +-
 home_manager/modules/dircolors.nix         | 10 +--
 home_manager/modules/dunst.nix             |  9 +-
 home_manager/modules/fzf.nix               |  8 +-
 home_manager/modules/git.nix               |  9 +-
 home_manager/modules/gpg.nix               | 20 ++---
 home_manager/modules/grobi.nix             |  1 -
 home_manager/modules/helix.nix             |  2 +-
 home_manager/modules/java.nix              |  4 +-
 home_manager/modules/joystickwake.nix      |  2 +-
 home_manager/modules/kakoune.nix           | 34 +-------
 home_manager/modules/keepassxc.nix         |  2 +-
 home_manager/modules/kitty.nix             |  4 +-
 home_manager/modules/latex.nix             |  2 +-
 home_manager/modules/libinput-gestures.nix |  2 +-
 home_manager/modules/megasync.nix          |  2 +-
 home_manager/modules/nix-index.nix         |  2 +-
 home_manager/modules/office.nix            | 15 ++--
 home_manager/modules/picom.nix             |  1 -
 home_manager/modules/polybar.nix           |  7 +-
 home_manager/modules/pro_audio.nix         |  5 +-
 home_manager/modules/rofi.nix              |  8 +-
 home_manager/modules/shell_aliases.nix     |  8 +-
 home_manager/modules/sxhkd.nix             |  2 +-
 home_manager/modules/terminator.nix        |  4 +-
 home_manager/modules/update_background.nix |  2 +-
 home_manager/modules/webapp.nix            | 14 ++--
 home_manager/modules/zathura.nix           |  2 +-
 home_manager/modules/zoxide.nix            |  5 +-
 home_manager/odin.nix                      |  2 +-
 home_manager/thor.nix                      |  2 +-
 loki/hardware-configuration.nix            |  2 +-
 nixos_modules/big_data.nix                 | 54 ++++++------
 nixos_modules/mind.nix                     |  2 +-
 nixos_modules/pentablet.nix                |  2 +-
 nixos_modules/pro_audio.nix                |  2 +-
 odin/configuration-nvidia.nix              |  2 +-
 odin/hardware-configuration.nix            | 41 +++++----
 rice.nix                                   | 30 +++----
 themes/nord.nix                            | 20 ++---
 thor/configuration.nix                     |  2 +-
 thor/hardware-configuration.nix            | 20 +++--
 59 files changed, 319 insertions(+), 400 deletions(-)
 create mode 100644 .envrc
 delete mode 100644 custom/joystickwake/default.nix
 delete mode 100644 freya.nix
 delete mode 100644 home.nix

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 b2be92b..726d2d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 result
+.direnv
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/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 66ec6fa..3b8e1da 100644
--- a/custom/lockscreen/default.nix
+++ b/custom/lockscreen/default.nix
@@ -1,15 +1,14 @@
 { lib
-, stdenv
 , rice
 , roboto
 , i3lock-color
 , 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
 writeScriptBin "lockscreen" ''
   #!/bin/sh
@@ -53,4 +52,4 @@ writeScriptBin "lockscreen" ''
   --pass-screen-keys \
   --pass-volume-keys \
   --nofork
-  ''
+''
diff --git a/custom/update-background/default.nix b/custom/update-background/default.nix
index 8dd48e8..92d3c17 100644
--- a/custom/update-background/default.nix
+++ b/custom/update-background/default.nix
@@ -1,12 +1,11 @@
-{ lib
-, stdenv
-, feh
+{ feh
 , glib
 , findutils
 , gnugrep
 , coreutils
 , writeScriptBin
-, backgrounds_directory ? "$HOME/Immagini/Sfondi"}:
+, backgrounds_directory ? "$HOME/Immagini/Sfondi"
+}:
 let
   find = "${findutils}/bin/find";
   grep = "${gnugrep}/bin/grep";
diff --git a/flake.lock b/flake.lock
index b5ff140..1f2e336 100644
--- a/flake.lock
+++ b/flake.lock
@@ -56,6 +56,28 @@
         "type": "github"
       }
     },
+    "nix-rice": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": "nixpkgs",
+        "pre-commit-hooks": "pre-commit-hooks"
+      },
+      "locked": {
+        "lastModified": 1654188574,
+        "narHash": "sha256-wl87aE0JGd2viY7io0FLS4nHKAa8f9MVZWXohUvEbDU=",
+        "owner": "bertof",
+        "repo": "nix-rice",
+        "rev": "0ce38b26d5fc9392cc2972f77e42549075a8e78d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "bertof",
+        "repo": "nix-rice",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1650522846,
@@ -72,6 +94,22 @@
       }
     },
     "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": 1653979012,
         "narHash": "sha256-Md1OeSa4WwrtsjJKanOyrNfo9WbRCgURk23iRhUI2LU=",
@@ -87,19 +125,32 @@
         "type": "github"
       }
     },
-    "root": {
+    "pre-commit-hooks": {
       "inputs": {
-        "flake-utils": "flake-utils",
-        "home-manager": "home-manager",
-        "home-manager-unstable": "home-manager-unstable",
-        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay",
-        "tex2nix": "tex2nix",
-        "unstable": "unstable"
+        "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"
       }
     },
-    "rust-overlay": {
+    "pre-commit-hooks_2": {
       "inputs": {
         "flake-utils": [
           "flake-utils"
@@ -109,19 +160,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1652496760,
-        "narHash": "sha256-AM1almW0FjiUegqfJc6n+OO3yXTCXUsH2IEI323vbJ0=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "f9ddceabd2ccd2bf3d08c83832f3709c94287144",
+        "lastModified": 1652714503,
+        "narHash": "sha256-qQKVEfDe5FqvGgkZtg5Pc491foeiDPIOeycHMqnPDps=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "521a524771a8e93caddaa0ac1d67d03766a8b0b3",
         "type": "github"
       },
       "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
+        "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": [
diff --git a/flake.nix b/flake.nix
index 86fdac8..bc19dad 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,36 +2,18 @@
   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";
-    };
+    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";
-    };
+    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";
 
-    rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      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";
-    };
+    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 =
@@ -42,24 +24,26 @@
     , home-manager-unstable
     , flake-utils
     , nixos-hardware
-    , rust-overlay
     , tex2nix
+    , nix-rice
+    , pre-commit-hooks
     }:
     let
       system = "x86_64-linux";
-      overlays = [
+      overlaysBuilder = system: [
+        (nix-rice.overlays.default)
         (import ./rice.nix)
-        (rust-overlay.overlay)
-        (final: prev: { inherit (tex2nix.packages.${system}) tex2nix; })
-        (final: prev: {
+        (_: _: { 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; };
         })
-        (final: prev: { stable = pkgs; })
-        (final: prev: { unstable = unstablePkgs; })
+        (_: _: { stable = pkgs; })
+        (_: _: { unstable = unstablePkgs; })
       ];
       nixpkgsSettings = {
-        inherit overlays system;
+        inherit system;
+        overlays = overlaysBuilder system;
         config = {
           extraOptions = "experimental-features = nix-command flakes";
           allowUnfree = true;
@@ -156,7 +140,7 @@
       nixosConfigurations = rec {
 
         thor = thor-unstable;
-        thor-stable = thorStable [ ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix];
+        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 ];
 
@@ -168,9 +152,25 @@
         odin-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
 
         loki = loki-unstable;
-        loki-stable = lokiStable [];
+        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/loki.nix b/home_manager/loki.nix
index c0b3618..336d7a9 100644
--- a/home_manager/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;
diff --git a/home_manager/modules/alacritty.nix b/home_manager/modules/alacritty.nix
index 2f8b250..ff027e9 100644
--- a/home_manager/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
index 466a6ae..660946b 100644
--- a/home_manager/modules/autorandr.nix
+++ b/home_manager/modules/autorandr.nix
@@ -1,4 +1,3 @@
-{ pkgs, ... }:
 {
   programs.autorandr = {
     enable = true;
diff --git a/home_manager/modules/bottom.nix b/home_manager/modules/bottom.nix
index 8c556f3..d83d4c5 100644
--- a/home_manager/modules/bottom.nix
+++ b/home_manager/modules/bottom.nix
@@ -1,12 +1,13 @@
-{ pkgs, lib, ... }:
+{ 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";
-		};
-	};
+  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/home_manager/modules/broot.nix b/home_manager/modules/broot.nix
index fed74a5..93b6086 100644
--- a/home_manager/modules/broot.nix
+++ b/home_manager/modules/broot.nix
@@ -1,7 +1,7 @@
 {
-	programs.broot = {
-  	enable = true;
-  	enableBashIntegration = true;
-  	enableZshIntegration = true;
-	};
+  programs.broot = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+  };
 }
diff --git a/home_manager/modules/bspwm.nix b/home_manager/modules/bspwm.nix
index 7513e19..cb6467a 100644
--- a/home_manager/modules/bspwm.nix
+++ b/home_manager/modules/bspwm.nix
@@ -3,7 +3,7 @@
 let
   monitorPages = [ "I" "II" "III" "IV" "V" "VI" "VII" "VIII" "IX" "X" ];
   monitorPagesString = lib.strings.concatStringsSep " " monitorPages;
-  strPalette = pkgs.rice.palette.toRGBHex pkgs.rice.colorPalette;
+  strPalette = pkgs.lib.rice.palette.toRGBHex pkgs.rice.colorPalette;
   xrandr = "${pkgs.xorg.xrandr}/bin/xrandr";
   xsetroot = "${pkgs.xorg.xsetroot}/bin/xsetroot";
 in
diff --git a/home_manager/modules/dircolors.nix b/home_manager/modules/dircolors.nix
index 8467404..6d231c1 100644
--- a/home_manager/modules/dircolors.nix
+++ b/home_manager/modules/dircolors.nix
@@ -1,7 +1,7 @@
 {
-	programs.dircolors = {
-  	enable = true;
-  	enableBashIntegration = true;
-  	enableZshIntegration = true;
-	};
+  programs.dircolors = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+  };
 }
diff --git a/home_manager/modules/dunst.nix b/home_manager/modules/dunst.nix
index 23c8371..38ba672 100644
--- a/home_manager/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/fzf.nix b/home_manager/modules/fzf.nix
index 53accd0..a421031 100644
--- a/home_manager/modules/fzf.nix
+++ b/home_manager/modules/fzf.nix
@@ -1,8 +1,8 @@
 {
   programs.fzf = {
-		enable = true;
-		tmux.enableShellIntegration = true;
-		enableBashIntegration = true;
-		enableZshIntegration = true;
+    enable = true;
+    tmux.enableShellIntegration = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
   };
 }
diff --git a/home_manager/modules/git.nix b/home_manager/modules/git.nix
index a0cb5d7..117d328 100644
--- a/home_manager/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";
@@ -101,9 +99,9 @@ in
       commit.gpgSign = true;
       # core.editor = kak;
       credential.helper = "cache --timeout=3600 ";
-      diff.guitool = meld;
+      diff.guitool = "meld";
       init.defaultBranch = "main";
-      merge.guitool = meld;
+      merge.guitool = "meld";
       pull.rebase = true;
       rebase.autoStash = true;
       user.signingKey = "berto.f@protonmail.com";
@@ -117,5 +115,6 @@ in
     gh
     git-secret
     glab
+    meld
   ];
 }
diff --git a/home_manager/modules/gpg.nix b/home_manager/modules/gpg.nix
index 6ad7fee..2a09965 100644
--- a/home_manager/modules/gpg.nix
+++ b/home_manager/modules/gpg.nix
@@ -1,14 +1,12 @@
 {
-	programs.gpg = {
-		enable = true;
-		settings = {
+  programs.gpg = {
+    enable = true;
+    settings = { };
+  };
 
-		};
-	};
-
-	services.gpg-agent = {
-		enable = true;
-		defaultCacheTtl = 600;
-		# extraConfig = "allow-loopback-pinentry";
-	};
+  services.gpg-agent = {
+    enable = true;
+    defaultCacheTtl = 600;
+    # extraConfig = "allow-loopback-pinentry";
+  };
 }
diff --git a/home_manager/modules/grobi.nix b/home_manager/modules/grobi.nix
index 14d1121..48f77b3 100644
--- a/home_manager/modules/grobi.nix
+++ b/home_manager/modules/grobi.nix
@@ -1,4 +1,3 @@
-{ config, lib, pkgs, ... }:
 {
   services.grobi = {
     enable = true;
diff --git a/home_manager/modules/helix.nix b/home_manager/modules/helix.nix
index 114a934..6291346 100644
--- a/home_manager/modules/helix.nix
+++ b/home_manager/modules/helix.nix
@@ -23,10 +23,10 @@
       editor.lsp.display-messages = true;
       editor.scrolloff = 5;
       editor.true-color = true;
+      editor.mouse = false;
     };
     themes =
       let
-        strPalette = with pkgs.rice; palette.toRgbShortHex coloPalette;
         transparent = "none";
         gray = "#665c54";
         dark-gray = "#3c3836";
diff --git a/home_manager/modules/java.nix b/home_manager/modules/java.nix
index 242399b..5910761 100644
--- a/home_manager/modules/java.nix
+++ b/home_manager/modules/java.nix
@@ -1,3 +1,3 @@
-{ pkgs, ...}:
-{  programs.java.enable = true;
+{
+  programs.java.enable = true;
 }
diff --git a/home_manager/modules/joystickwake.nix b/home_manager/modules/joystickwake.nix
index 25f0aaf..5cc1113 100644
--- a/home_manager/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/home_manager/modules/kakoune.nix b/home_manager/modules/kakoune.nix
index 746292b..12df5ab 100644
--- a/home_manager/modules/kakoune.nix
+++ b/home_manager/modules/kakoune.nix
@@ -1,6 +1,5 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 let
-  strPalette = with pkgs.rice; palette.toRgbShortHex colorPalette;
   themeBuilder = palette: with palette; ''
     set-face global value rgb:${normal.magenta},default
     set-face global type rgb:${bright.white},default
@@ -132,36 +131,9 @@ in
   };
 
   # THEME FILE
-  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/colors/nord.kak".text = themeBuilder (pkgs.lib.rice.palette.toRgbShortHex pkgs.rice.colorPalette);
 
-  xdg.configFile."kak-lsp/kak-lsp.toml".text = with pkgs;       ''
+  xdg.configFile."kak-lsp/kak-lsp.toml".text = ''
     snippet_support = false
     verbosity = 2
     [server]
diff --git a/home_manager/modules/keepassxc.nix b/home_manager/modules/keepassxc.nix
index 7d2f75b..f1effce 100644
--- a/home_manager/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/home_manager/modules/kitty.nix b/home_manager/modules/kitty.nix
index 82d806e..6bb7737 100644
--- a/home_manager/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;
diff --git a/home_manager/modules/latex.nix b/home_manager/modules/latex.nix
index b4a0a7c..3c77f57 100644
--- a/home_manager/modules/latex.nix
+++ b/home_manager/modules/latex.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ...}:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     tex2nix
diff --git a/home_manager/modules/libinput-gestures.nix b/home_manager/modules/libinput-gestures.nix
index 4a6f522..c578c63 100644
--- a/home_manager/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/home_manager/modules/megasync.nix b/home_manager/modules/megasync.nix
index 239e93a..363d9d9 100644
--- a/home_manager/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/nix-index.nix b/home_manager/modules/nix-index.nix
index 54e2c67..975c5ac 100644
--- a/home_manager/modules/nix-index.nix
+++ b/home_manager/modules/nix-index.nix
@@ -20,7 +20,7 @@
 
     timers."nix-index" = {
       Unit.Description = "Daily update the nix-locate database";
-      Timer = { OnCalendar = "daily"; Persistent = true; Unit = "nix-index.service";};
+      Timer = { OnCalendar = "daily"; Persistent = true; Unit = "nix-index.service"; };
       Install.WantedBy = [ "timers.target" ];
     };
   };
diff --git a/home_manager/modules/office.nix b/home_manager/modules/office.nix
index 3e7ef12..10cf015 100644
--- a/home_manager/modules/office.nix
+++ b/home_manager/modules/office.nix
@@ -1,11 +1,10 @@
-{pkgs, lib,...}:
-with pkgs;
+{ pkgs, ... }:
 {
-  home.packages = [
-      # libreoffice-fresh
-      onlyoffice-bin
-      hunspellDicts.en_GB-large
-      hunspellDicts.en_US-large
-      hunspellDicts.it_IT
+  home.packages = with pkgs; [
+    # libreoffice-fresh
+    onlyoffice-bin
+    hunspellDicts.en_GB-large
+    hunspellDicts.en_US-large
+    hunspellDicts.it_IT
   ];
 }
diff --git a/home_manager/modules/picom.nix b/home_manager/modules/picom.nix
index 2e613ce..89f6265 100644
--- a/home_manager/modules/picom.nix
+++ b/home_manager/modules/picom.nix
@@ -1,4 +1,3 @@
-{ pkgs, ... }:
 {
   services.picom = {
     enable = true;
diff --git a/home_manager/modules/polybar.nix b/home_manager/modules/polybar.nix
index 4670c00..50ade43 100644
--- a/home_manager/modules/polybar.nix
+++ b/home_manager/modules/polybar.nix
@@ -1,5 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 let
+  inherit (pkgs.rice) colorPalette;
   grep = "${pkgs.gnugrep}/bin/grep";
   cut = "${pkgs.coreutils}/bin/cut";
   head = "${pkgs.coreutils}/bin/head";
@@ -8,8 +9,6 @@ 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";
   systemctl = "${pkgs.systemd}/bin/systemctl";
   loginctl = "${pkgs.systemd}/bin/loginctl";
   shutdown = "${pkgs.systemd}/bin/shutdown";
@@ -17,7 +16,7 @@ let
     session=`${loginctl} session-status | ${pkgs.coreutils}/bin/head -n 1 | ${pkgs.gawk}/bin/awk '{print $1}'`
     ${loginctl} terminate-session $session
   '';
-  colors = with pkgs.rice; palette.toARGBHex rec {
+  colors = with pkgs.lib.rice; palette.toARGBHex rec {
 
     normal = {
       foreground = colorPalette.normal.white;
diff --git a/home_manager/modules/pro_audio.nix b/home_manager/modules/pro_audio.nix
index c40523c..b561e2b 100644
--- a/home_manager/modules/pro_audio.nix
+++ b/home_manager/modules/pro_audio.nix
@@ -14,7 +14,8 @@ in
     carla
     rnnoise
     ardour
-    unstable.zrythm unstable.breeze-icons
+    unstable.zrythm
+    unstable.breeze-icons
     mixxx
 
     # Plugins
@@ -24,7 +25,7 @@ in
     unstable.cardinal
     geonkick
     helm
-    (lsp-plugins.overrideAttrs (old: { version = "1.2.0"; }))
+    lsp-plugins
     # noise-repellent
     samplv1
     # speech-denoiser
diff --git a/home_manager/modules/rofi.nix b/home_manager/modules/rofi.nix
index dc82311..e59f498 100644
--- a/home_manager/modules/rofi.nix
+++ b/home_manager/modules/rofi.nix
@@ -12,10 +12,10 @@
   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 "onedark"
diff --git a/home_manager/modules/shell_aliases.nix b/home_manager/modules/shell_aliases.nix
index 1f992bb..f98f430 100644
--- a/home_manager/modules/shell_aliases.nix
+++ b/home_manager/modules/shell_aliases.nix
@@ -1,6 +1,5 @@
-{ pkgs, ... }:
-let
-  shellAliases = {
+{
+  home.shellAliases = {
     "dkc" = "docker-compose";
     "dk" = "docker";
     "hm" = "home-manager";
@@ -13,9 +12,6 @@ let
     "sc" = "sudo systemctl";
     "scu" = "systemctl --user";
   };
-in
-{
-  home = { inherit shellAliases; };
   # programs.bash = { inherit shellAliases; };
   # programs.zsh = { inherit shellAliases; };
 }
diff --git a/home_manager/modules/sxhkd.nix b/home_manager/modules/sxhkd.nix
index b09b771..12bab42 100644
--- a/home_manager/modules/sxhkd.nix
+++ b/home_manager/modules/sxhkd.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   imports = [ ./thunar.nix ];
   home.packages = with pkgs; [
diff --git a/home_manager/modules/terminator.nix b/home_manager/modules/terminator.nix
index b9bbb6c..eb73588 100644
--- a/home_manager/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/update_background.nix b/home_manager/modules/update_background.nix
index bf7a80f..5a8a556 100644
--- a/home_manager/modules/update_background.nix
+++ b/home_manager/modules/update_background.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 let
   update_time = "10m";
 in
diff --git a/home_manager/modules/webapp.nix b/home_manager/modules/webapp.nix
index b576563..5d083cf 100644
--- a/home_manager/modules/webapp.nix
+++ b/home_manager/modules/webapp.nix
@@ -3,13 +3,13 @@
 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 = "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" ]; }
diff --git a/home_manager/modules/zathura.nix b/home_manager/modules/zathura.nix
index 94c67c4..e41559b 100644
--- a/home_manager/modules/zathura.nix
+++ b/home_manager/modules/zathura.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 let
-  strPalette = with pkgs.rice; palette.toRgbHex colorPalette;
+  strPalette = pkgs.lib.rice.palette.toRgbHex pkgs.rice.colorPalette;
 in
 {
   programs.zathura = {
diff --git a/home_manager/modules/zoxide.nix b/home_manager/modules/zoxide.nix
index 560e415..111c8bf 100644
--- a/home_manager/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/home_manager/odin.nix b/home_manager/odin.nix
index 55215a3..32af8c4 100644
--- a/home_manager/odin.nix
+++ b/home_manager/odin.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   home = {
     language.base = "it_IT.UTF-8";
diff --git a/home_manager/thor.nix b/home_manager/thor.nix
index c10ba0f..1d2e48c 100644
--- a/home_manager/thor.nix
+++ b/home_manager/thor.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   home = {
     language.base = "it_IT.UTF-8";
diff --git a/loki/hardware-configuration.nix b/loki/hardware-configuration.nix
index b96a203..a114627 100644
--- a/loki/hardware-configuration.nix
+++ b/loki/hardware-configuration.nix
@@ -1,7 +1,7 @@
 # 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, pkgs, modulesPath, ... }:
+{ modulesPath, ... }:
 
 {
   imports = [
diff --git a/nixos_modules/big_data.nix b/nixos_modules/big_data.nix
index 9c88a2b..5e38d21 100644
--- a/nixos_modules/big_data.nix
+++ b/nixos_modules/big_data.nix
@@ -1,22 +1,22 @@
 { 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 ];
@@ -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
     '';
@@ -198,9 +198,9 @@ in
       httpfsSite = {
         "kerberos.realm" = "MY.ENGINE";
         "httpfs.authentication.type" = "kerberos";
-        "httpfs.authentication.kerberos.principal	" = "HTTP/my.engine@MY.ENGINE";
+        "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.principal  " = "HTTP/my.engine@MY.ENGINE";
         "httpfs.hadoop.kerberos.keytab" = hadoop_keytab_path;
       };
       extraConfDirs = [ ];
diff --git a/nixos_modules/mind.nix b/nixos_modules/mind.nix
index dda7a42..c167458 100644
--- a/nixos_modules/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_modules/pentablet.nix b/nixos_modules/pentablet.nix
index 98e2995..a39911a 100644
--- a/nixos_modules/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_modules/pro_audio.nix b/nixos_modules/pro_audio.nix
index fd2f706..d0e0259 100644
--- a/nixos_modules/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/odin/configuration-nvidia.nix b/odin/configuration-nvidia.nix
index 0408c8c..e442b7c 100644
--- a/odin/configuration-nvidia.nix
+++ b/odin/configuration-nvidia.nix
@@ -2,7 +2,7 @@
 # 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, ... }:
 
 {
   boot.initrd.kernelModules = [ "i915" ];
diff --git a/odin/hardware-configuration.nix b/odin/hardware-configuration.nix
index ac9276d..9dac5dd 100644
--- a/odin/hardware-configuration.nix
+++ b/odin/hardware-configuration.nix
@@ -1,11 +1,12 @@
 # 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, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "sd_mod" ];
@@ -14,73 +15,83 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c";
+    {
+      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";
+    {
+      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";
+    {
+      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";
+    {
+      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";
+    {
+      device = "/dev/disk/by-uuid/82DB-3444";
       fsType = "vfat";
     };
 
   fileSystems."/home/bertof/Musica" =
-    { device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c";
+    {
+      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";
+    {
+      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";
+    {
+      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";
+    {
+      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";
+    {
+      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";
+    {
+      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"; }
-    ];
+    [{ 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/rice.nix b/rice.nix
index dc3c68d..484a483 100644
--- a/rice.nix
+++ b/rice.nix
@@ -1,19 +1,13 @@
 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);
-  tomorrow-night = with nix-rice; palette.tPalette color.hexToRgba (import ./themes/tomorrow-night.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);
 in
 (
   rec {
-    rice = nix-rice // {
-      colorPalette = with nix-rice; rec {
+    rice = {
+      colorPalette = with prev.lib.rice; palette.defaultPalette // rec {
         normal = {
           black = onedark.black;
           blue = onedark.blue;
@@ -32,12 +26,14 @@ in
           # red = nord.n12;
           # white = nord.n6;
         };
-        dark = palette.darken 10 normal // {
-          # black = nord.n0;
-          # blue = nord.n3;
-          # cyan = nord.n7;
-          # white = nord.n4;
-        };
+        dark = palette.darken 10 normal
+          # // {
+          #   # black = nord.n0;
+          #   # blue = nord.n3;
+          #   # cyan = nord.n7;
+          #   # white = nord.n4;
+          # }
+        ;
       };
       font = {
         normal = {
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/thor/configuration.nix b/thor/configuration.nix
index ef466db..4b4d95f 100644
--- a/thor/configuration.nix
+++ b/thor/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, ... }:
 {
   boot = {
     binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ];
diff --git a/thor/hardware-configuration.nix b/thor/hardware-configuration.nix
index ea39319..09029cb 100644
--- a/thor/hardware-configuration.nix
+++ b/thor/hardware-configuration.nix
@@ -1,11 +1,12 @@
 # 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, pkgs, modulesPath, ... }:
+{ modulesPath, ... }:
 
 {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
@@ -14,30 +15,33 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/6c06428e-c296-4ef1-8429-62bafb860126";
+    {
+      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";
+    {
+      device = "/dev/disk/by-uuid/B9D2-255C";
       fsType = "vfat";
     };
 
   fileSystems."/home/bertof" =
-    { device = "/dev/disk/by-uuid/6c06428e-c296-4ef1-8429-62bafb860126";
+    {
+      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";
+    {
+      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"; }
-    ];
+    [{ device = "/dev/disk/by-uuid/dee188e4-4ff8-417c-9419-b7f00ecb9989"; }];
 
 }