summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2024-05-10 12:54:10 -0400
committerBen Sima <ben@bsima.me>2024-05-10 12:54:39 -0400
commit06f15eba9331db662f2c377051542e3900d228d5 (patch)
tree17bf9f5095318f0db7dedc803a5cc0ca4c2ecab3 /lib
parentf13436939d71d87da0125850cd17ce91d821984f (diff)
updatesHEADmaster
Diffstat (limited to 'lib')
-rw-r--r--lib/common.nix3
-rw-r--r--lib/config.nix1
-rw-r--r--lib/emacs-packages.nix1
-rw-r--r--lib/linux.nix5
-rw-r--r--lib/packages.nix1
5 files changed, 10 insertions, 1 deletions
diff --git a/lib/common.nix b/lib/common.nix
index 6a87c78..7ddff12 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -386,6 +386,9 @@ in {
bash = {
enable = true;
+ #profileExtra = ''
+ # # put SSH_AUTH_SOCK here?
+ #'';
initExtra = ''
#DIR=~/.nix-profile/etc/profile.d
#[[ -f "$DIR/nix.sh" ]] && . "$DIR/nix.sh"
diff --git a/lib/config.nix b/lib/config.nix
index 45e3062..f4f4dad 100644
--- a/lib/config.nix
+++ b/lib/config.nix
@@ -5,6 +5,7 @@
permittedInsecurePackages = [
"electron-13.6.9"
"electron-25.9.0"
+ "electron-24.8.5" # for obsidian
];
cudaSupport = false;
}
diff --git a/lib/emacs-packages.nix b/lib/emacs-packages.nix
index e543066..fcb15e5 100644
--- a/lib/emacs-packages.nix
+++ b/lib/emacs-packages.nix
@@ -16,6 +16,7 @@ cl-lib
company
company-box
company-cabal
+consult
counsel
counsel-dash
crux
diff --git a/lib/linux.nix b/lib/linux.nix
index ec3877f..e80b71f 100644
--- a/lib/linux.nix
+++ b/lib/linux.nix
@@ -333,6 +333,9 @@ in
extraConfig = ''
allow-emacs-pinentry
'';
+ #sshKeys = [
+ # "8278B6132877C1911B07814D94FC4F29DF23FCA4"
+ #];
};
};
@@ -348,7 +351,9 @@ in
};
};
+ programs.gpg.enable = true;
programs = {
+
git.signing.signByDefault = true;
qutebrowser = {
enable = true;
diff --git a/lib/packages.nix b/lib/packages.nix
index 8540382..d5a5f6e 100644
--- a/lib/packages.nix
+++ b/lib/packages.nix
@@ -84,7 +84,6 @@ in {
nix-prefetch-scripts
nixos-generators
noto-fonts-emoji
- obsidian
opentimestamps-client
paperkey
pass