diff options
| -rw-r--r-- | lib/common.nix | 28 | ||||
| -rw-r--r-- | lib/linux.nix | 1 | ||||
| -rw-r--r-- | lib/packages.nix | 1 | ||||
| -rw-r--r-- | lib/ssh.nix | 31 | ||||
| -rw-r--r-- | nixpkgs.nix | 4 | ||||
| -rw-r--r-- | profiles/beryllium.nix | 24 |
6 files changed, 54 insertions, 35 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"; diff --git a/nixpkgs.nix b/nixpkgs.nix index 7db469c..935a8e4 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -1,5 +1,5 @@ # generated with ~/bin/nixpkgs-pin { - url = "https://github.com/NixOS/nixpkgs/archive/dac57a4eccf1442e8bf4030df6fcbb55883cb682.tar.gz"; - sha256 = "025q5d9sjpamlbxyxzrisn3f6x8hnfx666favp0n59mfvh16hphb"; + url = "https://github.com/NixOS/nixpkgs/archive/898cb2064b6e98b8c5499f37e81adbdf2925f7c5.tar.gz"; + sha256 = "0ha53gbglrcnpzfc4lwzgyvlsagvm1m2q9z5i5b4nfahplnqpsbj"; } diff --git a/profiles/beryllium.nix b/profiles/beryllium.nix new file mode 100644 index 0000000..b4f794b --- /dev/null +++ b/profiles/beryllium.nix @@ -0,0 +1,24 @@ +# beryllium server +{ pkgs, lib, ... }: + +{ + imports = [ + ../lib/linux.nix + ../lib/ssh.nix + ../lib/packages.nix + ../lib/emacs.nix + ../lib/email.nix + ]; + + home = { + packages = with pkgs; [ + zulip + ]; + }; + + services.polybar.config."bar/top".monitor = lib.mkForce "HDMI-0"; + + services.random-background.enable = lib.mkForce true; + + programs.git.signing.signByDefault = lib.mkForce false; +} |