This commit is contained in:
Joe Frikker
2026-01-13 15:34:08 -05:00
parent cd6b354e56
commit f70fad8de8
3 changed files with 50 additions and 25 deletions

12
flake.lock generated
View File

@@ -25,11 +25,11 @@
]
},
"locked": {
"lastModified": 1766553861,
"narHash": "sha256-ZbnG01yA3O8Yr1vUm3+NQ2qk9iRhS5bloAnuXHHy7+c=",
"lastModified": 1767910483,
"narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e",
"rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c",
"type": "github"
},
"original": {
@@ -60,11 +60,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1766473571,
"narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=",
"lastModified": 1767799921,
"narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "76701a179d3a98b07653e2b0409847499b2a07d3",
"rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
"type": "github"
},
"original": {

View File

@@ -48,6 +48,7 @@
home.stateVersion = "22.05";
home.username = "jfrikker";
home.homeDirectory = "/Users/jfrikker";
home.packages = [ pkgs.pinentry_mac ];
}
];

View File

@@ -18,6 +18,8 @@ This is the basic structure of the home.nix file. Individual sections are define
<<programs>>
};
fonts.fontconfig.enable = true;
xdg = {
enable = true;
<<extra_xdg>>
@@ -98,18 +100,22 @@ This is the basic structure of the home.nix file. Individual sections are define
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.
#+BEGIN_SRC nix
age-plugin-yubikey
aws-iam-authenticator
awscli
bashInteractive
dust
fd
iosevka
kube
kubectl
ledger
magic-wormhole
nerd-fonts.jetbrains-mono
neovim
nil
openssh
rage
ripgrep
tokei
xh
@@ -1270,6 +1276,7 @@ I had some weird problems with jsx code where the default M-q would just do a te
#+BEGIN_SRC nix :noweb-ref emacs_packages
org-bullets
org-modern
org-roam
verb
#+END_SRC
@@ -1292,34 +1299,29 @@ I had some weird problems with jsx code where the default M-q would just do a te
"DONE(d!)"
"CANCELLED(c@)"))
org-capture-templates
'(("i" "Inbox entry" entry
(file+headline "~/org/todo.org" "Inbox")
"** %?\n- Filed %U\n"
:prepend t)
("t" "Todo" entry
'(("t" "Todo" entry
(here)
"** TODO %?\n- State \"TODO\" %U\n")
("w" "Work stuff")
("wp" "Work Project" entry
(file+headline "~/org/todo.org" "Work Projects")
"*** %?\n"
:jump-to-captured t)
(file+headline "~/org/todo/work.org.age" "Next Actions")
"*** PROJ %?\n- State \"PROJ\" %U\n")
("wa" "Work Next Action" entry
(file+headline "~/org/todo.org" "Work Next Actions")
(file+headline "~/org/todo/work.org.age" "Next Actions")
"*** TODO %?\n- State \"TODO\" %U\n")
("p" "Personal stuff")
("pp" "Personal Project" entry
(file+headline "~/org/todo.org" "Personal Projects")
"*** %?\n"
:jump-to-captured t)
(file+headline "~/org/todo/personal.org.age" "Next Actions")
"*** PROJ %?\n- State \"PROJ\" %U\n")
("pa" "Personal Next Action" entry
(file+headline "~/org/todo.org" "Personal Next Actions")
(file+headline "~/org/todo/personal.org.age" "Next Actions")
"*** TODO %?\n- State \"TODO\" %U\n"))
org-agenda-files '("~/org/todo.org")
org-agenda-files '("~/org/todo/work.org.age" "~/org/todo/personal.org.age")
org-agenda-todo-ignore-scheduled 'future
org-agenda-todo-ignore-with-date t
org-agenda-tags-todo-honor-ignore-options t
org-id-link-to-org-use-id t))
org-id-link-to-org-use-id t
org-enforce-todo-dependencies t
org-agenda-dim-blocked-tasks 'invisible))
(use-package org-roam
:bind (("C-c n l" . org-roam-buffer-toggle)
@@ -1331,7 +1333,10 @@ I had some weird problems with jsx code where the default M-q would just do a te
(setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag)))
(org-roam-db-autosync-mode))
(use-package org-bullets
;(use-package org-bullets
; :hook org-mode-hook)
(use-package org-modern
:hook org-mode-hook)
(use-package verb
@@ -1400,6 +1405,22 @@ I had some weird problems with jsx code where the default M-q would just do a te
ledger-mode
#+END_SRC
** Age
#+BEGIN_SRC nix :noweb-ref emacs_packages
age
#+END_SRC
#+BEGIN_SRC elisp :noweb-ref emacs_config
(use-package age
:custom
(age-default-identity "~/source/dotfiles/keys/yubi1age.txt")
(age-default-recipient "~/source/dotfiles/keys/myself.txt")
:config
(setenv "PINENTRY_PROGRAM" "pinentry-mac")
(age-file-enable))
#+END_SRC
* Theme
I like Catppuccin Frappe as my theme. Let's use it in as many places as we can.
@@ -1489,6 +1510,9 @@ I like Catppuccin Frappe as my theme. Let's use it in as many places as we can.
:config
(load-theme 'catppuccin :no-confirm))
(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 "JetBrainsMono Nerd Font" :height 130)
;; (set-face-attribute 'fixed-pitch nil :font "JetBrainsMono Nerd Font" :height 130)
(set-face-attribute 'default nil :font "Iosevka" :height 130 :width 'expanded)
(set-face-attribute 'fixed-pitch nil :font "Iosevka" :height 130 :width 'expanded)
(set-face-attribute 'variable-pitch nil :font "Iosevka Aile" :height 130)
#+END_SRC