Update

takeokunn · Oct 14, 2024 · 04c7484 · 04c7484
1 parent 7dbb531
commit 04c7484
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 111 deletions.
diff --git a/_sources/generated.json b/_sources/generated.json
@@ -159,26 +159,6 @@
         },
         "version": "c0bf3b81c7a97e2a0d06d05495e86848254fcc1f"
     },
-    "emacs-eshell-fringe-status": {
-        "cargoLocks": null,
-        "date": "2017-01-18",
-        "extract": null,
-        "name": "emacs-eshell-fringe-status",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "owner": "ryuslash",
-            "repo": "eshell-fringe-status",
-            "rev": "adc6997c68e39c0d52a2af1b2fd5cf2057783797",
-            "sha256": "sha256-QHJxU+fX6sr0duNEdObRY7cqnfqdGX3mLJQ0KTcjlrM=",
-            "type": "github"
-        },
-        "version": "adc6997c68e39c0d52a2af1b2fd5cf2057783797"
-    },
     "emacs-eshell-multiple": {
         "cargoLocks": null,
         "date": "2022-08-17",
@@ -199,26 +179,6 @@
         },
         "version": "342c36ef9c71df8738f4435fd4381f506631e7aa"
     },
-    "emacs-eshell-syntax-highlighting": {
-        "cargoLocks": null,
-        "date": "2024-06-30",
-        "extract": null,
-        "name": "emacs-eshell-syntax-highlighting",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "owner": "akreisher",
-            "repo": "eshell-syntax-highlighting",
-            "rev": "26f49633308ea876b5850256e07622de34ad0bdd",
-            "sha256": "sha256-MPypD9p1gUEFGQmq06vCcmuQa9E2dVsVDba6n0fHVNw=",
-            "type": "github"
-        },
-        "version": "26f49633308ea876b5850256e07622de34ad0bdd"
-    },
     "emacs-explain-pause-mode": {
         "cargoLocks": null,
         "date": "2020-07-27",
@@ -619,6 +579,26 @@
         },
         "version": "a4463d2732caa8c3650826ee4fc79f3fd29c9e56"
     },
+    "emacs-zalgo-mode": {
+        "cargoLocks": null,
+        "date": "2024-10-05",
+        "extract": null,
+        "name": "emacs-zalgo-mode",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "nehrbash",
+            "repo": "zalgo-mode",
+            "rev": "dc42228ce38db4f9879d6d53ba68207f2a5f7474",
+            "sha256": "sha256-R1fidCbailFsZZsQWNCznXqLuY3mG4bVL7rlxb1N2sg=",
+            "type": "github"
+        },
+        "version": "dc42228ce38db4f9879d6d53ba68207f2a5f7474"
+    },
     "fish-artisan-completion": {
         "cargoLocks": null,
         "date": "2021-11-16",
@@ -781,7 +761,7 @@
     },
     "skkeleton": {
         "cargoLocks": null,
-        "date": "2024-09-28",
+        "date": "2024-10-14",
         "extract": null,
         "name": "skkeleton",
         "passthru": null,
@@ -793,11 +773,11 @@
             "name": null,
             "owner": "vim-skk",
             "repo": "skkeleton",
-            "rev": "438737ec49bcf1303521bdcccb5e06ced7b60c5e",
-            "sha256": "sha256-beQDAlgM9E3Xy+xQMAIfqrc7/j5ahboHi2Wa8T8zQFU=",
+            "rev": "2cdd414c1bfa8c363505b8dfc9f50ef2f446ea61",
+            "sha256": "sha256-7oTJGGkUb3K8nzcPqlJrm316ECmgswy/+N8cTQghv3k=",
             "type": "github"
         },
-        "version": "438737ec49bcf1303521bdcccb5e06ced7b60c5e"
+        "version": "2cdd414c1bfa8c363505b8dfc9f50ef2f446ea61"
     },
     "sublime-gleam": {
         "cargoLocks": null,

diff --git a/_sources/generated.nix b/_sources/generated.nix
@@ -97,18 +97,6 @@
     };
     date = "2024-03-14";
   };
-  emacs-eshell-fringe-status = {
-    pname = "emacs-eshell-fringe-status";
-    version = "adc6997c68e39c0d52a2af1b2fd5cf2057783797";
-    src = fetchFromGitHub {
-      owner = "ryuslash";
-      repo = "eshell-fringe-status";
-      rev = "adc6997c68e39c0d52a2af1b2fd5cf2057783797";
-      fetchSubmodules = false;
-      sha256 = "sha256-QHJxU+fX6sr0duNEdObRY7cqnfqdGX3mLJQ0KTcjlrM=";
-    };
-    date = "2017-01-18";
-  };
   emacs-eshell-multiple = {
     pname = "emacs-eshell-multiple";
     version = "342c36ef9c71df8738f4435fd4381f506631e7aa";
@@ -121,18 +109,6 @@
     };
     date = "2022-08-17";
   };
-  emacs-eshell-syntax-highlighting = {
-    pname = "emacs-eshell-syntax-highlighting";
-    version = "26f49633308ea876b5850256e07622de34ad0bdd";
-    src = fetchFromGitHub {
-      owner = "akreisher";
-      repo = "eshell-syntax-highlighting";
-      rev = "26f49633308ea876b5850256e07622de34ad0bdd";
-      fetchSubmodules = false;
-      sha256 = "sha256-MPypD9p1gUEFGQmq06vCcmuQa9E2dVsVDba6n0fHVNw=";
-    };
-    date = "2024-06-30";
-  };
   emacs-explain-pause-mode = {
     pname = "emacs-explain-pause-mode";
     version = "2356c8c3639cbeeb9751744dbe737267849b4b51";
@@ -373,6 +349,18 @@
     };
     date = "2022-06-22";
   };
+  emacs-zalgo-mode = {
+    pname = "emacs-zalgo-mode";
+    version = "dc42228ce38db4f9879d6d53ba68207f2a5f7474";
+    src = fetchFromGitHub {
+      owner = "nehrbash";
+      repo = "zalgo-mode";
+      rev = "dc42228ce38db4f9879d6d53ba68207f2a5f7474";
+      fetchSubmodules = false;
+      sha256 = "sha256-R1fidCbailFsZZsQWNCznXqLuY3mG4bVL7rlxb1N2sg=";
+    };
+    date = "2024-10-05";
+  };
   fish-artisan-completion = {
     pname = "fish-artisan-completion";
     version = "8e8d726b3862fcb972abb652fb8c1a9fb9207a64";
@@ -471,15 +459,15 @@
   };
   skkeleton = {
     pname = "skkeleton";
-    version = "438737ec49bcf1303521bdcccb5e06ced7b60c5e";
+    version = "2cdd414c1bfa8c363505b8dfc9f50ef2f446ea61";
     src = fetchFromGitHub {
       owner = "vim-skk";
       repo = "skkeleton";
-      rev = "438737ec49bcf1303521bdcccb5e06ced7b60c5e";
+      rev = "2cdd414c1bfa8c363505b8dfc9f50ef2f446ea61";
       fetchSubmodules = false;
-      sha256 = "sha256-beQDAlgM9E3Xy+xQMAIfqrc7/j5ahboHi2Wa8T8zQFU=";
+      sha256 = "sha256-7oTJGGkUb3K8nzcPqlJrm316ECmgswy/+N8cTQghv3k=";
     };
-    date = "2024-09-28";
+    date = "2024-10-14";
   };
   sublime-gleam = {
     pname = "sublime-gleam";

diff --git a/home-manager/programs/editorconfig/default.nix b/home-manager/programs/editorconfig/default.nix
@@ -25,7 +25,7 @@
       "*.{yml,yaml}" = { indent_size = 2; };
       "*.tf" = { indent_size = 2; };
       "*.scala" = { indent_size = 2; };
-      "package.json" = { indent_size = 2; };
+      "*.json" = { indent_size = 2; };
       "*.{el,lisp,asd}" = { max_line_length = 80; };
       "*.v" = {
         indent_size = 4;
@@ -38,5 +38,4 @@
       "*.nix" = { indent_size = 2; };
     };
   };
-
 }
diff --git a/home-manager/programs/emacs/default.nix b/home-manager/programs/emacs/default.nix
@@ -4,7 +4,7 @@ in {
   programs.emacs = {
     enable = true;
     package = pkgs.emacsWithPackagesFromUsePackage {
-      config = ./elisp/init.org;
+      config = builtins.toFile "empty.el" "";
       defaultInitFile = true;
       package = pkgs.emacs-git;
       alwaysTangle = true;

diff --git a/home-manager/programs/emacs/elisp/init.org b/home-manager/programs/emacs/elisp/init.org
@@ -1570,14 +1570,7 @@
     ;; config
     (setopt eglot-events-buffer-size nil)
     (setopt eglot-autoshutdown t)
-    (setopt eglot-extend-to-xref t)
-
-    ;; language server
-    ;; (add-to-list 'eglot-server-programs '(php-mode . ("intelephense" "--stdio")))
-    ;; (add-to-list 'eglot-server-programs '(clojure-mode clojurescript-mode clojurec-mode
-    ;;                                                    . ("/Users/take/.emacs.d/.cache/lsp/clojure/clojure-lsp"
-    ;;                                                       "listen" "--verbose")))
-    )
+    (setopt eglot-extend-to-xref t))
 #+end_src
 *** lsp-mode
 #+begin_src emacs-lisp :tangle yes
@@ -3327,6 +3320,12 @@
   (keymap-global-set "C-c C-l p" #'lorem-ipsum-insert-paragraphs)
   (keymap-global-set "C-c C-l l" #'lorem-ipsum-insert-list)
 #+end_src
+*** zalgo-mode
+#+begin_src emacs-lisp :tangle yes
+  (autoload-if-found '(zalgo-transform-word
+  		     zalgo-mode
+  		     zalgo-transform-region) "zalgo-mode" nil t)
+#+end_src
 ** Password
 *** pass
 #+begin_src emacs-lisp :tangle yes

diff --git a/home-manager/programs/emacs/epkgs/packages/awesome/default.nix b/home-manager/programs/emacs/epkgs/packages/awesome/default.nix
@@ -31,6 +31,7 @@ in with epkgs; [
   packages.sudden-death
   redacted
   lorem-ipsum
+  packages.zalgo-mode
 
   # Minor Modes
   command-log-mode

diff --git a/home-manager/programs/emacs/epkgs/packages/awesome/packages.nix b/home-manager/programs/emacs/epkgs/packages/awesome/packages.nix
@@ -14,4 +14,12 @@
 
     ignoreCompilationError = false;
   };
+
+  zalgo-mode = epkgs.melpaBuild {
+    pname = "zalgo-mode";
+    version = "0.0.1";
+    src = sources.emacs-zalgo-mode.src;
+
+    ignoreCompilationError = false;
+  };
 }
diff --git a/home-manager/programs/emacs/epkgs/packages/eshell/default.nix b/home-manager/programs/emacs/epkgs/packages/eshell/default.nix
@@ -6,8 +6,8 @@ in with epkgs; [
   eshell-z
   fish-completion
   packages.eshell-multiple
-  packages.eshell-syntax-highlighting
-  packages.eshell-fringe-status
+  eshell-syntax-highlighting
+  eshell-fringe-status
   # eat
   mistty
 ]
diff --git a/home-manager/programs/emacs/epkgs/packages/eshell/packages.nix b/home-manager/programs/emacs/epkgs/packages/eshell/packages.nix
@@ -1,25 +1,9 @@
 { sources, epkgs }: {
-  eshell-fringe-status = epkgs.melpaBuild {
-    pname = "eshell-fringe-status";
-    version = "0.0.1";
-    src = sources.emacs-eshell-fringe-status.src;
-
-    ignoreCompilationError = false;
-  };
-
   eshell-multiple = epkgs.melpaBuild {
     pname = "eshell-multiple";
     version = "0.0.1";
     src = sources.emacs-eshell-multiple.src;
 
     ignoreCompilationError = false;
   };
-
-  eshell-syntax-highlighting = epkgs.melpaBuild {
-    pname = "eshell-syntax-highlighting";
-    version = "0.0.1";
-    src = sources.emacs-eshell-syntax-highlighting.src;
-
-    ignoreCompilationError = false;
-  };
 }
diff --git a/nvfetcher.toml b/nvfetcher.toml
@@ -90,21 +90,11 @@ src.git = "https://github.com/takeokunn/fish-repl.el"
 src.branch = "main"
 fetch.github = "takeokunn/fish-repl.el"
 
-[emacs-eshell-fringe-status]
-src.git = "https://github.com/ryuslash/eshell-fringe-status"
-src.branch = "master"
-fetch.github = "ryuslash/eshell-fringe-status"
-
 [emacs-eshell-multiple]
 src.git = "https://github.com/takeokunn/eshell-multiple"
 src.branch = "main"
 fetch.github = "takeokunn/eshell-multiple"
 
-[emacs-eshell-syntax-highlighting]
-src.git = "https://github.com/akreisher/eshell-syntax-highlighting"
-src.branch = "master"
-fetch.github = "akreisher/eshell-syntax-highlighting"
-
 [emacs-bazel-mode]
 src.git = "https://github.com/bazelbuild/emacs-bazel-mode"
 src.branch = "master"
@@ -200,6 +190,11 @@ src.git = "https://github.com/r0man/plz-media-type"
 src.branch = "main"
 fetch.github = "r0man/plz-media-type"
 
+[emacs-zalgo-mode]
+src.git = "https://github.com/nehrbash/zalgo-mode"
+src.branch = "main"
+fetch.github = "nehrbash/zalgo-mode"
+
 # for neovim
 
 [vimdoc-ja]