Merge branch 'master' of github.com:aciceri/nixfleet

users/profiles/blender/default.nix

@@ -1,8 +1,10 @@
 { pkgs, ... }:
 {
   home.packages = with pkgs; [
+    openscad
   ] ++ (if !stdenv.hostPlatform.isAarch64 then [
     blender
+    freecad
   ]
   else [ ]);
 }

users/profiles/emacs/default.nix

@@ -11,6 +11,10 @@
     package = pkgs.customEmacs;
   };
 
+  services.emacs = {
+    enable = true;
+  };
+
   # For some reason Hunspell dictionaries paths must be specified on Darwin
   home.sessionVariables =
     if pkgs.stdenv.hostPlatform.isDarwin then {
@@ -34,7 +38,6 @@
       ag
       fd
       graphviz-nox
-      haskell-language-server
       hunspell
       hunspellDicts.en_US
       hunspellDicts.it_IT
@@ -58,6 +61,7 @@
       )
     ] ++ (if pkgs.system == "x86_64-linux" then [
       python-language-server
+      haskell-language-server
     ] ++ (with easy-ps; [
       # spago2nix
       ffmpegthumbnailer

users/profiles/emacs/emacs.d/config/config-emacs.el

@@ -2,6 +2,7 @@
       backup-by-copying t
       delete-old-versions 6
       kept-old-versions 2
-      version-control t)
+      version-control t
+      create-lockfiles nil)
 
 (provide 'config-emacs)

users/profiles/qmk/default.nix

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

users/profiles/sway/default.nix

@@ -57,8 +57,8 @@
               '';
             in
             lib.mkOptionDefault {
-              "${modifier}+x" = "exec ${pkgs.customEmacs}/bin/emacs";
-              "${modifier}+b" = "exec ${pkgs.firefox}/bin/firefox";
+              "${modifier}+x" = "exec emacsclient -c";
+              "${modifier}+b" = "exec firefox";
               "${modifier}+s" = "exec ${screenshotScript}";
             };
         };

users/profiles/vscode/default.nix

@@ -29,8 +29,9 @@
   };
 
   home.packages = with pkgs; [
-    haskell-language-server
     stylish-haskell
     ghc
-  ];
+  ] ++ (if pkgs.system == "x86_64-linux" then [
+    haskell-language-server
+  ] else [ ]);
 }