Added direnv

config/doom/init.el

@@ -87,14 +87,14 @@
        :tools
        ;;ansible
        ;;debugger          ; FIXME stepping through code, to help you add bugs
-       ;;direnv
+       direnv
        ;;docker
        ;;editorconfig      ; let someone else argue about tabs vs spaces
        ;;ein               ; tame Jupyter notebooks with emacs
        (eval +overlay)     ; run code, run (also, repls)
        ;;gist              ; interacting with github gists
        lookup              ; navigate your code and its documentation
-       ;;lsp
+       lsp
        magit             ; a git porcelain for Emacs
        ;;make              ; run make tasks from Emacs
        ;;pass              ; password manager for nerds
@@ -160,7 +160,8 @@
        rest              ; Emacs as a REST client
        ;;rst               ; ReST in peace
        ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       ;;rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       (rust
+        +lsp)              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
        ;;scheme            ; a fully conniving family of lisps
        sh                ; she sells {ba,z,fi}sh shells on the C xor

hosts/kopavogur/default.nix

@@ -24,6 +24,7 @@
     # See modules/common.nix for common packages installed
 
     # - System -----------------------------------
+    system.utils.enable = true;
 
     # - Desktop ----------------------------------
     desktop = {

hosts/reykjavik/default.nix

@@ -22,6 +22,7 @@
     # See modules/common.nix for common packages installed
 
     # - System -----------------------------------
+    system.utils.enable = true;
     system.bluetooth.enable = true;
     system.nvidia = {
       enable = true;
@@ -41,6 +42,8 @@
     dev.git.userName = "marc";
     dev.git.userEmail = "marc@sastre.cat";
 
+    dev.direnv.enable = true;
+
     # - Other apps -------------------------------
     app.spotify.enable = true;
 

modules/dev/direnv.nix

@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.samfelag.modules.dev.direnv;
+in
+{
+  options.samfelag.modules.dev.direnv = {
+    enable = lib.mkEnableOption "direnv";
+  };
+  config = lib.mkIf cfg.enable {
+    hm.programs.direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+    };
+
+    # Optional: To protect your nix-shell against garbage collection
+    nix.extraOptions = ''
+      keep-outputs = true
+      keep-derivations = true
+    '';
+  };
+}

modules/editors/emacs.nix

@@ -92,7 +92,7 @@ in {
 
     fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ];
 
-    env.PATH = [ "$XDG_CONFIG_HOME/emacs/bin" ];
+    env.PATH = [ "$HOME/.config/emacs/bin" ];
 
     home-manager.users.marc.xdg.configFile."doom".source = ../../config/doom;
 

modules/system/utils.nix

@@ -0,0 +1,16 @@
+{ config, lib, pkgs, self, ... }:
+
+let
+  cfg = config.samfelag.modules.system.utils;
+in
+{
+  options.samfelag.modules.system.utils = {
+    enable = lib.mkEnableOption "utils";
+  };
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      zip
+      unzip
+    ];
+  };
+}