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

.github/workflows/build.yaml

@@ -1,27 +0,0 @@
-name: build
-on:
-  workflow_dispatch: # allows manual triggering
-  push:
-    branches:
-      - master
-      - update_flake_lock_action
-
-jobs:
-  build:
-    if: ${{ always() }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - uses: cachix/install-nix-action@v20
-        with:
-          extra_nix_config: |
-            accept-flake-config = true
-            
-      - uses: cachix/cachix-action@v12
-        with:
-          name: aciceri-emacs
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-
-      - run: nix --print-build-logs --verbose build

flake.nix

@@ -19,6 +19,7 @@
         ./hmModules
         ./formatter
         ./diff-closures
+        ./hydra
       ];
     };
 

hydra/default.nix

@@ -0,0 +1,5 @@
+{self, ...}: {
+  flake.hydraJobs = {
+    packages = self.packages; 
+  };
+}

init.el

@@ -73,21 +73,24 @@
   (global-auto-revert-mode t)
   (show-paren-mode 1)
   (column-number-mode 1)
-  (advice-add 'enable-theme
+  (set-frame-parameter (selected-frame) 'alpha '(98 98))
-	      :after
+  (add-to-list 'default-frame-alist '(alpha 98 98))
-	      #'(lambda (&rest rest)
+  ;; FIXME when running running Emacs as daemon
-		  (set-face-background 'vertical-border (face-background 'default))
+  ;; (advice-add 'enable-theme
-		  (let* ((bg-color (face-attribute 'default :background))
+  ;; 	      :after
-			 (ansi-command (format "\033]11;#%s\007"
+  ;; 	      #'(lambda (&rest rest)
-					       (string-remove-prefix "#" bg-color))))
+  ;; 		  (set-face-background 'vertical-border (face-background 'default))
-		    (send-string-to-terminal ansi-command))))
+  ;; 		  (let* ((bg-color (face-attribute 'default :background))
+  ;; 			 (ansi-command (format "\033]11;#%s\007"
+  ;; 					       (string-remove-prefix "#" bg-color))))
+  ;; 		    (send-string-to-terminal ansi-command))))
   (defun reset-terminal () (send-string-to-terminal "\033c"))
   (add-hook 'kill-emacs-hook #'reset-terminal)
   (ef-themes-select 'ef-day)
 
   (defun ccr/reload-emacs ()
     (interactive)
-    (load-file "~/.vanilla-emacs.d/init.el"))
+    (load-file "~/.config/emacs/init.el"))
 
   (defun ccr/run-in-vterm-kill (process event)
   "A process sentinel. Kills PROCESS's buffer if it is live."
@@ -128,7 +131,12 @@
 
 (setup haskell-mode (:hook eglot-ensure tree-sitter-hl-mode))
 
-(setup rust-mode (:hook eglot-ensure tree-sitter-hl-mode))
+(setup purescript-mode)
+
+(setup rustic-mode
+  (:hook eglot-ensure tree-sitter-hl-mode)
+  (push 'rustic-clippy flycheck-checkers)
+  (:option rustic-lsp-client 'eglot))
 
 (setup terraform-mode (:hook eglot-ensure tree-sitter-hl-mode))
 
@@ -140,7 +148,9 @@
   (:hook enable-paredit-mode)
   (:with-mode emacs-lisp-mode (:hook enable-paredit-mode)))
 
-(setup envrc (envrc-global-mode))
+(setup envrc
+  (require 'inheritenv)
+  (envrc-global-mode))
 
 (setup windmove
   (defcustom ccr/v-resize-amount 4

packages/default.nix

@@ -60,6 +60,4 @@
       default = self'.apps.ccrEmacs;
     };
   };
-
-  flake.hydraJobs.emacs = self.packages.x86_64-linux;
 }

packages/packages.nix

@@ -26,6 +26,7 @@ with epkgs; [
   which-key
   nix-mode
   envrc
+  inheritenv
   flycheck
   flycheck-posframe
   flycheck-inline
@@ -52,8 +53,7 @@ with epkgs; [
   eat
   rust-mode
   rustic
-
+  purescript-mode
-  # TODO playing with these
+  tide
-  sway
+  solidity-mode
-  shackle
 ]