From 27c3769f0e31e1dba6dfdc8bfb25cbd2509d9ae9 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 7 Apr 2023 12:15:52 +0200 Subject: [PATCH 1/6] Disabled hack to set bottom line in terminals color as background --- init.el | 17 +++++++++-------- packages/default.nix | 2 -- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/init.el b/init.el index 0c895da..0930c31 100644 --- a/init.el +++ b/init.el @@ -73,14 +73,15 @@ (global-auto-revert-mode t) (show-paren-mode 1) (column-number-mode 1) - (advice-add 'enable-theme - :after - #'(lambda (&rest rest) - (set-face-background 'vertical-border (face-background 'default)) - (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)))) + ;; FIXME when running running Emacs as daemon + ;; (advice-add 'enable-theme + ;; :after + ;; #'(lambda (&rest rest) + ;; (set-face-background 'vertical-border (face-background 'default)) + ;; (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) diff --git a/packages/default.nix b/packages/default.nix index 157fd67..ee296db 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -52,6 +52,4 @@ default = self'.apps.ccrEmacs; }; }; - - flake.hydraJobs.emacs = self.packages.x86_64-linux; } From dfaec52b98aab7b6ea3171a9f01ebecf7d822a4e Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Sat, 8 Apr 2023 11:24:34 +0200 Subject: [PATCH 2/6] Hydra support --- flake.nix | 1 + hydra/default.nix | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 hydra/default.nix diff --git a/flake.nix b/flake.nix index d17b520..a409aca 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,7 @@ ./hmModules ./formatter ./diff-closures + ./hydra ]; }; diff --git a/hydra/default.nix b/hydra/default.nix new file mode 100644 index 0000000..635d38c --- /dev/null +++ b/hydra/default.nix @@ -0,0 +1,5 @@ +{self, ...}: { + flake.hydraJobs = { + packages = self.packages; + }; +} From b60bba33da7a5c18399b7793bfd3258dd7e8f4c1 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Sat, 8 Apr 2023 11:25:18 +0200 Subject: [PATCH 3/6] Remove github workflow for building --- .github/workflows/build.yaml | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 .github/workflows/build.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml deleted file mode 100644 index 626f6c4..0000000 --- a/.github/workflows/build.yaml +++ /dev/null @@ -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 From 0d6c0a434632e7686bec4e120972d682fa3266fb Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Sat, 8 Apr 2023 11:49:52 +0200 Subject: [PATCH 4/6] Hydra hook --- hydra/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hydra/default.nix b/hydra/default.nix index 635d38c..552655e 100644 --- a/hydra/default.nix +++ b/hydra/default.nix @@ -2,4 +2,9 @@ flake.hydraJobs = { packages = self.packages; }; + perSystem = {pkgs, ...}: { + packages.hydraHook = pkgs.writeScript "hook" '' + echo ciao + ''; + }; } From 11369f4f4bca89b2ba5c2330bf2f88f66011a17c Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Sat, 8 Apr 2023 12:17:23 +0200 Subject: [PATCH 5/6] Removed Hydra hook --- hydra/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hydra/default.nix b/hydra/default.nix index 552655e..635d38c 100644 --- a/hydra/default.nix +++ b/hydra/default.nix @@ -2,9 +2,4 @@ flake.hydraJobs = { packages = self.packages; }; - perSystem = {pkgs, ...}: { - packages.hydraHook = pkgs.writeScript "hook" '' - echo ciao - ''; - }; } From 7f3ee2413d6b0756ade8435e0fa9ff3317e4c000 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 11 May 2023 11:52:46 +0200 Subject: [PATCH 6/6] WIP --- init.el | 15 ++++++++++++--- packages/packages.nix | 8 ++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/init.el b/init.el index 0930c31..6cc038e 100644 --- a/init.el +++ b/init.el @@ -73,6 +73,8 @@ (global-auto-revert-mode t) (show-paren-mode 1) (column-number-mode 1) + (set-frame-parameter (selected-frame) 'alpha '(98 98)) + (add-to-list 'default-frame-alist '(alpha 98 98)) ;; FIXME when running running Emacs as daemon ;; (advice-add 'enable-theme ;; :after @@ -88,7 +90,7 @@ (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." @@ -129,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)) @@ -141,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 diff --git a/packages/packages.nix b/packages/packages.nix index e1ad9a2..289b1aa 100644 --- a/packages/packages.nix +++ b/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 - - # TODO playing with these - sway - shackle + purescript-mode + tide + solidity-mode ]