home/default.nix

@@ -1,10 +1,85 @@
 {
-  imports = [
+  lib,
-    ./languages
+  pkgs,
-    ./tools
+  emacs-larstvei,
-  ];
+  ...
+}:
+let
+  concatAttrVals = attrSet: lib.concatMap (x: x) (lib.attrValues attrSet);
+  tools = import ./tools {
+    inherit pkgs;
+    inherit emacs-larstvei;
+  };
+  languages = import ./languages { inherit pkgs; };
+in
+{
+  home.packages = concatAttrVals languages ++ concatAttrVals tools;
 
-  programs.home-manager.enable = true;
+  home.file.".config/enchant/hunspell/".source = "${pkgs.hunspellDicts.nb_NO}/share/hunspell/";
+
+  programs = {
+    fzf = {
+      enable = true;
+      enableFishIntegration = true;
+    };
+
+    fish = {
+      enable = true;
+
+      functions = {
+        track_directories = {
+          description = "For directory tracking in emacs vterm";
+          onEvent = "fish_postexec";
+          body = "printf \'\\e]51;A\'(pwd)\'\\e\\\\\'";
+        };
+      };
+
+      shellInit = ''
+        if test "$TERM" != "dumb"
+            track_directories
+        end
+        set -gx DIRENV_LOG_FORMAT ""
+      '';
+    };
+
+    starship = {
+      enable = true;
+      settings = {
+        custom = {
+          direnv = {
+            format = "[\\[direnv\\]]($style) ";
+            when = "env | grep -E '^DIRENV_FILE='";
+          };
+        };
+        character = {
+          success_symbol = "[λ](bold green)";
+          error_symbol = "[λ](bold red)";
+        };
+      };
+    };
+
+    git = {
+      enable = true;
+      userName = "larstvei";
+      userEmail = "larstvei@ifi.uio.no";
+      ignores = [
+        ".envrc"
+        ".DS_Store"
+        ".direnv"
+      ];
+    };
+
+    direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+    };
+
+    # Sets JAVA_HOME environment variable
+    java.enable = true;
+
+    # Let Home Manager install and manage itself.
+    home-manager.enable = true;
+  };
 
   # This value determines the Home Manager release that your
   # configuration is compatible with. This helps avoid breakage

home/fonts/default.nix

@@ -1,9 +1,8 @@
-{ pkgs, ... }:
+{ pkgs }:
-{
+with pkgs;
-  fonts.packages = with pkgs; [
+[
   iosevka
   source-code-pro
   source-sans
   source-serif
-  ];
+]
-}

home/languages/bqn/default.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    cbqn
-  ];
-}

home/languages/c/default.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    gcc
-  ];
-}

home/languages/clojure/default.nix

@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    babashka
-    clj-kondo
-    clojure
-    leiningen
-    neil
-  ];
-}

home/languages/default.nix

@@ -1,18 +1,91 @@
+{ pkgs, ... }:
+with pkgs;
 {
-  imports = [
+  bqn = [
-    ./bqn
+    cbqn
-    ./c
+  ];
-    ./clojure
+
-    ./go
+  c = [ gcc ];
-    ./haskell
+
-    ./java
+  clojure = [
-    ./maude
+    babashka
-    ./minizinc
+    clj-kondo
-    ./nix
+    clojure
-    ./python
+    leiningen
-    ./rust
+    neil
-    ./scheme
+  ];
-    ./tex
+
-    ./zig
+  go = [
+    go
+    gopls
+  ];
+
+  haskell = [
+    (haskell.packages.ghc96.ghcWithPackages (
+      ps: with ps; [
+        QuickCheck
+      ]
+    ))
+    cabal-install
+    stack
+  ];
+
+  java = [
+    jdk
+    jdt-language-server
+  ];
+
+  maude = [
+    maude
+  ];
+
+  minizinc = [
+    minizinc
+  ];
+
+  nix = [
+    nil
+    nixfmt-rfc-style
+  ];
+
+  python = [
+    (python3.withPackages (
+      python-packages: with python-packages; [
+        graphviz
+        html2text
+        hypothesis
+        matplotlib
+        numpy
+        openpyxl
+        pandas
+        pygments
+        python-lsp-server
+        scikit-learn
+        scipy
+        xlsxwriter
+        yattag
+        z3
+      ]
+    ))
+  ];
+
+  rust = [
+    cargo
+    rustc
+    rustfmt
+    rust-analyzer
+  ];
+
+  scheme = [
+    gambit
+  ];
+
+  tex = [
+    texliveFull
+  ];
+
+  zig = [
+    zig
+    zls
   ];
 }

home/languages/go/default.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    go
-    gopls
-  ];
-}

home/languages/haskell/default.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    (haskell.packages.ghc96.ghcWithPackages (
-      ps: with ps; [
-        QuickCheck
-      ]
-    ))
-    cabal-install
-    stack
-  ];
-}

home/languages/java/default.nix

@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  # Sets JAVA_HOME environment variable
-  programs.java.enable = true;
-
-  home.packages = with pkgs; [
-    jdk
-    jdt-language-server
-  ];
-}

home/languages/maude/default.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    maude
-  ];
-}

home/languages/minizinc/default.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    minizinc
-  ];
-}

home/languages/nix/default.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    nil
-    nixfmt-rfc-style
-  ];
-}

home/languages/python/default.nix

@@ -1,23 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    (python3.withPackages (
-      python-packages: with python-packages; [
-        graphviz
-        html2text
-        hypothesis
-        matplotlib
-        numpy
-        openpyxl
-        pandas
-        pygments
-        python-lsp-server
-        scikit-learn
-        scipy
-        xlsxwriter
-        yattag
-        z3
-      ]
-    ))
-  ];
-}

home/languages/rust/default.nix

@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    cargo
-    rustc
-    rustfmt
-    rust-analyzer
-  ];
-}

home/languages/scheme/default.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    gambit
-  ];
-}

home/languages/tex/default.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    texliveFull
-  ];
-}

home/languages/zig/default.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    zig
-    zls
-  ];
-}

home/tools/academic/default.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    zotero
-  ];
-}

home/tools/default.nix

@@ -1,12 +1,64 @@
+{ pkgs, emacs-larstvei, ... }:
+let
+  # Ghostscript has a name collision with gambit (scheme). Let's nuke the
+  # offending binary, as gsc most likely unused on my system.
+  ghostscriptNoGsc = pkgs.symlinkJoin {
+    name = "ghostscript-no-gsc";
+    paths = [ pkgs.ghostscript ];
+    postBuild = ''
+      rm -f $out/bin/gsc
+    '';
+  };
+in
+with pkgs;
 {
-  imports = [
+
-    ./academic
+  editor = [
-    ./editor
+    emacs-larstvei.defaultPackage.${pkgs.system}
-    ./git
+  ];
-    ./learning
+
-    ./multimedia
+  spelling = [
-    ./shell
+    hunspell
-    ./spelling
+    hunspellDicts.en_US
-    ./utils
+    hunspellDicts.nb_NO
+  ];
+
+  # terminal = [
+  #   ghostty
+  # ];
+
+  modernReplacements = [
+    bat
+    fd
+    ripgrep
+  ];
+
+  utils = [
+    gnumake
+    jet
+    jq
+    pandoc
+    parallel
+    tokei
+    wget
+  ];
+
+  multimedia = [
+    dot2tex
+    ffmpeg
+    ghostscriptNoGsc
+    graphviz
+    imagemagick
+    inkscape
+    pdf2svg
+    poppler_utils
+  ];
+
+  academic = [
+    zotero
+  ];
+
+  learning = [
+    exercism
   ];
 }

home/tools/editor/default.nix

@@ -1,6 +0,0 @@
-{ pkgs, emacs-larstvei, ... }:
-{
-  home.packages = [
-    emacs-larstvei.defaultPackage.${pkgs.system}
-  ];
-}

home/tools/git/default.nix

@@ -1,12 +0,0 @@
-{
-  programs.git = {
-    enable = true;
-    userName = "larstvei";
-    userEmail = "larstvei@ifi.uio.no";
-    ignores = [
-      ".envrc"
-      ".DS_Store"
-      ".direnv"
-    ];
-  };
-}

home/tools/learning/default.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    exercism
-  ];
-}

home/tools/multimedia/default.nix

@@ -1,24 +0,0 @@
-{ pkgs, ... }:
-let
-  # Ghostscript has a name collision with gambit (scheme). Let's nuke the
-  # offending binary, as gsc most likely unused on my system.
-  ghostscriptNoGsc = pkgs.symlinkJoin {
-    name = "ghostscript-no-gsc";
-    paths = [ pkgs.ghostscript ];
-    postBuild = ''
-      rm -f $out/bin/gsc
-    '';
-  };
-in
-{
-  home.packages = with pkgs; [
-    dot2tex
-    ffmpeg
-    ghostscriptNoGsc
-    graphviz
-    imagemagick
-    inkscape
-    pdf2svg
-    poppler_utils
-  ];
-}

home/tools/shell/default.nix

@@ -1,48 +0,0 @@
-{
-  programs = {
-    fish = {
-      enable = true;
-
-      functions = {
-        track_directories = {
-          description = "For directory tracking in emacs vterm";
-          onEvent = "fish_postexec";
-          body = "printf \'\\e]51;A\'(pwd)\'\\e\\\\\'";
-        };
-      };
-
-      shellInit = ''
-        if test "$TERM" != "dumb"
-            track_directories
-        end
-        set -gx DIRENV_LOG_FORMAT ""
-      '';
-    };
-
-    fzf = {
-      enable = true;
-      enableFishIntegration = true;
-    };
-
-    direnv = {
-      enable = true;
-      nix-direnv.enable = true;
-    };
-
-    starship = {
-      enable = true;
-      settings = {
-        custom = {
-          direnv = {
-            format = "[\\[direnv\\]]($style) ";
-            when = "test -n \"$DIRENV_FILE\"";
-          };
-        };
-        character = {
-          success_symbol = "[λ](bold green)";
-          error_symbol = "[λ](bold red)";
-        };
-      };
-    };
-  };
-}

home/tools/spelling/default.nix

@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    hunspell
-    hunspellDicts.en_US
-    hunspellDicts.nb_NO
-  ];
-
-  home.file.".config/enchant/hunspell/".source = "${pkgs.hunspellDicts.nb_NO}/share/hunspell/";
-}

home/tools/utils/default.nix

@@ -1,15 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    bat
-    fd
-    gnumake
-    jet
-    jq
-    pandoc
-    parallel
-    ripgrep
-    tokei
-    wget
-  ];
-}

system/darwin/default.nix

@@ -1,9 +1,7 @@
 { pkgs, ... }:
 {
 
-  imports = [
+  fonts.packages = import ../../home/fonts { inherit pkgs; };
-    ../../home/fonts
-  ];
 
   nix.linux-builder.enable = true;
 

system/nixos/default.nix

@@ -1,11 +1,8 @@
 { pkgs, ... }:
 {
 
-  imports = [
-    ../../home/fonts
-  ];
-
   fonts = {
+    packages = import ../../home/fonts { inherit pkgs; };
     fontconfig = {
       enable = true;
       defaultFonts = {