summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/common.nix28
-rw-r--r--lib/linux.nix1
-rw-r--r--lib/packages.nix1
-rw-r--r--lib/ssh.nix31
4 files changed, 28 insertions, 33 deletions
diff --git a/lib/common.nix b/lib/common.nix
index 110381d..f482bc6 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -244,18 +244,16 @@ in {
urxvt = let font = size: "xft:Fira Mono:size=${toString size}:ant"; in {
enable = true;
fonts = [
- # for some reason, urxvt font size is much larger than every other
- # program's, so i gotta cut it in half
(font (fontSize / 2))
"xft:Noto Emoji"
];
- keybindings = {
- # why don't any of these work?
- "Shift-Control-C" = "eval:selection_to_clipboard";
- "Shift-Control-V" = "eval:paste_clipboard";
- "Shift-Control-+" = "command:\033]710;${font 12}\007\033]711;${font 12}\007";
- "Shift-Control--" = "command:\033]710;${font 8}\007\033]711;${font 8}\007";
- };
+ #keybindings = {
+ # # why don't any of these work?
+ # "Shift-Control-C" = "eval:selection_to_clipboard";
+ # "Shift-Control-V" = "eval:paste_clipboard";
+ # "Shift-Control-+" = "command:\033]710;${font 12}\007\033]711;${font 12}\007";
+ # "Shift-Control--" = "command:\033]710;${font 8}\007\033]711;${font 8}\007";
+ #};
iso14755 = true; # unicode chars
#transparent = true;
#shading = 10;
@@ -293,7 +291,7 @@ in {
rev = "32b42c8a12bf9588259b76f3df6807960e0d7386";
sha256 = "sha256-kM7WP03uE20yr0nCusB3ncHzgtEYxqNzoNoQGen9p+o=";
};
- meta.homepate = "https://github.com/axvr/photon.vim";
+ meta.homepage = "https://github.com/axvr/photon.vim";
})
(pkgs.vimUtils.buildVimPlugin {
pname = "skull-vim";
@@ -304,7 +302,7 @@ in {
rev = "abb9d7120c63aad6f9acc26d31c948a93f352e94";
sha256 = "sha256-tu5aDRjHZtXKoyQBbMEhzjGrRl4GZD121ybs7oNylvs=";
};
- meta.homepate = "https://github.com/kadekillary/skull-vim";
+ meta.homepage = "https://github.com/kadekillary/skull-vim";
})
];
extraConfig = builtins.readFile ./vimrc;
@@ -321,9 +319,9 @@ in {
bash = {
enable = true;
initExtra = ''
- DIR=~/.nix-profile/etc/profile.d
- [[ -f "$DIR/nix.sh" ]] && . "$DIR/nix.sh"
- [[ -f "$DIR/hm-session-vars.sh" ]] && . "$DIR/hm-session-vars.sh"
+ #DIR=~/.nix-profile/etc/profile.d
+ #[[ -f "$DIR/nix.sh" ]] && . "$DIR/nix.sh"
+ #[[ -f "$DIR/hm-session-vars.sh" ]] && . "$DIR/hm-session-vars.sh"
[[ -f "${homedir}/.bashrc.local" ]] && . "${homedir}/.bashrc.local"
source "${pkgs.forgit}/share/bash/forgit.plugin.zsh"
function fcd() {
@@ -354,7 +352,7 @@ in {
gawk 'match($0,/'$1'/, ary) {print ary['\$\{2:-'0'}']}';
}
- export PS1='$(printf "%3.*s" $r $r)ϟ '
+ export PS1='$(printf "%3.*s" $? $?)ϟ '
# kill a process with fzf
fkill() {
diff --git a/lib/linux.nix b/lib/linux.nix
index 86b43ff..ec3877f 100644
--- a/lib/linux.nix
+++ b/lib/linux.nix
@@ -83,6 +83,7 @@ in
pavucontrol
pinentry
tdesktop
+ thunderbird
# texlive.combined.scheme-full
#tor-browser-bundle-bin
usbutils
diff --git a/lib/packages.nix b/lib/packages.nix
index fae78c6..2037054 100644
--- a/lib/packages.nix
+++ b/lib/packages.nix
@@ -61,6 +61,7 @@ in {
font-awesome_5
forgit
gcal
+ git-branchless
git-lfs
git-revise
github-cli
diff --git a/lib/ssh.nix b/lib/ssh.nix
index 452f810..013e727 100644
--- a/lib/ssh.nix
+++ b/lib/ssh.nix
@@ -12,13 +12,6 @@ in {
# RemoteForward %d/.gnupg/S.gpg-agent ''${HOME}/.gnupg/S.gpg-agent.extra
'';
matchBlocks = {
- "github.com" = {
- hostname = "github.com";
- user = "git";
- identityFile = [ "${homedir}/.ssh/id_rsa" ];
- identitiesOnly = true;
- };
-
# groq
"bsima" = {
hostname = "bsima"; # must be on vpn
@@ -45,12 +38,14 @@ in {
identityFile = [ "${homedir}/.ssh/id_rsa" ];
identitiesOnly = true;
};
- "simatime.com" = {
- hostname = "simatime.com";
- user = "git";
- identityFile = [ "${homedir}/.ssh/id_rsa" ];
- identitiesOnly = true;
- };
+ #"simatime.com" = {
+ # hostname = "simatime.com";
+ # user = "git";
+ # identitiesOnly = true;
+ # extraOptions = {
+ # # PKCS11Provider = "/run/current-system/sw/lib/opensc-pkcs11.so";
+ # };
+ #};
"gerrit.simatime.com" = {
hostname = "gerrit.simatime.com";
user = "bsima";
@@ -63,11 +58,11 @@ in {
identityFile = [ "${homedir}/.ssh/id_rsa" ];
identitiesOnly = true;
};
- "dev.simatime.com" = {
- user = "ben";
- identityFile = [ "${homedir}/.ssh/id_rsa" ];
- identitiesOnly = true;
- };
+ #"dev.simatime.com" = {
+ # user = "ben";
+ # identityFile = [ "${homedir}/.ssh/id_rsa" ];
+ # identitiesOnly = true;
+ #};
"git.platonic.systems" = {
hostname = "git.platonic.systems";
user = "git";