dennis/nix-config
1
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of ssh://codeberg.org/dnscio/nix-config

Browse source
This commit is contained in:
Dennis 2025-09-16 15:36:14 +02:00
commit b38e3bccec
3 changed files with 43 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
flake.lock generated
View file

@ -24,16 +24,16 @@
"brew-src": { "brew-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1753461463, "lastModified": 1756059815,
"narHash": "sha256-kGc7pRH0diLzKmOHsEFA8sZ9NJpgT+tqxAMsuqNd5Po=", "narHash": "sha256-UALOxoXoFIHbwKzcqbqCAqw5cC0MJEehLaWSet5vxfE=",
"owner": "Homebrew", "owner": "Homebrew",
"repo": "brew", "repo": "brew",
"rev": "4d14be89e99a45181c18e96a5f19a5b43343cc0f", "rev": "02947ea4edbdef5fcce9ee57fa289547f4d096c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Homebrew", "owner": "Homebrew",
"ref": "4.5.13", "ref": "4.6.7",
"repo": "brew", "repo": "brew",
"type": "github" "type": "github"
} }
@ -88,11 +88,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756261190, "lastModified": 1757997814,
"narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=", "narHash": "sha256-F+1aoG+3NH4jDDEmhnDUReISyq6kQBBuktTUqCUWSiw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "77f348da3176dc68b20a73dab94852a417daf361", "rev": "5820376beb804de9acf07debaaff1ac84728b708",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +126,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755825449, "lastModified": 1757430124,
"narHash": "sha256-XkiN4NM9Xdy59h69Pc+Vg4PxkSm9EWl6u7k6D5FZ5cM=", "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "8df64f819698c1fee0c2969696f54a843b2231e8", "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -145,11 +145,11 @@
"brew-src": "brew-src" "brew-src": "brew-src"
}, },
"locked": { "locked": {
"lastModified": 1754250993, "lastModified": 1756398546,
"narHash": "sha256-MEin+qoQKtFC1b0f4tnQ+Z82BQWSCgh6Ef7rpmH9gig=", "narHash": "sha256-n4GVDLhKu65XFraJuCzap2AaZji4xhPaZMTJ8aQdD3s=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "nix-homebrew", "repo": "nix-homebrew",
"rev": "314d057294e79bc2596972126b84c6f9f144499a", "rev": "3aa475996cb3bc1ecefa88c99c466e6f0bc17431",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -188,11 +188,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1756256966, "lastModified": 1757935978,
"narHash": "sha256-sSVfAOlYIK01ptcDImwkyDVfhGPy/muVa4e7xxbhgho=", "narHash": "sha256-xeHiYTqlibGf6VQADGrZ2GzayTOJo8G0g8D8f5zCE3Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c202d26483c5ccf3cb95e0053163facde9f047e", "rev": "0b96957fb614f693d0cee1bd65fbfc0e610df47f",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
hosts/dnsc-air/default.nix
View file

@ -102,6 +102,8 @@
"openjph" "openjph"
"p11-kit" "p11-kit"
"mas" "mas"
"gpg"
"pinentry-mac"
"go" "go"
{ {
name = "emacs-plus"; name = "emacs-plus";

25
modules/fish/default.nix
View file

@ -52,6 +52,29 @@
vterm_printf = '' vterm_printf = ''
printf "\e]%s\e\\" "$argv" printf "\e]%s\e\\" "$argv"
''; '';
setup_gpg = ''
set -x GPG_TTY (tty)
if not test -d $HOME/.gnupg
mkdir -p $HOME/.gnupg
chmod 700 $HOME/.gnupg
end
set pinentry_line "pinentry-program "(which pinentry-mac)
if test -f $HOME/.gnupg/gpg-agent.conf
if not grep -Fxq $pinentry_line $HOME/.gnupg/gpg-agent.conf
echo $pinentry_line >> $HOME/.gnupg/gpg-agent.conf
end
else
echo $pinentry_line > $HOME/.gnupg/gpg-agent.conf
end
if pgrep gpg-agent > /dev/null
killall gpg-agent
end
echo "gpg + pinentry-mac installed and configured."
'';
}; };
interactiveShellInit = '' interactiveShellInit = ''
@ -60,6 +83,8 @@
set hn (prompt_hostname) set hn (prompt_hostname)
set fish_cursor_default block blink set fish_cursor_default block blink
set -x GPG_TTY (tty)
if test "$INSIDE_EMACS" != "vterm" if test "$INSIDE_EMACS" != "vterm"
set fish_cursor_insert line blink set fish_cursor_insert line blink
set fish_cursor_replace_one underscore blink set fish_cursor_replace_one underscore blink