Browse Source

minor fixes

canon
Hazel Levine 2 months ago
parent
commit
43cf80bc00
Signed by: hazel GPG Key ID: 1884029A28789A62
  1. 2
      config/doom/init.el
  2. 30
      flake.lock
  3. 9
      modules/agenix.nix
  4. 2
      modules/lang/lisp.nix
  5. 5
      modules/tools/emacs.nix

2
config/doom/init.el

@ -42,7 +42,7 @@
:term
eshell
; vterm
vterm
:checkers
syntax

30
flake.lock

@ -22,11 +22,11 @@
},
"emacs-overlay": {
"locked": {
"lastModified": 1622490648,
"narHash": "sha256-SOzqeZDEANEvnTm1d+CpSt+Bi2NEhuVdmO1M9BZn7oo=",
"lastModified": 1622773894,
"narHash": "sha256-is5wUXRJpHRGr22gukAHcMJPSYZZL4DYt/UFZgG8B2U=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "ca18017fa61a4bb8069d1bba74c4198c3c21c6fc",
"rev": "5d66140c54e002489225c4b68be9108c50494abc",
"type": "github"
},
"original": {
@ -57,11 +57,11 @@
]
},
"locked": {
"lastModified": 1622312560,
"narHash": "sha256-xBWgiwnPaL/iZasPxw3BuvPAee/2jiToiZjKvKLs+PA=",
"lastModified": 1622773746,
"narHash": "sha256-vfHmLB+16yLCi3R4z5fOmDiABlsIYbQWC3PHxyZw0gI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ab64dc32493996c24607eab2cae6663466ddfb8a",
"rev": "ffd4d9955bb7462871d92323f7c804a0866f911b",
"type": "github"
},
"original": {
@ -73,11 +73,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1622475342,
"narHash": "sha256-c08illT/TUfI2oeLlN8YP4kcGtXLsJOcoq9CNzoRQhM=",
"lastModified": 1622521809,
"narHash": "sha256-7XcqrtrHDeaasKzg/ruroLsC2fb6Fi3aenCrv1+xVLk=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "d38958a6aa5bdbf3239f26a04689f3d9ae7da0c0",
"rev": "b2186d6c3cdc58fb3a8def0f608bcae61138cc6f",
"type": "github"
},
"original": {
@ -88,11 +88,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1622410071,
"narHash": "sha256-rxXzlRwbFu9qmmGzSwpJqN630fnwioilo8so0ymEZT0=",
"lastModified": 1622622179,
"narHash": "sha256-XCw/9QDuj9J6prVR8YrteTcFKj2sRWYIjwgs8qOOrYQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "07ca3a021f05d6ff46bbd03c418b418abb781279",
"rev": "eaba7870ffc3400eca4407baa24184b7fe337ec1",
"type": "github"
},
"original": {
@ -104,11 +104,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1622059058,
"narHash": "sha256-t1/ZMtyxClVSfcV4Pt5C1YpkeJ/UwFF3oitLD7Ch/UA=",
"lastModified": 1622395800,
"narHash": "sha256-F7O9U3u19HPC1NHiKKYKNrdfSg1D0jWr3/fp+ef8R70=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "84aa23742f6c72501f9cc209f29c438766f5352d",
"rev": "7e9e1b6351bb4acc71f88d3fc4defa3fa899e121",
"type": "github"
},
"original": {

9
modules/agenix.nix

@ -14,11 +14,12 @@ with lib;
secrets =
mapAttrs' (n: _: nameValuePair (removeSuffix ".age" n) {
file = ./. + "${secretsDir}/${n}";
owner = "hazel"; # no root secrets
mode = "0444";
}) (import (./. + secretsFile));
sshKeyPaths = options.age.sshKeyPaths.default ++ (filter pathExists [
/home/hazel/.ssh/id_ed25519 # XXX: requires --impure!
/home/hazel/.ssh/id_rsa
]);
sshKeyPaths = options.age.sshKeyPaths.default ++ [
"/home/hazel/.ssh/id_ed25519"
"/home/hazel/.ssh/id_rsa"
];
};
}

2
modules/lang/lisp.nix

@ -49,7 +49,7 @@ with lib; {
#!/bin/sh
export LD_LIBRARY_PATH=${pkgs.racket.LD_LIBRARY_PATH}
exec ${racketBinPath + binName} $@
exec ${racketBinPath + binName} "$@"
'';
in
mkIf cfg.enable {

5
modules/tools/emacs.nix

@ -30,10 +30,9 @@ with lib; {
programs.emacs = {
enable = true;
extraPackages = epkgs: [
epkgs.emacs # doom vterm module
epkgs.vterm # doom vterm module
];
# package = emacsPgtkGcc;
package = pkgs.emacsPgtk;
package = pkgs.emacsPgtkGcc;
};
# run the emacs daemon

Loading…
Cancel
Save