From 0d916e5bbc1119597ca7bb15420aab6bed14924a Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Thu, 13 Oct 2022 10:55:42 -0700 Subject: tmux: renumber windows --- lib/common.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/common.nix') diff --git a/lib/common.nix b/lib/common.nix index cdbbf6e..4ea80a7 100644 --- a/lib/common.nix +++ b/lib/common.nix @@ -208,6 +208,7 @@ in set -g status-left-length 30 set -g status-left '#S | #(whoami)@#(hostname) | ' set -g status-right '~%Y.%m.%d..%H.%M' + set -g renumber-windows on # white-ish background with dark-grey text set -g status-style bg=colour0,fg=colour13 # highlight current window -- cgit v1.2.3 From 69bbe8c4c6252baa74931e6ad28f788654776691 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Mon, 7 Nov 2022 20:15:19 -0500 Subject: Trying to fix font sizing problems --- lib/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/common.nix') diff --git a/lib/common.nix b/lib/common.nix index 4ea80a7..b5f31dc 100644 --- a/lib/common.nix +++ b/lib/common.nix @@ -1,11 +1,11 @@ { pkgs, lib, ... }: let + fontSize = 12; locale = "en_US.UTF-8"; gpgid = "66A6AD150399D970DCA4C4E6C8218B7D0BFDECCD"; homedir = builtins.getEnv "HOME"; -in -{ +in { nixpkgs.overlays = [ (import ../overlay.nix) ]; home = { stateVersion = "18.09"; @@ -228,7 +228,7 @@ in urxvt = let font = size: "xft:Fira Mono:size=${toString size}:ant"; in { enable = true; fonts = [ - (font 6) + (font fontSize) "xft:Noto Emoji" ]; keybindings = { -- cgit v1.2.3 From 15dcb4f3eee0d52c6f8f0d62e01a32007631e489 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Mon, 7 Nov 2022 20:48:07 -0500 Subject: Fix size issue on laptop by setting dpi The other changes served to set fontSize centrally, and adjust it for urxvt which doesn't behave for some reason. --- lib/common.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/common.nix') diff --git a/lib/common.nix b/lib/common.nix index b5f31dc..8b40f60 100644 --- a/lib/common.nix +++ b/lib/common.nix @@ -1,10 +1,8 @@ { pkgs, lib, ... }: let - fontSize = 12; + inherit (import ./const.nix) fontSize homedir gpgid; locale = "en_US.UTF-8"; - gpgid = "66A6AD150399D970DCA4C4E6C8218B7D0BFDECCD"; - homedir = builtins.getEnv "HOME"; in { nixpkgs.overlays = [ (import ../overlay.nix) ]; home = { @@ -228,7 +226,9 @@ in { urxvt = let font = size: "xft:Fira Mono:size=${toString size}:ant"; in { enable = true; fonts = [ - (font fontSize) + # 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 = { -- cgit v1.2.3 From 92521e0c88bf49eb5e1bd6c59c2d9eea32bac1be Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Tue, 15 Nov 2022 09:54:24 -0500 Subject: moved ledger stuff to ~/fund Change-Id: If0996e11fa8b6a17fb42f9ce264f14187b22122c --- lib/common.nix | 9 --------- 1 file changed, 9 deletions(-) (limited to 'lib/common.nix') diff --git a/lib/common.nix b/lib/common.nix index 8b40f60..2f6c77e 100644 --- a/lib/common.nix +++ b/lib/common.nix @@ -15,7 +15,6 @@ in { LANGUAGE = locale; PATH = "${homedir}/bin:${homedir}/.local/bin:$PATH"; PAGER = "less"; # "bat --theme=ansi"; - LEDGER_FILE = "${homedir}/.hledger.journal"; XTERM_LOCALE = locale; PYTHONSTARTUP = "${homedir}/.pythonrc"; @@ -46,14 +45,6 @@ in { source = ./editorconfig; target = ".editorconfig"; }; - hledger = { - source = builtins.toFile "hledger.journal" '' - !include ${homedir}/org/fund/accounts.journal - !include ${homedir}/org/fund/ledger.journal - !include ${homedir}/org/fund/prices.journal - ''; - target = ".hledger.journal"; - }; pythonrc = { source = ./pythonrc; target = ".pythonrc"; -- cgit v1.2.3 From 3beb3a8f334b7efa58fb8ca6aa5c8409325435df Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Tue, 15 Nov 2022 11:48:51 -0500 Subject: organize and add some git configs push.default and remote.pushDefault combine to make a better branch-directed workflow by default: https://stackoverflow.com/questions/45638858/how-to-set-up-branches-with-different-pull-push-upstreams also set the default init branch to 'main' because its shorter than master Change-Id: I424c3e897954ffe3a9c7b8e6d6c6a0033cb8067b --- lib/common.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'lib/common.nix') diff --git a/lib/common.nix b/lib/common.nix index 2f6c77e..247a81e 100644 --- a/lib/common.nix +++ b/lib/common.nix @@ -108,13 +108,16 @@ in { glog = ''log --decorate --all --graph --pretty=format:"%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset" --abbrev-commit --date=relative''; }; extraConfig = { - fetch.showForcedUpdate = "false"; - push.default = "simple"; - pull.rebase = "true"; commit.template = "${./git-commit-template}"; commit.verbose = "true"; - mergetool.fugitive.cmd = ''vim -f -c "Gvdiffsplit!" "$MERGED"''; + fetch.showForcedUpdate = "false"; + init.defaultBranch = "main"; + log.date = "local"; merge.tool = "fugitive"; + mergetool.fugitive.cmd = ''vim -f -c "Gvdiffsplit!" "$MERGED"''; + pull.rebase = "true"; + push.default = "current"; + remote.pushDefault = "origin"; sendemail = { #smtpuser = "ben@bsima.me"; #smtpserverport = 587; @@ -124,9 +127,7 @@ in { annotate = "yes"; cccmd = "git-contacts"; }; - log = { - date = "local"; - }; + }; }; -- cgit v1.2.3