Refactoring

flake.nix

@@ -49,12 +49,10 @@
           services.nix-daemon.enable = true;
 
           nixpkgs = {
+
             config.allpwUnfree = true;
-            overlays =
+
-              let
+            overlays = with inputs; [
-                versionOf = input: input.rev;
-              in
-                with inputs; [
               (final: prev: {
                 emacs-mac = (prev.emacs.override {
                   srcRepo = true;
@@ -70,7 +68,6 @@
                     ./patches/my-no-titlebar.patch
                     ./patches/system-appearance.patch
                   ];
-
                 });
               })
             ];

modules/home.nix

@@ -3,13 +3,15 @@
   # Can probably be removed when this is resolved:
   # https://github.com/nix-community/home-manager/issues/1341
   home.activation = {
-    copyApplications = let
+    copyApplications =
+      let
         apps = pkgs.buildEnv {
           name = "home-manager-applications";
           paths = config.home.packages;
           pathsToLink = "/Applications";
         };
-    in lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+      in
+      lib.hm.dag.entryAfter [ "writeBoundary" ] ''
         baseDir="$HOME/Applications/Home Manager Apps"
         if [ -d "$baseDir" ]; then
           rm -rf "$baseDir"
@@ -25,35 +27,45 @@
 
   home.packages = with pkgs; [
     ((emacsPackagesFor emacs-mac).emacsWithPackages
-      (epkgs: [
+      (epkgs: with epkgs; [
-        epkgs.vterm
+        vterm
-        epkgs.pdf-tools
+        pdf-tools
+      ]))
+    (aspellWithDicts
+      (dpkgs: with dpkgs; [
+        en
+        en-computers
+        en-science
       ]))
-    sqlite
-    htop
-    (aspellWithDicts (ds: with ds; [ en en-computers en-science ]))
     bat
     fd
-    fzf
     ffmpeg
+    fzf
+    htop
+    nixpkgs-fmt
     ripgrep
     rnix-lsp
-    nixpkgs-fmt
+    sqlite
     tree
     wget
   ];
 
-  programs.direnv.enable = true;
+  # Somehow related to: https://github.com/NixOS/nixpkgs/issues/1000
-  programs.direnv.nix-direnv.enable = true;
-
   home.file.".aspell.conf".text = "data-dir ${pkgs.aspell}/lib/aspell";
 
-  programs.fzf = {
+  programs = {
+
+    direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+    };
+
+    fzf = {
       enable = true;
       enableFishIntegration = true;
     };
 
-  programs.fish = {
+    fish = {
       enable = true;
 
       functions = {
@@ -69,7 +81,7 @@
       '';
     };
 
-  programs.starship = {
+    starship = {
       enable = true;
       settings = {
         character = {
@@ -79,13 +91,17 @@
       };
     };
 
-  programs.git = {
+    git = {
       enable = true;
       userName = "larstvei";
       userEmail = "larstvei@ifi.uio.no";
       ignores = [ ".dir-locals.el" ".envrc" ".DS_Store" ];
     };
 
+    # 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
   # when a new Home Manager release introduces backwards
@@ -95,7 +111,4 @@
   # the Home Manager release notes for a list of state version
   # changes in each release.
   home.stateVersion = "22.05";
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
 }