Spring cleaning

users/andreaciceri/default.nix

@@ -1,39 +0,0 @@
-{ config, lib, pkgs, emacs-overlay, ... }: {
-  home-manager.users."andreaciceri" = { ... }: {
-    imports = [
-      ../profiles/bat
-      ../profiles/fzf
-      ../profiles/zsh
-      ../profiles/git
-      ../profiles/direnv
-      ../profiles/exa
-      ../profiles/emacs
-    ];
-    home.packages = with pkgs; [
-      yarn
-      pinentry_mac
-      openscad
-      nodejs-14_x
-
-      poetry
-      ipfs
-      ipget
-
-      yabai
-      skhd
-      spacebar
-      xquartz
-      xterm
-
-      qmk
-
-      youtube-dl
-      ffmpeg
-    ];
-
-    programs.gpg = {
-      homedir = "/Users/andreaciceri/.gnupg";
-      enable = true;
-    };
-  };
-}

users/profiles/direnv/default.nix

@@ -6,7 +6,6 @@
     };
     nix-direnv = {
       enable = true;
-      enableFlakes = true;
     };
   };
 }

users/profiles/emacs/default.nix

@@ -12,7 +12,7 @@
   };
 
   services.emacs = {
-    enable = !pkgs.stdenv.hostPlatform.isDarwin;
+    enable = true;
   };
 
   # For some reason Hunspell dictionaries paths must be specified on Darwin
@@ -38,7 +38,6 @@
       delta
       fd
       graphviz-nox
-      haskell-language-server
       hunspell
       hunspellDicts.en_US
       hunspellDicts.it_IT
@@ -49,7 +48,6 @@
       python3Full
       rnix-lsp
       silver-searcher
-      stylish-haskell
       unzip
       (
         makeDesktopItem {
@@ -58,19 +56,12 @@
           comment = "Org protocol";
           desktopName = "org-protocol";
           type = "Application";
-          mimeType = "x-scheme-handler/org-protocol";
+          mimeTypes = [ "x-scheme-handler/org-protocol" ];
         }
       )
     ] ++ (if pkgs.system == "x86_64-linux" then [
       python-language-server
     ] ++ (with easy-ps; [
-      # spago2nix
       ffmpegthumbnailer
-      nodejs
-      pulp
-      purescript-language-server
-      purs
-      purs-tidy
-      spago
     ]) else [ ]);
 }

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

@@ -4,4 +4,4 @@
     :config
     (envrc-global-mode))
 
-(provide 'config-envrc)
+(provide 'config-direnv)

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

@@ -16,4 +16,17 @@
   :config
   (evil-collection-init))
 
+(use-package vimish-fold
+  :ensure
+  :after evil)
+
+(use-package evil-vimish-fold
+  :ensure
+  :after vimish-fold
+  :init
+  (setq evil-vimish-fold-mode-lighter " ⮒")
+  (setq evil-vimish-fold-target-modes '(prog-mode conf-mode text-mode))
+  :config
+  (global-evil-vimish-fold-mode))
+
 (provide 'config-evil)

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

@@ -1,9 +1,9 @@
 (use-package nix-mode
   :mode "\\.nix\\'"
-  ;;:hook
-  ;;(before-save . lsp-format-buffer)
-  )
-
+  :config (setq  format-on-save t)
+  :bind ("<f8>" . (lambda () (interactive) (setq format-on-save (not format-on-save)) ))
+  :hook
+  (before-save . (lambda () (when (format-on-save) (lsp-format-buffer)))))
 
 (require 'sudo-utils)
 

users/profiles/qutebrowser/default.nix

@@ -41,7 +41,7 @@
         comment = "Qutebrowser";
         desktopName = "qutebrowser";
         type = "Application";
-        mimeType = "x-scheme-handler/https";
+        mimeTypes = [ "x-scheme-handler/https" ];
       }
     )
   ];

users/profiles/vscode/default.nix

@@ -1,9 +1,5 @@
 { pkgs, ... }:
 {
-  # only purpose of this is to make vscode login to Github
-  services.gnome-keyring.enable = true;
-
-
   programs.vscode = {
     enable = true;