3 Commits

Author SHA1 Message Date
Joe Frikker 50d27458af no evil 2026-06-23 22:54:08 -04:00
Joe Frikker d0d340e04f shibumi -> redbook 2026-06-19 18:39:46 -04:00
Joe Frikker b7912eef52 Redbook 2026-06-19 18:38:22 -04:00
2 changed files with 37 additions and 35 deletions
+3 -3
View File
@@ -41,7 +41,7 @@
''; '';
}; };
in { in {
homeConfigurations.shibumi = homeConfigurations.redbook =
let pkgs = import nixpkgs { system = "aarch64-darwin"; config.allowUnfree = true; }; let pkgs = import nixpkgs { system = "aarch64-darwin"; config.allowUnfree = true; };
modules = modules-for-system pkgs; modules = modules-for-system pkgs;
in home-manager.lib.homeManagerConfiguration { in home-manager.lib.homeManagerConfiguration {
@@ -52,8 +52,8 @@
nix-index-database.homeModules.default nix-index-database.homeModules.default
"${modules}/base.nix" "${modules}/base.nix"
"${modules}/desktop.nix" "${modules}/desktop.nix"
"${modules}/shibumi.nix" "${modules}/redbook.nix"
"${modules}/shibumi-desktop.nix" "${modules}/redbook-desktop.nix"
] ++ ] ++
[{ [{
home.stateVersion = "22.05"; home.stateVersion = "22.05";
+34 -32
View File
@@ -18,19 +18,19 @@
} }
#+END_SRC #+END_SRC
#+BEGIN_SRC nix :tangle target/shibumi.nix #+BEGIN_SRC nix :tangle target/redbook.nix
{lib, ...}: { {lib, ...}: {
imports = lib.filter imports = lib.filter
(n: lib.strings.hasSuffix ".nix" n) (n: lib.strings.hasSuffix ".nix" n)
(lib.filesystem.listFilesRecursive ./shibumi); (lib.filesystem.listFilesRecursive ./redbook);
} }
#+END_SRC #+END_SRC
#+BEGIN_SRC nix :tangle target/shibumi-desktop.nix #+BEGIN_SRC nix :tangle target/redbook-desktop.nix
{lib, ...}: { {lib, ...}: {
imports = lib.filter imports = lib.filter
(n: lib.strings.hasSuffix ".nix" n) (n: lib.strings.hasSuffix ".nix" n)
(lib.filesystem.listFilesRecursive ./shibumi-desktop); (lib.filesystem.listFilesRecursive ./redbook-desktop);
} }
#+END_SRC #+END_SRC
@@ -165,9 +165,9 @@ between them. Once installed, the actual command is ~wormhole~.
#+end_src #+end_src
These are the other programs I have installed globally. A few (like ~awscli~, ~mysql-client~, etc.) 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 #+BEGIN_SRC nix :tangle target/redbook/other-packages.nix
{pkgs, kube, ...}: {pkgs, kube, ...}:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
@@ -191,6 +191,7 @@ These programs require a full desktop environment:
home.packages = with pkgs; [ home.packages = with pkgs; [
google-chrome google-chrome
nerd-fonts.jetbrains-mono nerd-fonts.jetbrains-mono
nerd-fonts.symbols-only
(iosevka-bin.override { variant = "Aile"; }) (iosevka-bin.override { variant = "Aile"; })
(iosevka-bin.override { variant = "Etoile"; }) (iosevka-bin.override { variant = "Etoile"; })
(iosevka-bin.override { variant = "SGr-IosevkaTerm"; }) (iosevka-bin.override { variant = "SGr-IosevkaTerm"; })
@@ -201,7 +202,7 @@ These programs require a full desktop environment:
} }
#+END_SRC #+END_SRC
#+BEGIN_SRC nix :tangle target/shibumi-desktop/desktop-packages.nix #+BEGIN_SRC nix :tangle target/redbook-desktop/desktop-packages.nix
{pkgs, ...}: {pkgs, ...}:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
@@ -313,7 +314,8 @@ We all know what ~git~ does.
programs.git = { programs.git = {
enable = true; enable = true;
settings.user.name = "Joe Frikker"; settings.user.name = "Joe Frikker";
settings.user.email = "joe.frikker@shibumi.com"; settings.user.email = "joe@redbookcattle.com";
settings.github.user = "joe@redbookcattle.com";
}; };
programs.delta = { programs.delta = {
@@ -1051,9 +1053,9 @@ This configuration affects general text editing, across all modes. First, some p
avy avy
edit-indirect edit-indirect
embark embark
evil # evil
evil-collection # evil-collection
evil-org # evil-org
string-inflection string-inflection
]; ];
extraConfig = builtins.readFile ./emacs-editing.el; extraConfig = builtins.readFile ./emacs-editing.el;
@@ -1073,17 +1075,17 @@ 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. its own devil-mode-only repeat maps that don't interfere when using normal modifier key sequences.
#+BEGIN_SRC elisp #+BEGIN_SRC elisp
(setopt evil-want-keybinding nil) ;; (setopt evil-want-keybinding nil)
(require 'evil) ;; (require 'evil)
(evil-mode 1) ;; (evil-mode 1)
(require 'evil-collection) ;; (require 'evil-collection)
(evil-collection-init) ;; (evil-collection-init)
(require 'evil-org) ;; (require 'evil-org)
(add-hook 'org-mode-hook 'evil-org-mode) ;; (add-hook 'org-mode-hook 'evil-org-mode)
(evil-org-set-key-theme '(navigation insert textobjects additional calendar)) ;; (evil-org-set-key-theme '(navigation insert textobjects additional calendar))
(require 'evil-org-agenda) ;; (require 'evil-org-agenda)
(evil-org-agenda-set-keys) ;; (evil-org-agenda-set-keys)
#+END_SRC #+END_SRC
Avy allows jumping to any place on the screen with just a few keystrokes. I've stolen most of these Avy allows jumping to any place on the screen with just a few keystrokes. I've stolen most of these
@@ -1161,7 +1163,7 @@ Just "silently" wrap when searching at the bottom of a document.
]; ];
ignoreCompilationError = true; ignoreCompilationError = true;
}) })
lispyville # lispyville
lua-mode lua-mode
nix-mode nix-mode
rust-mode rust-mode
@@ -1339,18 +1341,18 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
#+BEGIN_SRC elisp #+BEGIN_SRC elisp
(setopt inferior-lisp-program "sbcl") (setopt inferior-lisp-program "sbcl")
(setopt lispy-compat '(god-mode edebug)) ;; (setopt lispy-compat '(god-mode edebug))
(add-hook 'emacs-lisp-mode-hook (lambda () (lispy-mode 1))) (add-hook 'emacs-lisp-mode-hook (lambda () (lispy-mode 1)))
(add-hook 'lisp-mode-hook (lambda () (lispy-mode 1))) (add-hook 'lisp-mode-hook (lambda () (lispy-mode 1)))
(with-eval-after-load 'lispy ;; (with-eval-after-load 'lispy
(require 'lispyville) ;; (require 'lispyville)
(add-hook 'lispy-mode-hook #'lispyville-mode) ;; (add-hook 'lispy-mode-hook #'lispyville-mode)
(bind-keys :map lispy-mode-map ;; (bind-keys :map lispy-mode-map
("i" . (lambda () ;; ("i" . (lambda ()
(interactive) ;; (interactive)
(if (and (featurep 'god-mode) god-global-mode) ;; (if (and (featurep 'god-mode) god-global-mode)
(god-mode-all -1) ;; (god-mode-all -1)
(special-lispy-tab)))))) ;; (special-lispy-tab))))))
#+END_SRC #+END_SRC
*** Typescript *** Typescript