Split user config in more files

users/default.nix

@@ -4,7 +4,15 @@
   environment.pathsToLink = [ "/share/zsh" ];
   home-manager.users.froidmpa = { pkgs, config, ... }: {
 
-    imports = [ ./froidmpa/alacritty.nix ];
+    imports = [
+      ./froidmpa/alacritty.nix
+      ./froidmpa/neovim.nix
+      ./froidmpa/mpd.nix
+      ./froidmpa/dunst.nix
+      ./froidmpa/htop.nix
+      ./froidmpa/zsh.nix
+      ./froidmpa/vscode.nix
+    ];
 
     nixpkgs.config = {
       allowUnfree = true;
@@ -35,7 +43,6 @@
         enableSshSupport = false;
         pinentryFlavor = "gtk2";
       };
-      mpd = import ./froidmpa/mpd.nix { inherit config; };
       stalonetray = {
         enable = true;
         config = {
@@ -50,7 +57,6 @@
       };
       unclutter.enable = true;
       pasystray.enable = true;
-      dunst = import ./froidmpa/dunst.nix { };
       screen-locker = {
         enable = true;
         inactiveInterval = 5;
@@ -77,107 +83,22 @@
         theme = "gruvbox-dark";
         terminal = "alacritty";
       };
-      neovim = import ./froidmpa/neovim.nix { inherit pkgs; };
       bat.enable = true;
       jq.enable = true;
       fzf.enable = true;
       lesspipe.enable = true;
       zathura.enable = true;
       pazi.enable = true;
-      htop = {
+
-        enable = true;
-        settings = {
-          hide_userland_threads = true;
-          highlight_base_name = true;
-          vim_mode = true;
-          fields = with config.lib.htop.fields;[
-            PID
-            USER
-            M_RESIDENT
-            M_SHARE
-            STATE
-            PERCENT_CPU
-            PERCENT_MEM
-            IO_RATE
-            TIME
-            COMM
-          ];
-        } // (
-          with config.lib.htop; leftMeters [
-            (bar "LeftCPUs2")
-            (bar "CPU")
-            (bar "Memory")
-            (bar "Swap")
-          ]
-        ) // (
-          with config.lib.htop; rightMeters [
-            (bar "RightCPUs2")
-            (text "Tasks")
-            (text "LoadAverage")
-            (text "Uptime")
-          ]
-        );
-      };
       broot = {
         enable = true;
         enableZshIntegration = true;
       };
       command-not-found.enable = true;
-      zsh = import ./froidmpa/zsh.nix { inherit pkgs; };
       direnv = {
         enable = true;
         enableZshIntegration = true;
         nix-direnv.enable = true;
-
-      };
-      vscode = {
-        enable = true;
-        package = pkgs.vscodium;
-        extensions = (
-          with pkgs.vscode-extensions; [
-            pkief.material-icon-theme
-            jnoortheen.nix-ide
-            arrterian.nix-env-selector
-            scala-lang.scala
-            scalameta.metals
-            hashicorp.terraform
-            bradlc.vscode-tailwindcss
-          ]
-        );
-        userSettings = {
-          "editor.formatOnSave" = true;
-          "editor.quickSuggestions" = {
-            "strings" = true;
-          };
-          "tailwindCSS.includeLanguages" = {
-            "scala" = "html";
-          };
-          "tailwindCSS.experimental.classRegex" = [
-            [ "cls\\(([^)]*)\\)" "\"([^']*)\"" ]
-          ];
-
-          "files.autoSave" = "onFocusChange";
-          "files.watcherExclude" = {
-            "**/.bloop" = true;
-            "**/.metals" = true;
-            "**/.ammonite" = true;
-          };
-          "gruvboxMaterial.darkContrast" = "hard";
-          "metals.millScript" = "mill";
-          "nix.enableLanguageServer" = true;
-          "terminal.integrated.confirmOnExit" = "hasChildProcesses";
-          "terraform.languageServer" = {
-            "external" = true;
-            "pathToBinary" = "";
-            "args" = [
-              "serve"
-            ];
-            "maxNumberOfProblems" = 100;
-            "trace.server" = "off";
-          };
-          "workbench.colorTheme" = "Gruvbox Material Dark";
-          "workbench.iconTheme" = "material-icon-theme";
-        };
       };
     };
 

users/froidmpa/dunst.nix

@@ -1,44 +1,47 @@
-{}:
+{ config, lib, pkgs, ... }:
 {
-  enable = true;
+  services.dunst =
-  settings = {
+    {
-    global = {
+      enable = true;
-      monitor = 0;
+      settings = {
-      geometry = "350x5-30+50";
+        global = {
-      transparency = 10;
+          monitor = 0;
-      font = "monospace 14";
+          geometry = "350x5-30+50";
-      idle_threshold = 120;
+          transparency = 10;
-      allow_markup = "yes";
+          font = "monospace 14";
-      format = "<b>%s</b>\n%b";
+          idle_threshold = 120;
-      show_age_threshold = 300;
+          allow_markup = "yes";
-      word_wrap = "yes";
+          format = "<b>%s</b>\n%b";
-      sticky_history = "yes";
+          show_age_threshold = 300;
-      sort = "yes";
+          word_wrap = "yes";
+          sticky_history = "yes";
+          sort = "yes";
+        };
+        frame = {
+          width = 3;
+          color = "#ebdbb2";
+        };
+        shortcuts = {
+          close = "ctrl+space";
+          close_all = "ctrl+shift+space";
+          history = "ctrl+grave";
+          context = "ctrl+shift+period";
+        };
+        urgency_low = {
+          foreground = "#ebdbb2";
+          background = "#32302f";
+          timeout = 10;
+        };
+        urgency_normal = {
+          foreground = "#ebdbb2";
+          background = "#32302f";
+          timeout = 10;
+        };
+        urgency_critical = {
+          foreground = "#ebdbb2";
+          background = "#32302f";
+          timeout = 10;
+        };
+      };
     };
-    frame = {
-      width = 3;
-      color = "#ebdbb2";
-    };
-    shortcuts = {
-      close = "ctrl+space";
-      close_all = "ctrl+shift+space";
-      history = "ctrl+grave";
-      context = "ctrl+shift+period";
-    };
-    urgency_low = {
-      foreground = "#ebdbb2";
-      background = "#32302f";
-      timeout = 10;
-    };
-    urgency_normal = {
-      foreground = "#ebdbb2";
-      background = "#32302f";
-      timeout = 10;
-    };
-    urgency_critical = {
-      foreground = "#ebdbb2";
-      background = "#32302f";
-      timeout = 10;
-    };
-  };
 }

users/froidmpa/htop.nix

@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+{
+  programs.htop = {
+    enable = true;
+    settings = {
+      hide_userland_threads = true;
+      highlight_base_name = true;
+      vim_mode = true;
+      fields = with config.lib.htop.fields;[
+        PID
+        USER
+        M_RESIDENT
+        M_SHARE
+        STATE
+        PERCENT_CPU
+        PERCENT_MEM
+        IO_RATE
+        TIME
+        COMM
+      ];
+    } // (
+      with config.lib.htop; leftMeters [
+        (bar "LeftCPUs2")
+        (bar "CPU")
+        (bar "Memory")
+        (bar "Swap")
+      ]
+    ) // (
+      with config.lib.htop; rightMeters [
+        (bar "RightCPUs2")
+        (text "Tasks")
+        (text "LoadAverage")
+        (text "Uptime")
+      ]
+    );
+  };
+}

users/froidmpa/mpd.nix

@@ -1,23 +1,26 @@
-{ config, ... }:
+{ config, lib, pkgs, ... }:
 {
-  enable = true;
+  services.mpd =
-  network.listenAddress = "any";
+    {
-  musicDirectory = "${config.home.homeDirectory}/Nextcloud/Media/Music";
+      enable = true;
-  playlistDirectory = "${config.home.homeDirectory}/Nextcloud/Playlists";
+      network.listenAddress = "any";
-  extraConfig = ''
+      musicDirectory = "${config.home.homeDirectory}/Nextcloud/Media/Music";
-    max_output_buffer_size "16384"
+      playlistDirectory = "${config.home.homeDirectory}/Nextcloud/Playlists";
-    auto_update "yes"
+      extraConfig = ''
-    audio_output {
+        max_output_buffer_size "16384"
-        type  "pulse"
+        auto_update "yes"
-        name  "pulse audio"
+        audio_output {
-        device         "pulse"
+            type  "pulse"
-        mixer_type      "hardware"
+            name  "pulse audio"
-    }
+            device         "pulse"
-    audio_output {
+            mixer_type      "hardware"
-        type            "fifo"
+        }
-        name            "toggle_visualizer"
+        audio_output {
-        path            "/tmp/mpd.fifo"
+            type            "fifo"
-        format          "44100:16:2"
+            name            "toggle_visualizer"
-    }
+            path            "/tmp/mpd.fifo"
-  '';
+            format          "44100:16:2"
+        }
+      '';
+    };
 }

users/froidmpa/neovim.nix

@@ -1,33 +1,35 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
-  enable = true;
+  programs.neovim = {
-  vimAlias = true;
+    enable = true;
-  plugins = with pkgs; [
+    vimAlias = true;
-    vimPlugins.gruvbox-community
+    plugins = with pkgs; [
-    vimPlugins.vim-airline
+      vimPlugins.gruvbox-community
-    vimPlugins.vim-airline-themes
+      vimPlugins.vim-airline
-    vimPlugins.vim-gitgutter
+      vimPlugins.vim-airline-themes
-    vimPlugins.nerdtree
+      vimPlugins.vim-gitgutter
-    vimPlugins.nerdtree-git-plugin
+      vimPlugins.nerdtree
-    vimPlugins.ctrlp-vim
+      vimPlugins.nerdtree-git-plugin
-    vimPlugins.tabular
+      vimPlugins.ctrlp-vim
-  ];
+      vimPlugins.tabular
-  extraConfig = ''
+    ];
-    let g:gruvbox_italic=1
+    extraConfig = ''
-    colorscheme gruvbox
+      let g:gruvbox_italic=1
-    set background=dark
+      colorscheme gruvbox
-    let g:airline_powerline_fonts = 1
+      set background=dark
-    autocmd VimEnter * hi Normal ctermbg=NONE guibg=NONE
+      let g:airline_powerline_fonts = 1
+      autocmd VimEnter * hi Normal ctermbg=NONE guibg=NONE
 
-    "Toggle NERDTree with Ctrl-N
+      "Toggle NERDTree with Ctrl-N
-    map <C-n> :NERDTreeToggle<CR>
+      map <C-n> :NERDTreeToggle<CR>
 
-    "Show hidden files in NERDTree
+      "Show hidden files in NERDTree
-    let NERDTreeShowHidden=1
+      let NERDTreeShowHidden=1
 
-    set number relativenumber
+      set number relativenumber
 
-    " Run xrdb whenever Xdefaults or Xresources are updated.
+      " Run xrdb whenever Xdefaults or Xresources are updated.
-    autocmd BufWritePost ~/.Xresources,~/.Xdefaults !xrdb %
+      autocmd BufWritePost ~/.Xresources,~/.Xdefaults !xrdb %
-  '';
+    '';
+  };
 }

users/froidmpa/vscode.nix

@@ -0,0 +1,52 @@
+{ config, lib, pkgs, ... }:
+{
+  programs.vscode = {
+    enable = true;
+    package = pkgs.vscodium;
+    extensions = (
+      with pkgs.vscode-extensions; [
+        pkief.material-icon-theme
+        jnoortheen.nix-ide
+        arrterian.nix-env-selector
+        scala-lang.scala
+        scalameta.metals
+        hashicorp.terraform
+        bradlc.vscode-tailwindcss
+      ]
+    );
+    userSettings = {
+      "editor.formatOnSave" = true;
+      "editor.quickSuggestions" = {
+        "strings" = true;
+      };
+      "tailwindCSS.includeLanguages" = {
+        "scala" = "html";
+      };
+      "tailwindCSS.experimental.classRegex" = [
+        [ "cls\\(([^)]*)\\)" "\"([^']*)\"" ]
+      ];
+
+      "files.autoSave" = "onFocusChange";
+      "files.watcherExclude" = {
+        "**/.bloop" = true;
+        "**/.metals" = true;
+        "**/.ammonite" = true;
+      };
+      "gruvboxMaterial.darkContrast" = "hard";
+      "metals.millScript" = "mill";
+      "nix.enableLanguageServer" = true;
+      "terminal.integrated.confirmOnExit" = "hasChildProcesses";
+      "terraform.languageServer" = {
+        "external" = true;
+        "pathToBinary" = "";
+        "args" = [
+          "serve"
+        ];
+        "maxNumberOfProblems" = 100;
+        "trace.server" = "off";
+      };
+      "workbench.colorTheme" = "Gruvbox Material Dark";
+      "workbench.iconTheme" = "material-icon-theme";
+    };
+  };
+}

users/froidmpa/zsh.nix

@@ -1,39 +1,42 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
-  enable = true;
+  programs.zsh =
-  history = {
-    save = 50000;
-    size = 50000;
-  };
-  enableCompletion = true;
-  enableAutosuggestions = true;
-  enableSyntaxHighlighting = true;
-  initExtra = ''
-    autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
-    zle -N up-line-or-beginning-search
-    zle -N down-line-or-beginning-search
-
-    [[ -n "$key[Up]"   ]] && bindkey -- "$key[Up]"   up-line-or-beginning-search
-    [[ -n "$key[Down]" ]] && bindkey -- "$key[Down]" down-line-or-beginning-search
-
-    eval $(thefuck --alias)
-  '';
-  oh-my-zsh = {
-    enable = true;
-    plugins = [
-      "git"
-      "terraform"
-    ];
-    theme = "robbyrussell";
-  };
-  plugins = [
     {
-      name = "nix-zsh-completions";
+      enable = true;
-      src = pkgs.nix-zsh-completions;
+      history = {
-    }
+        save = 50000;
-    {
+        size = 50000;
-      name = "zsh-completions";
+      };
-      src = pkgs.zsh-completions;
+      enableCompletion = true;
-    }
+      enableAutosuggestions = true;
-  ];
+      enableSyntaxHighlighting = true;
+      initExtra = ''
+        autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
+        zle -N up-line-or-beginning-search
+        zle -N down-line-or-beginning-search
+
+        [[ -n "$key[Up]"   ]] && bindkey -- "$key[Up]"   up-line-or-beginning-search
+        [[ -n "$key[Down]" ]] && bindkey -- "$key[Down]" down-line-or-beginning-search
+
+        eval $(thefuck --alias)
+      '';
+      oh-my-zsh = {
+        enable = true;
+        plugins = [
+          "git"
+          "terraform"
+        ];
+        theme = "robbyrussell";
+      };
+      plugins = [
+        {
+          name = "nix-zsh-completions";
+          src = pkgs.nix-zsh-completions;
+        }
+        {
+          name = "zsh-completions";
+          src = pkgs.zsh-completions;
+        }
+      ];
+    };
 }