Compare commits
18 Commits
evil
..
3682c1ad10
| Author | SHA1 | Date | |
|---|---|---|---|
| 3682c1ad10 | |||
| 5f639e747d | |||
| 3159d20e6d | |||
| e6240591c9 | |||
| 5f96f98158 | |||
| a1abf5b4a1 | |||
| ba8ef4f585 | |||
| eb057a2c3a | |||
| 8effe5f401 | |||
| 8fae2a5338 | |||
| 1c379cc4a3 | |||
| 69f3fa445b | |||
| 6c1b0faea4 | |||
| c68e79ca4f | |||
| af8a00ab5b | |||
| 50d27458af | |||
| d0d340e04f | |||
| b7912eef52 |
Generated
+38
-54
@@ -1,20 +1,23 @@
|
||||
{
|
||||
"nodes": {
|
||||
"flake-parts": {
|
||||
"claude-code": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765835352,
|
||||
"narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "a34fae9c08a15ad73f295041fec82323541400a9",
|
||||
"lastModified": 1787169825,
|
||||
"narHash": "sha256-3MmWHAzeoFHfwjUCQC01olBN+MC4xoSuR7D0bpPr+EE=",
|
||||
"owner": "sadjow",
|
||||
"repo": "claude-code-nix",
|
||||
"rev": "f575914388682670df73e80c9caf82063b659699",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"owner": "sadjow",
|
||||
"repo": "claude-code-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
@@ -25,11 +28,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1779969295,
|
||||
"narHash": "sha256-HwIJ3tOcwSMiV75L7KqJXciXR9UfT+d7rwOZMX7cTnA=",
|
||||
"lastModified": 1787176219,
|
||||
"narHash": "sha256-djoRr6jBpe35q/0JwAvXpFXg1Ktf+X54NU2RLR7wnHw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "61e2c9659324181e0f0ed911958c536333b1d4f6",
|
||||
"rev": "c53d643b3737e2fcd04e6cb3b3580ef50b2087a0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -39,25 +42,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"kube": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767247330,
|
||||
"narHash": "sha256-CxXwzmvAOO07719jzE0Zw14C9r3fQcXfPllLtt5cIzo=",
|
||||
"rev": "4a4d79a290c92de630e503f395fc8fd709904c1b",
|
||||
"type": "tarball",
|
||||
"url": "https://gitea.home-frikker.dedyn.io/api/v1/repos/jfrikker/kube/archive/4a4d79a290c92de630e503f395fc8fd709904c1b.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://gitea.home-frikker.dedyn.io/jfrikker/kube/archive/1.0.1.tar.gz"
|
||||
}
|
||||
},
|
||||
"nix-index-database": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -65,11 +49,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1779604987,
|
||||
"narHash": "sha256-ZQ5z+fVhxYKtIFwtqGp5O0PD84BM1riASvqDaN5Xs+s=",
|
||||
"lastModified": 1786852476,
|
||||
"narHash": "sha256-IM5CYtf86W4w8eUPpKcY/LpdHElmVBtJhaKnoTKxZEA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "8fba98c80b48fa013820e0163c5096922fea4ddd",
|
||||
"rev": "c7962dc97b45129df8d751bedaf37beb5a17706e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -80,42 +64,42 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1779560665,
|
||||
"narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
|
||||
"lastModified": 1787101114,
|
||||
"narHash": "sha256-gwrPcFf/rDjHPaVflbDZ040ZDmBTRj/7+s8ZmE2SaIM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
|
||||
"rev": "b18a4b905f8d028dc4476412e6d6891728695379",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"ref": "nixos-26.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1765674936,
|
||||
"narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"claude-code": "claude-code",
|
||||
"home-manager": "home-manager",
|
||||
"kube": "kube",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
||||
@@ -3,15 +3,20 @@
|
||||
|
||||
inputs = {
|
||||
# Specify the source of Home Manager and Nixpkgs.
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
|
||||
claude-code = {
|
||||
url = "github:sadjow/claude-code-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/master";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
kube = {
|
||||
url = "https://gitea.home-frikker.dedyn.io/jfrikker/kube/archive/1.0.1.tar.gz";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
# kube = {
|
||||
# url = "https://gitea.home-frikker.dedyn.io/jfrikker/kube/archive/1.0.1.tar.gz";
|
||||
# inputs.nixpkgs.follows = "nixpkgs";
|
||||
# };
|
||||
|
||||
nix-index-database = {
|
||||
url = "github:nix-community/nix-index-database";
|
||||
@@ -19,7 +24,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, home-manager, kube, nix-index-database, ... }:
|
||||
outputs = { nixpkgs, home-manager, claude-code, nix-index-database, ... }:
|
||||
let modules-for-system = pkgs: pkgs.stdenv.mkDerivation {
|
||||
name = "home-manager-modules";
|
||||
src = pkgs.lib.fileset.toSource {
|
||||
@@ -41,7 +46,7 @@
|
||||
'';
|
||||
};
|
||||
in {
|
||||
homeConfigurations.shibumi =
|
||||
homeConfigurations.redbook =
|
||||
let pkgs = import nixpkgs { system = "aarch64-darwin"; config.allowUnfree = true; };
|
||||
modules = modules-for-system pkgs;
|
||||
in home-manager.lib.homeManagerConfiguration {
|
||||
@@ -52,8 +57,8 @@
|
||||
nix-index-database.homeModules.default
|
||||
"${modules}/base.nix"
|
||||
"${modules}/desktop.nix"
|
||||
"${modules}/shibumi.nix"
|
||||
"${modules}/shibumi-desktop.nix"
|
||||
"${modules}/redbook.nix"
|
||||
"${modules}/redbook-desktop.nix"
|
||||
] ++
|
||||
[{
|
||||
home.stateVersion = "22.05";
|
||||
@@ -62,7 +67,7 @@
|
||||
home.packages = [ pkgs.pinentry_mac ];
|
||||
}];
|
||||
|
||||
extraSpecialArgs = { kube = kube.packages.aarch64-darwin.default; };
|
||||
extraSpecialArgs = { claude-code = claude-code.packages.aarch64-darwin.default; };
|
||||
};
|
||||
homeConfigurations.home =
|
||||
let pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||
@@ -82,7 +87,7 @@
|
||||
home.homeDirectory = "/home/jfrikker";
|
||||
}];
|
||||
|
||||
extraSpecialArgs = { kube = kube.packages.x86_64-linux.default; };
|
||||
extraSpecialArgs = { claude-code = claude-code.packages.x86_64-linux.default; };
|
||||
};
|
||||
packages.aarch64-darwin.default = modules-for-system nixpkgs.legacyPackages.aarch64-darwin;
|
||||
};
|
||||
|
||||
@@ -18,19 +18,19 @@
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
#+BEGIN_SRC nix :tangle target/shibumi.nix
|
||||
#+BEGIN_SRC nix :tangle target/redbook.nix
|
||||
{lib, ...}: {
|
||||
imports = lib.filter
|
||||
(n: lib.strings.hasSuffix ".nix" n)
|
||||
(lib.filesystem.listFilesRecursive ./shibumi);
|
||||
(lib.filesystem.listFilesRecursive ./redbook);
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
#+BEGIN_SRC nix :tangle target/shibumi-desktop.nix
|
||||
#+BEGIN_SRC nix :tangle target/redbook-desktop.nix
|
||||
{lib, ...}: {
|
||||
imports = lib.filter
|
||||
(n: lib.strings.hasSuffix ".nix" n)
|
||||
(lib.filesystem.listFilesRecursive ./shibumi-desktop);
|
||||
(lib.filesystem.listFilesRecursive ./redbook-desktop);
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
@@ -54,10 +54,8 @@ carefully so it doesn't get carried away...
|
||||
alexandria
|
||||
cl-markup
|
||||
cl-mock
|
||||
cl-rdkafka
|
||||
clack
|
||||
clack-handler-woo
|
||||
dbd-mysql
|
||||
dbi
|
||||
defstar
|
||||
dexador
|
||||
@@ -165,17 +163,13 @@ between them. Once installed, the actual command is ~wormhole~.
|
||||
#+end_src
|
||||
|
||||
These are the other programs I have installed globally. A few (like ~awscli~, ~mysql-client~, etc.)
|
||||
are still Shibumi-specific; ideally I'd find another way to install them.
|
||||
are still Redbook-specific; ideally I'd find another way to install them.
|
||||
|
||||
#+BEGIN_SRC nix :tangle target/shibumi/other-packages.nix
|
||||
{pkgs, kube, ...}:
|
||||
#+BEGIN_SRC nix :tangle target/redbook/other-packages.nix
|
||||
{pkgs, ...}:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
aws-iam-authenticator
|
||||
awscli2
|
||||
kube
|
||||
kubectl
|
||||
mariadb.client
|
||||
postgresql
|
||||
openssh
|
||||
];
|
||||
|
||||
@@ -191,9 +185,10 @@ These programs require a full desktop environment:
|
||||
home.packages = with pkgs; [
|
||||
google-chrome
|
||||
nerd-fonts.jetbrains-mono
|
||||
nerd-fonts.symbols-only
|
||||
(iosevka-bin.override { variant = "Aile"; })
|
||||
(iosevka-bin.override { variant = "Etoile"; })
|
||||
(iosevka-bin.override { variant = "SGr-IosevkaTerm"; })
|
||||
(iosevka-bin.override { variant = "SGr-IosevkaTermSS14"; })
|
||||
keymapp
|
||||
proton-pass
|
||||
wireshark
|
||||
@@ -201,11 +196,19 @@ These programs require a full desktop environment:
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
#+BEGIN_SRC nix :tangle target/shibumi-desktop/desktop-packages.nix
|
||||
#+BEGIN_SRC nix :tangle target/redbook-desktop/desktop-packages.nix
|
||||
{pkgs, ...}:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
slack
|
||||
linear
|
||||
(slack.overrideAttrs {
|
||||
version = "4.50.143";
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.50.143/Slack-4.50.143-macOS.dmg";
|
||||
hash = "sha256-f5oYi8NPKXWpDcowFYMUjptbQs4V9hK2bm1TuaQeJn0=";
|
||||
};
|
||||
})
|
||||
teams
|
||||
];
|
||||
}
|
||||
#+END_SRC
|
||||
@@ -313,7 +316,9 @@ We all know what ~git~ does.
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings.user.name = "Joe Frikker";
|
||||
settings.user.email = "joe.frikker@shibumi.com";
|
||||
settings.user.email = "joe@redbookcattle.com";
|
||||
settings.github.user = "joe@redbookcattle.com";
|
||||
settings.merge.conflictstyle = "zdiff3";
|
||||
};
|
||||
|
||||
programs.delta = {
|
||||
@@ -340,7 +345,7 @@ The best text editor ever? Heresy!
|
||||
auto-save.after-delay.timeout = 1000;
|
||||
cursorline = true;
|
||||
idle-timeout = 0;
|
||||
rulers = [100];
|
||||
rulers = [120];
|
||||
text-width = 100;
|
||||
lsp.goto-reference-include-declaration = false;
|
||||
cursor-shape.insert = "bar";
|
||||
@@ -501,6 +506,7 @@ Then the real lua config:
|
||||
#+BEGIN_SRC lua
|
||||
local config = {}
|
||||
config.default_prog = { '/Users/jfrikker/.nix-profile/bin/zsh', '-l' }
|
||||
config.font = wezterm.font 'Iosevka Term SS14'
|
||||
config.font_size = 13.0
|
||||
-- config.font = wezterm.font("JetBrains Mono")
|
||||
config.inactive_pane_hsb = {
|
||||
@@ -658,7 +664,7 @@ Now we'll set up some keybindings:
|
||||
key = "g",
|
||||
mods = "CMD",
|
||||
action = wezterm.action.SpawnCommandInNewTab {
|
||||
args = { wezterm.home_dir .. "/.nix-profile/bin/zsh", "-l", "-c", "lazygit" }
|
||||
args = { wezterm.home_dir .. "/.nix-profile/bin/zsh", "-l", "-i", "-c", "lazygit" }
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -688,6 +694,48 @@ Now we'll set up some keybindings:
|
||||
end
|
||||
#+END_SRC
|
||||
|
||||
** Kitty
|
||||
#+BEGIN_SRC nix :tangle target/desktop/kitty.nix
|
||||
{pkgs, ...}: {
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
font = {
|
||||
name = "Iosevka Term SS14";
|
||||
package = pkgs.iosevka-bin.override { variant = "SGr-IosevkaTermSS14"; };
|
||||
size = 13;
|
||||
};
|
||||
themeFile = "Catppuccin-Frappe";
|
||||
keybindings = {
|
||||
"ctrl+1" = "goto_tab 1";
|
||||
"ctrl+2" = "goto_tab 2";
|
||||
"ctrl+3" = "goto_tab 3";
|
||||
"ctrl+4" = "goto_tab 4";
|
||||
"ctrl+5" = "goto_tab 5";
|
||||
"ctrl+6" = "goto_tab 6";
|
||||
"ctrl+7" = "goto_tab 7";
|
||||
"ctrl+8" = "goto_tab 8";
|
||||
"ctrl+9" = "goto_tab 9";
|
||||
};
|
||||
};
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
** Ghostty
|
||||
|
||||
#+BEGIN_SRC nix :tangle target/desktop/ghostty.nix
|
||||
{pkgs, ...}: {
|
||||
programs.ghostty = {
|
||||
enable = true;
|
||||
package = pkgs.ghostty-bin;
|
||||
settings = {
|
||||
adjust-cell-height = "15%";
|
||||
font-family = "Iosevka Term SS14";
|
||||
font-size = 13;
|
||||
};
|
||||
};
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
** Zsh
|
||||
|
||||
This is my default shell for now. Unfortunately, nix requires a posix-compliant shell, so bash or
|
||||
@@ -730,9 +778,10 @@ Actually, nix *really* requires ~bash~. This is a plugin that allows using zsh f
|
||||
** Claude Code
|
||||
|
||||
#+BEGIN_SRC nix :tangle target/base/claude-code.nix
|
||||
{
|
||||
{claude-code, ...}: {
|
||||
programs.claude-code = {
|
||||
enable = true;
|
||||
package = claude-code;
|
||||
};
|
||||
}
|
||||
#+END_SRC
|
||||
@@ -780,10 +829,13 @@ These are just some general settings that apply everywhere. First, a few package
|
||||
programs.emacs = {
|
||||
enable = true;
|
||||
extraPackages = epkgs: with epkgs; [
|
||||
ace-window
|
||||
doom-modeline
|
||||
free-keys
|
||||
ligature
|
||||
mixed-pitch
|
||||
ace-window
|
||||
perspective
|
||||
popper
|
||||
];
|
||||
extraConfig = builtins.readFile ./emacs-global.el;
|
||||
};
|
||||
@@ -795,6 +847,7 @@ Turn off some default settings that I don't find useful.
|
||||
#+BEGIN_SRC elisp
|
||||
(setopt inhibit-startup-screen t)
|
||||
(setopt initial-scratch-message nil)
|
||||
(setopt sentence-end-double-space nil)
|
||||
(menu-bar-mode -1)
|
||||
(scroll-bar-mode -1)
|
||||
(tool-bar-mode -1)
|
||||
@@ -806,6 +859,20 @@ Turn off some default settings that I don't find useful.
|
||||
display-buffer-in-previous-window
|
||||
display-buffer-use-some-window)))
|
||||
(setopt view-read-only t)
|
||||
(setopt save-interprogram-paste-before-kill t)
|
||||
(setopt kill-whole-line t)
|
||||
(delete-selection-mode t)
|
||||
(column-number-mode t)
|
||||
(setopt auto-save-default nil)
|
||||
(setopt create-lockfiles nil)
|
||||
(setopt enable-recursive-minibuffers t)
|
||||
(setopt line-spacing 0.15)
|
||||
|
||||
(setopt mouse-wheel-tilt-scroll t)
|
||||
(setq-default truncate-lines t)
|
||||
|
||||
(setopt tab-bar-show nil)
|
||||
(tab-bar-mode)
|
||||
#+END_SRC
|
||||
|
||||
Make sure which-key mode is always on. The on-the-fly keymap help it gives is indespensable.
|
||||
@@ -930,7 +997,9 @@ Set up a few project- / workspace-related key bindings.
|
||||
|
||||
#+BEGIN_SRC elisp
|
||||
(bind-keys ("s-f" . project-find-file)
|
||||
("s-F" . project-switch-project))
|
||||
("s-F" . project-switch-project)
|
||||
;; ("s-s" . persp-switch)
|
||||
)
|
||||
|
||||
(with-eval-after-load 'tab-bar
|
||||
(bind-keys :map tab-bar-mode-map
|
||||
@@ -953,7 +1022,7 @@ less so?
|
||||
I'm trying this out. This disables visual selections. It's bold, which is why I like it :)
|
||||
|
||||
#+BEGIN_SRC elisp
|
||||
;; (transient-mark-mode -1)
|
||||
(transient-mark-mode -1)
|
||||
#+END_SRC
|
||||
|
||||
I use tabs to manage multiple "workspaces". I don't tie a project to a tab or anything; often fixing
|
||||
@@ -985,47 +1054,222 @@ windows. I place windows in the bottom or on the right mostly depending on how w
|
||||
content to be.
|
||||
|
||||
#+BEGIN_SRC elisp
|
||||
(setq display-buffer-alist
|
||||
'(((or "\\*Flymake diagnostics .*"
|
||||
(defun jf/window-children (window)
|
||||
(let ((result nil)
|
||||
(child (window-child window)))
|
||||
(while child
|
||||
(push child result)
|
||||
(setq child (window-next-sibling child)))
|
||||
(reverse result)))
|
||||
|
||||
(defun jf/enforce-right-side-heights (win)
|
||||
(let ((slot-heights '((-1 . 20)))
|
||||
(parent (window-parent win)))
|
||||
(when parent
|
||||
(let ((children (jf/window-children parent)))
|
||||
(when (> (length children) 1)
|
||||
(cl-loop for child in children
|
||||
for slot = (window-parameter child 'window-slot)
|
||||
for height = (alist-get slot slot-heights)
|
||||
when height do (progn (window-resize child (- height (window-height child)))
|
||||
(window-preserve-size child nil t))))))))
|
||||
|
||||
(defun jf/enforce-right-side-width (win)
|
||||
"Resize side window WIN so its frame keeps 120 columns for the rest of the frame."
|
||||
(let ((width (max 1 (- (frame-width (window-frame win)) 120))))
|
||||
(window-resize win (- width (window-width win)) t)))
|
||||
|
||||
(defun jf/enforce-right-side-widths (frame)
|
||||
"Re-apply `jf/enforce-right-side-width' to all of FRAME's right-side windows."
|
||||
(dolist (win (window-list frame 'nomini))
|
||||
(when (eq (window-parameter win 'window-side) 'right)
|
||||
(jf/enforce-right-side-width win))))
|
||||
|
||||
(add-hook 'window-size-change-functions #'jf/enforce-right-side-widths)
|
||||
|
||||
;; (require 'perspective)
|
||||
;; (setopt persp-mode-prefix-key (kbd "C-x t"))
|
||||
;; (setopt persp-show-modestring nil)
|
||||
;; (persp-mode)
|
||||
|
||||
;; (defun jf/popper-group-by-owning-perspective ()
|
||||
;; "Return the name of the perspective that owns the current buffer.
|
||||
|
||||
;; Unlike `popper-group-by-perspective', which just returns whichever
|
||||
;; perspective happens to be active on the frame right now, this looks
|
||||
;; up which perspective's buffer list the popup buffer actually belongs
|
||||
;; to. This matters because popper re-groups popups on
|
||||
;; `window-configuration-change-hook', which perspective.el triggers
|
||||
;; *after* switching the frame's active perspective -- so
|
||||
;; `popper-group-by-perspective' ends up filing a popup under the
|
||||
;; perspective you just switched *to* rather than the one it came from."
|
||||
;; (let ((buf (current-buffer)))
|
||||
;; (or (cl-loop for persp being the hash-values of (perspectives-hash (selected-frame))
|
||||
;; if (memq buf (persp-buffers persp))
|
||||
;; return (persp-name persp))
|
||||
;; (persp-current-name))))
|
||||
|
||||
(setopt popper-reference-buffers
|
||||
'("\\*Flymake diagnostics .*"
|
||||
"\\*Embark Export: .*"
|
||||
"\\*Embark Collect .*"
|
||||
"\\*xref\\*"
|
||||
"\\*compilation\\*"
|
||||
"\\*pnpm:.*"
|
||||
"\\*sly-mrepl *"
|
||||
"\\*Messages\\*"
|
||||
"\\*lispy-message\\*"
|
||||
"\\*EGLOT connections\\*"
|
||||
"\\*trace-output\\*"
|
||||
"\\*occur\\*"
|
||||
".*eshell\\*")
|
||||
(display-buffer-in-side-window)
|
||||
(side . bottom)
|
||||
(slot . 0)
|
||||
(window-height . 0.33)
|
||||
(window-parameters (no-delete-other-windows . t)
|
||||
(no-other-window . t)))
|
||||
((or "magit: *"
|
||||
".*eshell\\*"
|
||||
"\\*SQL: .*"
|
||||
"magit-revision: .*"
|
||||
"magit-log*"
|
||||
"\\*eldoc\\*"
|
||||
"\\*Help\\*"
|
||||
"\\*rustfmt\\*"
|
||||
"\\*slack: .*"
|
||||
"\\*forge: .*"
|
||||
"new-pullreq"
|
||||
"\\*claude:.*"
|
||||
"\\*Man .*")
|
||||
(display-buffer-reuse-window display-buffer-in-side-window)
|
||||
(side . right)
|
||||
"\\*Man .*"
|
||||
"\\*List .*"
|
||||
"\\*eldoc\\*"))
|
||||
(setopt popper-display-control nil)
|
||||
;; (setopt popper-group-function 'jf/popper-group-by-owning-perspective)
|
||||
|
||||
(popper-mode)
|
||||
(popper-echo-mode)
|
||||
|
||||
(bind-keys ("C-q" . popper-toggle)
|
||||
("C-;" . popper-cycle))
|
||||
|
||||
(defvar jf/fullscreen-popup--param 'jf/fullscreen-saved-configuration
|
||||
"Key used to stash the window configuration a fullscreen popup replaced.
|
||||
Stored per-tab when `tab-bar-mode' is active, otherwise as a plain frame
|
||||
parameter; see `jf/tab-or-frame-parameter'.")
|
||||
|
||||
(defvar-local jf/fullscreen-popup-p nil
|
||||
"Non-nil in a buffer currently being displayed as a fullscreen popup.")
|
||||
|
||||
(defun jf/current-tab-cell (&optional frame)
|
||||
"Return FRAME's current tab's raw data cell, or nil without `tab-bar-mode'."
|
||||
(and (bound-and-true-p tab-bar-mode)
|
||||
(assq 'current-tab (tab-bar-tabs frame))))
|
||||
|
||||
(defun jf/tab-or-frame-parameter (parameter &optional frame)
|
||||
"Like `frame-parameter', but scoped to FRAME's selected tab when tabs are in use.
|
||||
|
||||
A plain frame parameter is shared by every tab on that frame, which is wrong
|
||||
for state like `jf/fullscreen-popup--param': switching tabs swaps in an
|
||||
entirely different window layout, so \"the layout to restore\" has to travel
|
||||
with the tab, not the frame."
|
||||
(if-let ((tab (jf/current-tab-cell frame)))
|
||||
(alist-get parameter tab)
|
||||
(frame-parameter frame parameter)))
|
||||
|
||||
(defun jf/set-tab-or-frame-parameter (parameter value &optional frame)
|
||||
"Set PARAMETER to VALUE, scoped like `jf/tab-or-frame-parameter'."
|
||||
(if-let ((tab (jf/current-tab-cell frame)))
|
||||
(let ((cell (assq parameter tab)))
|
||||
(if cell
|
||||
(setcdr cell value)
|
||||
(setcdr tab (cons (cons parameter value) (cdr tab)))))
|
||||
(set-frame-parameter frame parameter value)))
|
||||
|
||||
(defun jf/display-buffer-fullscreen (buffer alist)
|
||||
"Display BUFFER, deleting other windows, saving the prior layout.
|
||||
|
||||
Intended for use in `display-buffer-alist' for popups (e.g. Magit
|
||||
status/log) that should take over the frame while displayed, but
|
||||
restore the previous window configuration once closed via either
|
||||
`q' or `popper-toggle' -- both end up calling `quit-window', which
|
||||
is where the restore actually happens; see
|
||||
`jf/quit-window-restore-fullscreen'."
|
||||
(unless (jf/tab-or-frame-parameter jf/fullscreen-popup--param)
|
||||
(jf/set-tab-or-frame-parameter jf/fullscreen-popup--param
|
||||
(current-window-configuration)))
|
||||
(when-let ((window (or (display-buffer-reuse-window buffer alist)
|
||||
(display-buffer-same-window buffer alist)
|
||||
(display-buffer-pop-up-window buffer alist)
|
||||
(display-buffer-use-some-window buffer alist))))
|
||||
(let ((ignore-window-parameters t))
|
||||
(delete-other-windows window))
|
||||
(with-current-buffer buffer
|
||||
(setq jf/fullscreen-popup-p t))
|
||||
window))
|
||||
|
||||
(defun jf/quit-window-restore-fullscreen (orig-fn &optional kill window)
|
||||
"Restore the saved window configuration after quitting a fullscreen popup.
|
||||
|
||||
Advice around `quit-window' so both `q' (which Magit and other
|
||||
special-mode buffers bind to buffer-quitting commands that call
|
||||
`quit-window') and Popper's close/toggle commands (which also call
|
||||
`quit-window' directly) trigger the restore. Only restores once the
|
||||
last fullscreen popup on the tab (or frame, without `tab-bar-mode')
|
||||
has closed, so opening one fullscreen popup from within another
|
||||
falls back to the outer one first."
|
||||
(let* ((window (or window (selected-window)))
|
||||
(was-fullscreen (buffer-local-value 'jf/fullscreen-popup-p
|
||||
(window-buffer window)))
|
||||
(frame (window-frame window)))
|
||||
(funcall orig-fn kill window)
|
||||
(when (and was-fullscreen
|
||||
(not (and (window-live-p window)
|
||||
(buffer-local-value 'jf/fullscreen-popup-p
|
||||
(window-buffer window))))
|
||||
(jf/tab-or-frame-parameter jf/fullscreen-popup--param frame))
|
||||
(let ((conf (jf/tab-or-frame-parameter jf/fullscreen-popup--param frame)))
|
||||
(jf/set-tab-or-frame-parameter jf/fullscreen-popup--param nil frame)
|
||||
(set-window-configuration conf)))))
|
||||
|
||||
(advice-add 'quit-window :around #'jf/quit-window-restore-fullscreen)
|
||||
|
||||
(setq display-buffer-alist
|
||||
'(((or "magit: *"
|
||||
"magit-log*"
|
||||
"\\*Messages\\*"
|
||||
"\\*trace-output\\*"
|
||||
"\\*EGLOT connections\\*")
|
||||
(jf/display-buffer-fullscreen))
|
||||
((or "\\*Flymake diagnostics .*"
|
||||
"\\*Embark Export: .*"
|
||||
"\\*Embark Collect .*"
|
||||
"\\*xref\\*"
|
||||
"\\*compilation\\*"
|
||||
"\\*pnpm:.*"
|
||||
"\\*sly-mrepl *"
|
||||
"\\*lispy-message\\*"
|
||||
"\\*occur\\*"
|
||||
".*eshell\\*"
|
||||
"\\*SQL: .*")
|
||||
(display-buffer-in-side-window)
|
||||
(side . bottom)
|
||||
(slot . 0)
|
||||
(window-width . 0.5)
|
||||
(window-height . 0.33)
|
||||
(window-parameters (no-delete-other-windows . t)
|
||||
(no-other-window . t)))
|
||||
("\\*Embark Actions\\*"
|
||||
((or "magit-revision: .*"
|
||||
"\\*Help\\*"
|
||||
"\\*rustfmt\\*"
|
||||
"\\*slack: .*"
|
||||
"\\*forge: .*"
|
||||
"new-pullreq"
|
||||
"\\*claude:.*"
|
||||
"\\*Man .*"
|
||||
"\\*List .*")
|
||||
(display-buffer-in-side-window)
|
||||
(side . right)
|
||||
(slot . 0)
|
||||
(window-width . jf/enforce-right-side-width)
|
||||
(window-height . jf/enforce-right-side-heights)
|
||||
(preserve-size . (nil . nil))
|
||||
(window-parameters (no-delete-other-windows . t)
|
||||
(no-other-window . t)))
|
||||
((or "\\*Embark Actions\\*"
|
||||
"\\*eldoc\\*")
|
||||
(display-buffer-in-side-window)
|
||||
(side . right)
|
||||
(slot . -1)
|
||||
(window-width . 0.5)
|
||||
(window-width . jf/enforce-right-side-width)
|
||||
(window-height . jf/enforce-right-side-heights)
|
||||
(preserve-size . (nil . t))
|
||||
(window-parameters (no-delete-other-windows . t)
|
||||
(no-other-window . t)))))
|
||||
|
||||
@@ -1051,9 +1295,11 @@ This configuration affects general text editing, across all modes. First, some p
|
||||
avy
|
||||
edit-indirect
|
||||
embark
|
||||
evil
|
||||
evil-collection
|
||||
evil-org
|
||||
format-all
|
||||
god-mode
|
||||
# evil
|
||||
# evil-collection
|
||||
# evil-org
|
||||
string-inflection
|
||||
];
|
||||
extraConfig = builtins.readFile ./emacs-editing.el;
|
||||
@@ -1073,17 +1319,32 @@ cancel them more frequently). In the end, I opted for Devil mode. It avoids modi
|
||||
its own devil-mode-only repeat maps that don't interfere when using normal modifier key sequences.
|
||||
|
||||
#+BEGIN_SRC elisp
|
||||
(setopt evil-want-keybinding nil)
|
||||
(require 'evil)
|
||||
(evil-mode 1)
|
||||
(require 'evil-collection)
|
||||
(evil-collection-init)
|
||||
;; (setopt evil-want-keybinding nil)
|
||||
;; (require 'evil)
|
||||
;; (evil-mode 1)
|
||||
;; (require 'evil-collection)
|
||||
;; (evil-collection-init)
|
||||
|
||||
(require 'evil-org)
|
||||
(add-hook 'org-mode-hook 'evil-org-mode)
|
||||
(evil-org-set-key-theme '(navigation insert textobjects additional calendar))
|
||||
(require 'evil-org-agenda)
|
||||
(evil-org-agenda-set-keys)
|
||||
;; (require 'evil-org)
|
||||
;; (add-hook 'org-mode-hook 'evil-org-mode)
|
||||
;; (evil-org-set-key-theme '(navigation insert textobjects additional calendar))
|
||||
;; (require 'evil-org-agenda)
|
||||
;; (evil-org-agenda-set-keys)
|
||||
(require 'god-mode)
|
||||
(require 'which-key)
|
||||
|
||||
(bind-keys :map god-local-mode-map
|
||||
("i" . (lambda () (interactive) (god-mode-all -1)))
|
||||
("z" . repeat))
|
||||
(bind-keys ("<escape>" . (lambda () (interactive) (god-mode-all 1))))
|
||||
(defun my-god-mode-update-cursor-type ()
|
||||
(setq cursor-type (cond
|
||||
((and (featurep 'org-present) org-present-mode) nil)
|
||||
((or (and (featurep 'god-mode) god-local-mode) buffer-read-only) 'box)
|
||||
(t 'bar))))
|
||||
|
||||
(add-hook 'post-command-hook 'my-god-mode-update-cursor-type)
|
||||
(which-key-enable-god-mode-support)
|
||||
#+END_SRC
|
||||
|
||||
Avy allows jumping to any place on the screen with just a few keystrokes. I've stolen most of these
|
||||
@@ -1105,10 +1366,17 @@ his article.
|
||||
(avy-goto-char-timer)))
|
||||
|
||||
(bind-keys
|
||||
("M-j" . avy-goto-char-timer)
|
||||
("C-c j" . avy-goto-char-timer)
|
||||
("M-J" . avy-goto-char-timer-embark)
|
||||
("C-j" . avy-goto-char-timer)
|
||||
("M-j" . avy-goto-char-timer-embark)
|
||||
("C-." . embark-act))
|
||||
|
||||
(with-eval-after-load 'lispy
|
||||
(bind-keys :map lispy-mode-map
|
||||
("C-j" . avy-goto-char-timer)))
|
||||
|
||||
(with-eval-after-load 'org
|
||||
(bind-keys :map org-mode-map
|
||||
("C-j" . avy-goto-char-timer)))
|
||||
#+END_SRC
|
||||
|
||||
Just "silently" wrap when searching at the bottom of a document.
|
||||
@@ -1141,6 +1409,44 @@ Just "silently" wrap when searching at the bottom of a document.
|
||||
(bind-keys ("C-x 4 n" . edit-indirect-region))
|
||||
#+END_SRC
|
||||
|
||||
** Workflow
|
||||
:PROPERTIES:
|
||||
:header-args:elisp: :tangle target/desktop/emacs-workflow.el
|
||||
:END:
|
||||
|
||||
#+BEGIN_SRC nix :tangle target/desktop/emacs-workflow.nix
|
||||
{
|
||||
programs.emacs = {
|
||||
enable = true;
|
||||
extraPackages = epkgs: with epkgs; [
|
||||
# bufferlo
|
||||
];
|
||||
extraConfig = builtins.readFile ./emacs-workflow.el;
|
||||
};
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
#+BEGIN_SRC elisp
|
||||
;; (bufferlo-mode)
|
||||
|
||||
;; (setopt bufferlo-include-buried-buffers nil)
|
||||
|
||||
;; (with-eval-after-load 'bufferlo
|
||||
;; (setq mode-line-misc-info
|
||||
;; (assq-delete-all 'bufferlo-mode mode-line-misc-info)))
|
||||
|
||||
;; (defun my/bury-or-kill-buffer ()
|
||||
;; (interactive)
|
||||
;; (bury-buffer)
|
||||
;; (bufferlo-kill-orphan-buffers))
|
||||
|
||||
(bind-keys
|
||||
("s-b" . consult-buffer)
|
||||
;; ("C-x t 0" . bufferlo-tab-close-kill-buffers)
|
||||
;; ("C-x k" . my/bury-or-kill-buffer)
|
||||
)
|
||||
#+END_SRC
|
||||
|
||||
** Language Support
|
||||
:PROPERTIES:
|
||||
:header-args:elisp: :tangle target/desktop/emacs-languages.el
|
||||
@@ -1152,18 +1458,21 @@ Just "silently" wrap when searching at the bottom of a document.
|
||||
enable = true;
|
||||
extraPackages = epkgs: with epkgs; [
|
||||
consult-eglot
|
||||
graphql-ts-mode
|
||||
haskell-ts-mode
|
||||
jenkinsfile-mode
|
||||
jq-mode
|
||||
(lispy.overrideAttrs {
|
||||
packageRequires = [
|
||||
ace-window iedit swiper zoutline
|
||||
ace-window iedit swiper zoutline hydra
|
||||
];
|
||||
ignoreCompilationError = true;
|
||||
})
|
||||
lispyville
|
||||
# lispyville
|
||||
lua-mode
|
||||
nix-mode
|
||||
pnpm-mode
|
||||
prisma-ts-mode
|
||||
rust-mode
|
||||
sly
|
||||
sly-macrostep
|
||||
@@ -1194,6 +1503,7 @@ Just "silently" wrap when searching at the bottom of a document.
|
||||
g.tree-sitter-nix
|
||||
g.tree-sitter-org
|
||||
g.tree-sitter-php
|
||||
g.tree-sitter-prisma
|
||||
g.tree-sitter-python
|
||||
g.tree-sitter-rust
|
||||
g.tree-sitter-rust-format-args
|
||||
@@ -1231,7 +1541,7 @@ Show a vertical bar 100 characters out; ideally I don't want lines longer than t
|
||||
is about the max you can have and still fit two files side-by-side on the screen.
|
||||
|
||||
#+begin_src elisp
|
||||
(setq-default fill-column 100)
|
||||
(setq-default fill-column 120)
|
||||
|
||||
(defun jf-init-fill-column ()
|
||||
(display-fill-column-indicator-mode 1))
|
||||
@@ -1271,6 +1581,10 @@ available? It seems to work for now anyway...
|
||||
(advice-add 'prog-fill-reindent-defun :override #'my-prog-fill-reindent-defun))
|
||||
#+end_src
|
||||
|
||||
#+BEGIN_SRC elisp
|
||||
(add-hook 'compilation-filter-hook 'ansi-color-compilation-filter)
|
||||
#+END_SRC
|
||||
|
||||
*** Flymake
|
||||
#+begin_src elisp
|
||||
(autoload 'flymake-show-project-diagnostics "flymake")
|
||||
@@ -1295,6 +1609,7 @@ I don't like UI elements that insert fake text into the file. They mess up the s
|
||||
(setopt eglot-ignored-server-capabilities '(:inlayHintProvider :semanticTokensProvider))
|
||||
(add-hook 'eglot-managed-mode-hook (lambda () (eglot-inlay-hints-mode -1)) nil t)
|
||||
(setopt eglot-code-action-indications nil)
|
||||
(setopt eglot-events-buffer-config '(:size 300000 :format full))
|
||||
#+END_SRC
|
||||
|
||||
Set up a few useful eglot keys.
|
||||
@@ -1342,9 +1657,10 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
|
||||
(setopt lispy-compat '(god-mode edebug))
|
||||
(add-hook 'emacs-lisp-mode-hook (lambda () (lispy-mode 1)))
|
||||
(add-hook 'lisp-mode-hook (lambda () (lispy-mode 1)))
|
||||
(add-hook 'lisp-data-mode-hook (lambda () (lispy-mode 1)))
|
||||
(with-eval-after-load 'lispy
|
||||
(require 'lispyville)
|
||||
(add-hook 'lispy-mode-hook #'lispyville-mode)
|
||||
;; (require 'lispyville)
|
||||
;; (add-hook 'lispy-mode-hook #'lispyville-mode)
|
||||
(bind-keys :map lispy-mode-map
|
||||
("i" . (lambda ()
|
||||
(interactive)
|
||||
@@ -1355,11 +1671,11 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
|
||||
|
||||
*** Typescript
|
||||
#+BEGIN_SRC elisp
|
||||
(push '("\\.ts\\'" . typescript-mode) auto-mode-alist)
|
||||
(push '(typescript-mode . typescript-ts-mode) major-mode-remap-alist)
|
||||
(push '("\\.tsx\\'" . tsx-mode) auto-mode-alist)
|
||||
(push '(tsx-mode . tsx-ts-mode) major-mode-remap-alist)
|
||||
(setopt typescript-ts-mode-indent-offset 4)
|
||||
(add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-mode))
|
||||
(add-to-list 'major-mode-remap-alist '(typescript-mode . typescript-ts-mode))
|
||||
(add-to-list 'auto-mode-alist '("\\.tsx\\'" . tsx-mode))
|
||||
(add-to-list 'major-mode-remap-alist '(tsx-mode . tsx-ts-mode))
|
||||
(setopt typescript-ts-mode-indent-offset 2)
|
||||
(with-eval-after-load 'typescript-ts-mode
|
||||
(defun my-tsx-ts-mode--indent-compatibility-b893426 ()
|
||||
"Indent rules helper, to handle different releases of tree-sitter-tsx.
|
||||
@@ -1373,6 +1689,52 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
|
||||
`(((match "<" "jsx_text") parent 0)
|
||||
((parent-is "jsx_text") grand-parent typescript-ts-mode-indent-offset)))))
|
||||
(advice-add 'tsx-ts-mode--indent-compatibility-b893426 :override #'my-tsx-ts-mode--indent-compatibility-b893426))
|
||||
|
||||
(defvar my/edit-indirect-tag-modes
|
||||
'(("graphql" . graphql-ts-mode)
|
||||
("gql" . graphql-ts-mode)
|
||||
("sql" . sql-mode)
|
||||
("css" . css-mode))
|
||||
"Map of tagged-template tag names to major modes.")
|
||||
|
||||
(defun my/edit-indirect--node-bounds (node)
|
||||
"Return (BEG . END) for NODE's contents, excluding delimiters."
|
||||
(cons (1+ (treesit-node-start node))
|
||||
(1- (treesit-node-end node))))
|
||||
|
||||
(defun my/edit-indirect-tagged-template-at-point ()
|
||||
(interactive)
|
||||
(let* ((node (treesit-node-at (point)))
|
||||
(tmpl-node (treesit-parent-until
|
||||
node
|
||||
(lambda (n) (equal (treesit-node-type n) "template_string"))))
|
||||
(str-node (unless tmpl-node
|
||||
(treesit-parent-until
|
||||
node
|
||||
(lambda (n) (equal (treesit-node-type n) "string")))))
|
||||
(target-node (or tmpl-node str-node)))
|
||||
(unless target-node
|
||||
(user-error "Point is not inside a string or template literal"))
|
||||
(let* ((tagged-node (and tmpl-node (treesit-node-parent tmpl-node)))
|
||||
(tag-node (and tagged-node
|
||||
(equal (treesit-node-type tagged-node) "call_expression")
|
||||
(treesit-node-child-by-field-name tagged-node "function")))
|
||||
(tag-name (and tag-node (treesit-node-text tag-node t)))
|
||||
(mode (cond
|
||||
(tag-name (or (cdr (assoc tag-name my/edit-indirect-tag-modes))
|
||||
major-mode))
|
||||
(t 'text-mode)))
|
||||
(bounds (my/edit-indirect--node-bounds target-node))
|
||||
(buf (edit-indirect-region (car bounds) (cdr bounds) t)))
|
||||
(with-current-buffer buf
|
||||
(funcall mode)))))
|
||||
|
||||
(with-eval-after-load 'typescript-ts-mode
|
||||
(define-key typescript-ts-mode-map (kbd "C-c '") #'my/edit-indirect-tagged-template-at-point)
|
||||
(define-key tsx-ts-mode-map (kbd "C-c '") #'my/edit-indirect-tagged-template-at-point))
|
||||
|
||||
(with-eval-after-load 'eglot
|
||||
(add-to-list 'eglot-server-programs '((prisma-ts-mode) "prisma-language-server" "--stdio")))
|
||||
#+END_SRC
|
||||
|
||||
*** Java
|
||||
@@ -1519,11 +1881,10 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
|
||||
|
||||
;; ("C-x M-:" . consult-complex-command)
|
||||
("C-x b" . consult-buffer)
|
||||
("s-b" . consult-project-buffer)
|
||||
("s-B" . consult-buffer)
|
||||
("C-x 4 b" . consult-buffer-other-window)
|
||||
("C-x 5 b" . consult-buffer-other-frame)
|
||||
("C-x t b" . consult-buffer-other-tab)
|
||||
;; ("C-x t b" . consult-buffer-other-tab)
|
||||
("C-x r b" . consult-bookmark)
|
||||
("C-x p b" . consult-project-buffer)
|
||||
|
||||
@@ -1562,14 +1923,31 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
|
||||
(eval-when-compile
|
||||
(require 'consult))
|
||||
|
||||
;; (require 'perspective)
|
||||
;; (with-eval-after-load 'consult
|
||||
;; (consult-customize
|
||||
;; consult-theme :preview-key '(:debounce 0.2 any)
|
||||
;; consult-ripgrep consult-git-grep consult-grep consult-man
|
||||
;; consult-bookmark consult-recent-file consult-xref
|
||||
;; consult-source-bookmark consult-source-file-register
|
||||
;; consult-source-recent-file
|
||||
;; consult-source-buffer
|
||||
;; ;; :preview-key "M-."
|
||||
;; consult-source-project-recent-file
|
||||
;; :preview-key '(:debounce 0.4 any))
|
||||
;; (consult-customize consult-source-buffer :hidden t :default nil)
|
||||
;; (add-to-list 'consult-buffer-sources persp-consult-source))
|
||||
|
||||
(with-eval-after-load 'consult
|
||||
(consult-customize
|
||||
consult-theme :preview-key '(:debounce 0.2 any)
|
||||
consult-ripgrep consult-git-grep consult-grep consult-man
|
||||
consult-bookmark consult-recent-file consult-xref
|
||||
consult-source-bookmark consult-source-file-register
|
||||
consult-source-recent-file consult-source-project-recent-file
|
||||
consult-source-recent-file
|
||||
consult-source-buffer
|
||||
;; :preview-key "M-."
|
||||
consult-source-project-recent-file
|
||||
:preview-key '(:debounce 0.4 any)))
|
||||
|
||||
(setopt consult-narrow-key "<") ;; "C-+"
|
||||
@@ -1620,6 +1998,8 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
|
||||
("C-c C" . org-capture)
|
||||
("C-c l" . org-id-store-link))
|
||||
|
||||
(setopt org-babel-load-languages '((emacs-lisp . t) (sql . t)))
|
||||
(setopt org-confirm-babel-evaluate nil)
|
||||
(add-hook 'org-mode-hook 'visual-line-mode)
|
||||
(setopt org-link-keep-stored-after-insertion t
|
||||
org-capture-templates
|
||||
@@ -1654,11 +2034,11 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
|
||||
(set-face-attribute 'org-level-7 nil :font "Iosevka Aile")
|
||||
(set-face-attribute 'org-level-8 nil :font "Iosevka Aile")
|
||||
|
||||
(require 'org-present)
|
||||
(defvar-local my/org-present-face-remapping-cookies nil)
|
||||
(with-eval-after-load 'org-present
|
||||
(require 'face-remap)
|
||||
(require 'visual-fill-column)
|
||||
|
||||
(defvar-local my/org-present-face-remapping-cookies nil)
|
||||
(defun my/org-present-start ()
|
||||
(setq-local my/org-present-face-remapping-cookies nil)
|
||||
;; Tweak font sizes
|
||||
@@ -1710,21 +2090,22 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
|
||||
)
|
||||
|
||||
(add-hook 'org-present-mode-hook 'my/org-present-start)
|
||||
(add-hook 'org-present-mode-quit-hook 'my/org-present-end)
|
||||
(add-hook 'org-present-mode-quit-hook 'my/org-present-end))
|
||||
|
||||
(require 'org-roam)
|
||||
(bind-keys ("C-c n l" . org-roam-buffer-toggle)
|
||||
("C-c n f" . org-roam-node-find)
|
||||
("C-c n g" . org-roam-graph)
|
||||
("C-c n i" . org-roam-node-insert)
|
||||
("C-c n c" . org-roam-capture))
|
||||
;; (require 'org-roam)
|
||||
;; (bind-keys ("C-c n l" . org-roam-buffer-toggle)
|
||||
;; ("C-c n f" . org-roam-node-find)
|
||||
;; ("C-c n g" . org-roam-graph)
|
||||
;; ("C-c n i" . org-roam-node-insert)
|
||||
;; ("C-c n c" . org-roam-capture))
|
||||
|
||||
;; (setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag)))
|
||||
(org-roam-db-autosync-mode)
|
||||
;; (org-roam-db-autosync-mode)
|
||||
|
||||
(add-hook 'org-mode-hook 'org-modern-mode)
|
||||
(use-package org-modern
|
||||
:hook org-mode-hook)
|
||||
|
||||
(define-key org-mode-map (kbd "C-c C-r") verb-command-map)
|
||||
;; (define-key org-mode-map (kbd "C-c C-r") verb-command-map)
|
||||
#+END_SRC
|
||||
|
||||
** Terminal
|
||||
@@ -1745,7 +2126,9 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
|
||||
#+END_SRC
|
||||
|
||||
#+BEGIN_SRC elisp
|
||||
(eat-eshell-mode)
|
||||
(use-package eat
|
||||
:commands (eat)
|
||||
:hook (eshell-load-hook . eat-eshell-mode))
|
||||
#+END_SRC
|
||||
|
||||
** Slack
|
||||
@@ -1766,32 +2149,16 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
|
||||
#+END_SRC
|
||||
|
||||
#+BEGIN_SRC elisp
|
||||
(setopt lui-time-stamp-format "[%Y-%m-%d %H:%M]")
|
||||
(setopt slack-render-profile-images-p nil)
|
||||
(setopt slack-buffer-function #'switch-to-buffer)
|
||||
#+END_SRC
|
||||
(use-package lui
|
||||
:defer t
|
||||
:custom
|
||||
(lui-time-stamp-format "[%Y-%m-%d %H:%M]"))
|
||||
|
||||
** Kubernetes
|
||||
:PROPERTIES:
|
||||
:header-args:elisp: :tangle target/desktop/emacs-kubernetes.el
|
||||
:END:
|
||||
|
||||
#+BEGIN_SRC nix :tangle target/desktop/emacs-kubernetes.nix
|
||||
{
|
||||
programs.emacs = {
|
||||
enable = true;
|
||||
extraPackages = epkgs: with epkgs; [
|
||||
kubed
|
||||
];
|
||||
extraConfig = builtins.readFile ./emacs-kubernetes.el;
|
||||
};
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
#+BEGIN_SRC elisp
|
||||
(use-package kubed
|
||||
:bind-keymap
|
||||
("s-k" . kubed-prefix-map))
|
||||
(use-package slack
|
||||
:commands slack-start
|
||||
:custom
|
||||
(slack-render-profile-images-p nil)
|
||||
(slack-buffer-function #'switch-to-buffer))
|
||||
#+END_SRC
|
||||
|
||||
** Ledger
|
||||
@@ -1825,10 +2192,13 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
|
||||
#+END_SRC
|
||||
|
||||
#+BEGIN_SRC elisp
|
||||
(use-package age
|
||||
:custom
|
||||
(setopt age-default-identity "~/source/dotfiles/keys/yubi1age.txt")
|
||||
(setopt age-default-recipient "~/source/dotfiles/keys/myself.txt")
|
||||
(age-default-recipient "~/source/dotfiles/keys/myself.txt")
|
||||
:config
|
||||
(setenv "PINENTRY_PROGRAM" "pinentry-mac")
|
||||
(age-file-enable)
|
||||
(age-file-enable))
|
||||
#+END_SRC
|
||||
|
||||
** Claude Code
|
||||
@@ -1843,12 +2213,13 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
|
||||
enable = true;
|
||||
extraPackages = epkgs: with epkgs; [
|
||||
(epkgs.trivialBuild {
|
||||
name = "claude-code";
|
||||
pname = "claude-code";
|
||||
version = "0.4.5";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "stevemolitor";
|
||||
repo = "claude-code.el";
|
||||
rev = "4a9914bd4161eb43f489820f9174c62390e5adc8";
|
||||
sha256 = "sha256-ISlD6q1hceckry1Jd19BX1MfobHJxng5ulX2gq9f644=";
|
||||
rev = "03199df8b3a1e9cd4857f0851f7a912ba524aff3";
|
||||
sha256 = "sha256-5QJrWIu4EgnHcOqMwlrs2JBBx7aI9OaSJswesr6Apfk=";
|
||||
};
|
||||
packageRequires = [ epkgs.inheritenv ];
|
||||
})
|
||||
@@ -1859,8 +2230,9 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
|
||||
#+END_SRC
|
||||
|
||||
#+BEGIN_SRC elisp
|
||||
(require 'claude-code)
|
||||
(keymap-global-set "C-c c" claude-code-command-map)
|
||||
(use-package claude-code
|
||||
:bind-keymap ("C-c c" . claude-code-command-map)
|
||||
:custom (claude-code-optimize-window-resize nil))
|
||||
#+END_SRC
|
||||
* Theme
|
||||
I like Catppuccin Frappe as my theme. Let's use it in as many places as we can.
|
||||
@@ -1951,6 +2323,13 @@ I like Catppuccin Frappe as my theme. Let's use it in as many places as we can.
|
||||
return config
|
||||
#+END_SRC
|
||||
|
||||
** Ghostty
|
||||
#+BEGIN_SRC nix :tangle target/desktop/ghostty-theme.nix
|
||||
{
|
||||
programs.ghostty.settings.theme = "Catppuccin Frappe";
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
** Emacs
|
||||
:PROPERTIES:
|
||||
:header-args:elisp: :tangle target/desktop/emacs-theme.el
|
||||
@@ -1975,7 +2354,7 @@ I like Catppuccin Frappe as my theme. Let's use it in as many places as we can.
|
||||
|
||||
;; (set-face-attribute 'default nil :font "JetBrainsMono Nerd Font" :height 130)
|
||||
;; (set-face-attribute 'fixed-pitch nil :font "JetBrainsMono Nerd Font" :height 130)
|
||||
(set-face-attribute 'default nil :font "Iosevka Term" :height 130 :width 'expanded)
|
||||
(set-face-attribute 'fixed-pitch nil :font "Iosevka Term" :height 130 :width 'expanded)
|
||||
(set-face-attribute 'default nil :font "Iosevka Term SS14" :height 130)
|
||||
(set-face-attribute 'fixed-pitch nil :font "Iosevka Term SS14" :height 130)
|
||||
(set-face-attribute 'variable-pitch nil :font "Iosevka Etoile" :height 130)
|
||||
#+END_SRC
|
||||
|
||||
Reference in New Issue
Block a user