Modules + configs update

home.nix

@@ -1,6 +1,8 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
-let unstable = import <nixos-unstable> {};
+let
+  unstable = import <nixos-unstable> {};
+  colorscheme.theme = import ./packages/nord.nix;
 in {
   fonts.fontconfig = {
     enable = true;
@@ -12,88 +14,35 @@ in {
     keyboard.options = ["terminate:ctrl_alt_bksp" "compose:rctrl"];
     packages = with pkgs; [
       nerdfonts
+			spotify
+			gnome3.nautilus
+ 			procps-ng
+ 			mmv-go
     ];
   };
 
   programs = {
-    alacritty = {
-      enable = false;
-      settings = import ./alacritty.nix;
-    };
+    # alacritty = import ./modules/alacritty.nix pkgs;
 
-    bat = {
-      enable = true;
-      config = {
-        theme = "Nord";
-      };
-    };
+    bat = { enable = true; config.theme = "Nord"; };
 
     command-not-found.enable = true;
 
-    broot = {
-      enable = true;
-      enableBashIntegration = true;
-      enableZshIntegration = true;
-    };
+    broot = { enable = true; enableBashIntegration = true; enableZshIntegration = true; };
 
-    dircolors = {
-      enable = true;
-      enableBashIntegration = true;
-      enableZshIntegration = true;
-    };
+    dircolors = { enable = true; enableBashIntegration = true; enableZshIntegration = true; };
 
-    direnv = {
-			enable = true;
-			enableBashIntegration = true;
-			enableZshIntegration = true;
-			enableNixDirenvIntegration = true;
-    };
+    direnv = { enable = true; enableBashIntegration = true; enableZshIntegration = true; enableNixDirenvIntegration = true; };
 
-    git =
-		let kakouneCommand = "${pkgs.kakoune}/bin/kak";
-				meldCommand = "${pkgs.meld}/bin/meld";
-    in {
-      enable = true;
-      userName = "Filippo Berto";
-      userEmail = "berto.f@protonmail.com";
-      signing = {
-        key = "berto.f@protonmail.com";
-        signByDefault = true;
-      };
-      extraConfig = {
-				core.editor = kakouneCommand;
-				credential.helper = "cache --timeout=3600";
-				diff.guitool = meldCommand;
-				merge.guitool = meldCommand;
-				pull.rebase = true;
-				rebase.autostash = true;
-				init.defaultBranch = "master";
-			};
-			lfs.enable = true;
-			delta.enable = true;
-		};
+		git = import ./modules/git.nix pkgs;
 
 		home-manager.enable = true;
 
 		info.enable = true;
 
-		kakoune = {
-			enable = true;
-			config = import ./kakoune.nix pkgs;
-			extraConfig = builtins.concatStringsSep "\n" [
-				"# Extra"
-				"define-command -docstring 'save and quit' x 'write-all; quit'"
-				"add-highlighter global/ regex \\h+$ 0:Error"
-				"eval %sh{kak-lsp --kakoune -s \$kak_session}"
-				"require-module auto-pairs"
-				"require-module powerline"
-	   	];
-			plugins = with pkgs; [
-				kakounePlugins.kak-auto-pairs
-				unstable.kakounePlugins.powerline-kak
-				unstable.kakounePlugins.prelude-kak
-			];
-		};
+		kakoune = import ./modules/kakoune.nix pkgs;
+
+		rofi = import ./modules/rofi.nix pkgs;
 
     zsh = {
       enableVteIntegration = true;
@@ -105,6 +54,10 @@ in {
     platformTheme = "gtk";
   };
 
+  services = {
+			# sxhkd = import ./modules/sxhkd.nix pkgs;
+  };
+
   xsession.numlock.enable = true;
 }