Compare commits
4 Commits
f4ae8b2e21
...
b94d6d0309
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b94d6d0309 | ||
|
210c75cce9
|
|||
|
e427c1866e
|
|||
|
a7fdaa066f
|
44
devenv.lock
44
devenv.lock
@@ -3,10 +3,10 @@
|
|||||||
"devenv": {
|
"devenv": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "src/modules",
|
"dir": "src/modules",
|
||||||
"lastModified": 1747717470,
|
"lastModified": 1771852244,
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "devenv",
|
"repo": "devenv",
|
||||||
"rev": "c7f2256ee4a4a4ee9cbf1e82a6e49b253c374995",
|
"rev": "c88c14a32d06173867e26b7d4f5daed38a3f6f1e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -19,14 +19,14 @@
|
|||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747046372,
|
"lastModified": 1767039857,
|
||||||
"owner": "edolstra",
|
"owner": "NixOS",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "edolstra",
|
"owner": "NixOS",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -40,10 +40,10 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747372754,
|
"lastModified": 1771858127,
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
|
"rev": "49bbbfc218bf3856dfa631cead3b052d78248b83",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -60,10 +60,10 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709087332,
|
"lastModified": 1762808025,
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "gitignore.nix",
|
"repo": "gitignore.nix",
|
||||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
"rev": "cb5e3fdca1de58ccbc3ef53de65bd372b48f567c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -73,11 +73,14 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs-src": "nixpkgs-src"
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746807397,
|
"lastModified": 1770434727,
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "devenv-nixpkgs",
|
"repo": "devenv-nixpkgs",
|
||||||
"rev": "c5208b594838ea8e6cca5997fbf784b7cca1ca90",
|
"rev": "8430f16a39c27bdeef236f1eeb56f0b51b33d348",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -87,6 +90,23 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-src": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1769922788,
|
||||||
|
"narHash": "sha256-H3AfG4ObMDTkTJYkd8cz1/RbY9LatN5Mk4UF48VuSXc=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "207d15f1a6603226e1e223dc79ac29c7846da32e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"devenv": "devenv",
|
"devenv": "devenv",
|
||||||
|
|||||||
@@ -1388,31 +1388,18 @@ compatible with git repositories. In fact, I pretty much don’t use git
|
|||||||
anymore, jj (abbreviation of Jujutsu) has almost completely replaced
|
anymore, jj (abbreviation of Jujutsu) has almost completely replaced
|
||||||
git for me.
|
git for me.
|
||||||
|
|
||||||
It comes to no surprise then that I will use [[https://elpa.gnu.org/packages/vc-jj.html][=vc-jj=]], a Jujutsu
|
I like Magit’s interface, as you can see in my [[file:./applications.md#magit][Magit]] config.
|
||||||
backend for =vc.el= and =project.el=.
|
Therefore, let’s install =majjit=, my slow and scuffed attempt at
|
||||||
|
bringing some Magit features to jujutsu.
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package vc-jj
|
(use-package majjit
|
||||||
:straight (:build t)
|
:defer t
|
||||||
:defer nil)
|
:after magit
|
||||||
#+end_src
|
:straight (majjit :built t
|
||||||
|
:type git
|
||||||
As mentioned in the package’s README, I do need to set these lines in
|
:host nil
|
||||||
my jj config:
|
:repo "https://labs.phundrak.com/phundrak/majjit")
|
||||||
#+begin_src toml :tangle no
|
:custom ((majjit-default-directory "~/code/")))
|
||||||
[ui]
|
|
||||||
diff-formatter = ":git"
|
|
||||||
conflict-marker-style = "git"
|
|
||||||
#+end_src
|
|
||||||
|
|
||||||
I also like Magit’s interface, as you can see in my [[file:./applications.md#magit][Magit]] config.
|
|
||||||
Therefore, let’s install =jujutsu-mode= which attempts to recreate a
|
|
||||||
Magit-style interface for Jujutsu.
|
|
||||||
|
|
||||||
#+begin_src emacs-lisp
|
|
||||||
(use-package jj-mode
|
|
||||||
:straight (:build t :host github :repo "bolivier/jj-mode.el")
|
|
||||||
:defer t)
|
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
Though, I’ll be honest, I generally prefer to use Jujutsu in the
|
Though, I’ll be honest, I generally prefer to use Jujutsu in the
|
||||||
|
|||||||
@@ -1337,6 +1337,10 @@ hand.
|
|||||||
(scss-mode . emmet-mode)
|
(scss-mode . emmet-mode)
|
||||||
(web-mode . emmet-mode))
|
(web-mode . emmet-mode))
|
||||||
:config
|
:config
|
||||||
|
(setopt standard-indent 2
|
||||||
|
web-mode-block-padding 0
|
||||||
|
web-mode-part-padding 0
|
||||||
|
web-mode-markup-indent-offset 0)
|
||||||
(general-define-key
|
(general-define-key
|
||||||
:keymaps 'emmet-mode-keymap
|
:keymaps 'emmet-mode-keymap
|
||||||
"M-RET" #'emmet-expand-yas)
|
"M-RET" #'emmet-expand-yas)
|
||||||
|
|||||||
1042
package-lock.json
generated
1042
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user