mirror of
https://github.com/nmasur/dotfiles
synced 2026-07-26 05:38:35 +00:00
Compare commits
4
Commits
12961b19c0
...
28049e9c30
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
28049e9c30 | ||
|
|
d95cdb1385 | ||
|
|
cf8f1fa221 | ||
|
|
8b098f0589 |
@@ -0,0 +1,7 @@
|
|||||||
|
_inputs: _final: prev: {
|
||||||
|
|
||||||
|
kubernetes-helm = prev.kubernetes-helm.overrideAttrs (_old: {
|
||||||
|
doCheck = false;
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
@@ -39,8 +39,19 @@ in
|
|||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
settings.user.name = lib.mkForce cfg.work.name;
|
settings = {
|
||||||
settings.user.email = lib.mkForce cfg.work.email;
|
user = {
|
||||||
|
name = lib.mkForce cfg.work.name;
|
||||||
|
email = lib.mkForce cfg.work.email;
|
||||||
|
signingKey = "~/.ssh/work_github";
|
||||||
|
};
|
||||||
|
commit = {
|
||||||
|
gpgsign = true;
|
||||||
|
};
|
||||||
|
tag = {
|
||||||
|
gpgsign = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
includes = [
|
includes = [
|
||||||
{
|
{
|
||||||
path = "${config.home.homeDirectory}/${config.xdg.configFile."git/personal".target}";
|
path = "${config.home.homeDirectory}/${config.xdg.configFile."git/personal".target}";
|
||||||
@@ -50,6 +61,11 @@ in
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Add work to signers file
|
||||||
|
xdg.configFile."git/allowed-signers".text = ''
|
||||||
|
${cfg.work.email} ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIP7aXbmKHmWUZgwG5HPtwx+nREVeMIRplpAAzxPOFXL
|
||||||
|
'';
|
||||||
|
|
||||||
# Personal git config
|
# Personal git config
|
||||||
xdg.configFile."git/personal".text = lib.generators.toGitINI {
|
xdg.configFile."git/personal".text = lib.generators.toGitINI {
|
||||||
user = {
|
user = {
|
||||||
@@ -57,12 +73,6 @@ in
|
|||||||
email = cfg.personal.email;
|
email = cfg.personal.email;
|
||||||
signingkey = "~/.ssh/id_ed25519";
|
signingkey = "~/.ssh/id_ed25519";
|
||||||
};
|
};
|
||||||
commit = {
|
|
||||||
gpgsign = true;
|
|
||||||
};
|
|
||||||
tag = {
|
|
||||||
gpgsign = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Personal jj config
|
# Personal jj config
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
xdg.configFile."git/allowed-signers".text = ''
|
xdg.configFile."git/allowed-signers".text = ''
|
||||||
7386960+nmasur@users.noreply.github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s
|
${config.nmasur.presets.programs.git.email} ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s
|
||||||
'';
|
'';
|
||||||
|
|
||||||
programs.fish.shellAbbrs = {
|
programs.fish.shellAbbrs = {
|
||||||
|
|||||||
@@ -34,7 +34,24 @@ in
|
|||||||
# description = "Open a session in Zellij";
|
# description = "Open a session in Zellij";
|
||||||
body = # fish
|
body = # fish
|
||||||
''
|
''
|
||||||
set TARGET_DIR $(zoxide query --interactive)
|
set TARGET_DIR $( \
|
||||||
|
zoxide query --list --score | \
|
||||||
|
fzf --filter="$query" --no-sort | \
|
||||||
|
fzf \
|
||||||
|
--prompt="zoxide > " \
|
||||||
|
--nth=2.. \
|
||||||
|
--ansi \
|
||||||
|
--height=60% \
|
||||||
|
--info=inline \
|
||||||
|
--border=rounded \
|
||||||
|
--layout=reverse \
|
||||||
|
--preview-window=down:40%:wrap \
|
||||||
|
--preview='ls -F -C --color=always {2..}' \
|
||||||
|
--bind 'ctrl-z:ignore,btab:up,tab:down,enter:become:echo {2..}' \
|
||||||
|
--cycle \
|
||||||
|
--keep-right \
|
||||||
|
--tabstop=1 \
|
||||||
|
)
|
||||||
if test -z $TARGET_DIR
|
if test -z $TARGET_DIR
|
||||||
return 0
|
return 0
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -32,9 +32,9 @@ in
|
|||||||
xdg.configFile."hammerspoon/Spoons/HideZoomWindow.spoon".source = ./Spoons/HideZoomWindow.spoon;
|
xdg.configFile."hammerspoon/Spoons/HideZoomWindow.spoon".source = ./Spoons/HideZoomWindow.spoon;
|
||||||
|
|
||||||
home.activation.reloadHammerspoon = config.lib.dag.entryAfter [ "writeBoundary" ] ''
|
home.activation.reloadHammerspoon = config.lib.dag.entryAfter [ "writeBoundary" ] ''
|
||||||
$DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.reload()"
|
$DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.reload()" || true
|
||||||
$DRY_RUN_CMD sleep 1
|
$DRY_RUN_CMD sleep 1
|
||||||
$DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.console.clearConsole()"
|
$DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.console.clearConsole()" || true
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -36,6 +36,11 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# metadata.db lives in /var/lib/calibre-web-db and is symlinked into the
|
||||||
|
# library dir; ProtectSystem=strict in the upstream module blocks writes
|
||||||
|
# through symlinks unless the real target path is also listed.
|
||||||
|
systemd.services.calibre-web.serviceConfig.ReadWritePaths = [ "/var/lib/calibre-web-db" ];
|
||||||
|
|
||||||
# Allow web traffic to Caddy
|
# Allow web traffic to Caddy
|
||||||
nmasur.presets.services.caddy.routes = [
|
nmasur.presets.services.caddy.routes = [
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user