nix: wyndle: things
Anirudh Oppiliappan x@icyphox.sh
Sun, 05 Feb 2023 15:27:27 +0530
9 files changed,
136 insertions(+),
35 deletions(-)
M
nix/bin/default.nix
→
nix/bin/default.nix
@@ -58,13 +58,11 @@ in
[ git-new-push-remote git-new-repo - pkgs.lib.optional pkgs.stdenv.isLinux [ - jp - xurls - nvidia-offload - cputil - kctx - pw - webcam - ] + jp + xurls + nvidia-offload + cputil + kctx + pw + webcam ]
M
nix/flake.lock
→
nix/flake.lock
@@ -103,11 +103,11 @@ "neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1671005716, - "narHash": "sha256-3qXlr9545AtmLjGDubPiKnMAuIfyj2jghxNy/ZX23X0=", + "lastModified": 1672560816, + "narHash": "sha256-E50oV/kxBHivHUnpP/rghnAUcSuVO6f9E2PlDTGTOfA=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "d7b3a6b39d73c5812a9cf8b74454b15b205bf75a", + "rev": "ce4158d859d54c8c4f948c2e01158e132c9bb908", "type": "github" }, "original": {@@ -126,11 +126,11 @@ ]
}, "locked": { "dir": "contrib", - "lastModified": 1670942634, - "narHash": "sha256-d/K7M1InZQy6ea0GgiuUnPmNQgBlKPPDVlZTC9umHFI=", + "lastModified": 1672499781, + "narHash": "sha256-YFUj+w0f6bjMI9TJI0rQOuXepzhQzngbXxYbQ0+NTLA=", "owner": "neovim", "repo": "neovim", - "rev": "090048bec9f80c46a6ce6ff05a419b15bc4bf028", + "rev": "6ba34e21fee2a81677e8261dfeaf24c8cd320500", "type": "github" }, "original": {@@ -157,11 +157,11 @@ }
}, "nixpkgs": { "locked": { - "lastModified": 1670918062, - "narHash": "sha256-iOhkyBYUU9Jfkk0lvI4ahpjyrTsLXj9uyJWwmjKg+gg=", + "lastModified": 1672428209, + "narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "84575b0bd882be979516f4fecfe4d7c8de8f6a92", + "rev": "293a28df6d7ff3dec1e61e37cc4ee6e6c0fb0847", "type": "github" }, "original": {
M
nix/flake.nix
→
nix/flake.nix
@@ -38,6 +38,13 @@
overlays = { nvim-nightly = neovim.overlay; prompt = prompt.overlay; + plan9patched = (self: super: { + plan9patched = super.plan9port.overrideAttrs (old: { + patches = (old.patches or [ ]) ++ [ + ./patches/acme.patch + ]; + }); + }); }; darwinConfigurations = {
M
nix/home.nix
→
nix/home.nix
@@ -47,8 +47,10 @@ akonadi
go evolution dconf + plan9patched - ]; # ++ (import ./bin { inherit pkgs host; }); + ] ++ (import ./bin { inherit pkgs host; }); + gtk = { enable = true;
M
nix/hosts/wyndle/configuration.nix
→
nix/hosts/wyndle/configuration.nix
@@ -16,20 +16,21 @@ };
networking = { nameservers = [ "8.8.8.8" "8.8.4.4" ]; - wireless = { - enable = true; - interfaces = [ "wlp6s0" ]; - environmentFile = "/home/icy/secrets/wireless.env"; - networks = { - Sanic.psk = "@PSK_SANI@"; - Gopalan5G.psk = "@PSK_GOPA@"; - denim.psk = "@PSK_DENI@"; - }; - extraConfig = '' - ctrl_interface=/run/wpa_supplicant - ctrl_interface_group=wheel - ''; - }; + networkmanager.enable = true; + # wireless = { + # enable = true; + # interfaces = [ "wlp6s0" ]; + # environmentFile = "/home/icy/secrets/wireless.env"; + # networks = { + # Sanic.psk = "@PSK_SANI@"; + # Gopalan5G.psk = "@PSK_GOPA@"; + # denim.psk = "@PSK_DENI@"; + # }; + # extraConfig = '' + # ctrl_interface=/run/wpa_supplicant + # ctrl_interface_group=wheel + # ''; + # }; # dhcpcd.enable = true; hostName = "wyndle"; useDHCP = false;@@ -65,6 +66,7 @@
nixpkgs.overlays = with self.overlays; [ nvim-nightly prompt + plan9patched ]; environment = {
A
nix/patches/acme.patch
@@ -0,0 +1,89 @@
+diff --git a/src/cmd/acme/scrl.c b/src/cmd/acme/scrl.c +index 6504699d..3aaeebef 100644 +--- a/src/cmd/acme/scrl.c ++++ b/src/cmd/acme/scrl.c +@@ -71,11 +71,11 @@ textscrdraw(Text *t) + if(!eqrect(r2, t->lastsr)){ + t->lastsr = r2; + draw(b, r1, t->fr.cols[BORD], nil, ZP); +- draw(b, r2, t->fr.cols[BACK], nil, ZP); ++ r2.max.x = r2.max.x+1; ++ draw(b, r2, t->fr.cols[TEXT], nil, ZP); + r2.min.x = r2.max.x-1; + draw(b, r2, t->fr.cols[BORD], nil, ZP); + draw(t->fr.b, r, b, nil, Pt(0, r1.min.y)); +-/*flushimage(display, 1); // BUG? */ + } + } + +diff --git a/src/cmd/acme/acme.c b/src/cmd/acme/acme.c +index 0e6bc0fd..c0a9e8ee 100644 +--- a/src/cmd/acme/acme.c ++++ b/src/cmd/acme/acme.c +@@ -1039,22 +1039,22 @@ iconinit(void) + Image *tmp; + + if(tagcols[BACK] == nil) { +- /* Blue */ +- tagcols[BACK] = allocimagemix(display, DPalebluegreen, DWhite); +- tagcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DPalegreygreen); +- tagcols[BORD] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DPurpleblue); ++ /* Tags */ ++ tagcols[BACK] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xCCCCCCFF); ++ tagcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x509C93FF); ++ tagcols[BORD] = display->black; + tagcols[TEXT] = display->black; +- tagcols[HTEXT] = display->black; ++ tagcols[HTEXT] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xF4F4F4FF); + +- /* Yellow */ +- textcols[BACK] = allocimagemix(display, DPaleyellow, DWhite); +- textcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DDarkyellow); +- textcols[BORD] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DYellowgreen); ++ /* Body */ ++ textcols[BACK] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xF4F4F4FF); ++ textcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xCCCCCCFF); ++ textcols[BORD] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x676767FF); + textcols[TEXT] = display->black; + textcols[HTEXT] = display->black; + } + +- r = Rect(0, 0, Scrollwid, font->height+1); ++ r = Rect(0, 0, Scrollwid+ButtonBorder, font->height+1); + if(button && eqrect(r, button->r)) + return; + +@@ -1066,24 +1066,27 @@ iconinit(void) + + button = allocimage(display, r, screen->chan, 0, DNofill); + draw(button, r, tagcols[BACK], nil, r.min); +- border(button, r, ButtonBorder, tagcols[BORD], ZP); ++ r.max.x -= ButtonBorder; ++ border(button, r, ButtonBorder, allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x676767FF), ZP); + + r = button->r; +- modbutton = allocimage(display, r, screen->chan, 0, DNofill); ++ modbutton = allocimage(display, r, screen ->chan, 0, DNofill); + draw(modbutton, r, tagcols[BACK], nil, r.min); ++ r.max.x -= ButtonBorder; + border(modbutton, r, ButtonBorder, tagcols[BORD], ZP); + r = insetrect(r, ButtonBorder); +- tmp = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DMedblue); ++ tmp = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x676767FF); + draw(modbutton, r, tmp, nil, ZP); + freeimage(tmp); + + r = button->r; +- colbutton = allocimage(display, r, screen->chan, 0, DPurpleblue); ++ colbutton = allocimage(display, r, screen->chan, 0, 0x509C93FF); + +- but2col = allocimage(display, r, screen->chan, 1, 0xAA0000FF); +- but3col = allocimage(display, r, screen->chan, 1, 0x006600FF); ++ but2col = allocimage(display, r, screen->chan, 1, 0xB870CEFF); ++ but3col = allocimage(display, r, screen->chan, 1, 0x7C9F4BFF); + } + ++ + /* + * /dev/snarf updates when the file is closed, so we must open our own + * fd here rather than use snarffd
M
nix/programs/bash.nix
→
nix/programs/bash.nix
@@ -54,7 +54,7 @@ tmux refresh-client -S
} PROMPT_COMMAND=refresh_tmux - PS1="\n\001\e[0;36m\002▲\001\e[0m\002 "; + PS1="\n\001\002▲\001\002 "; PS2="> " ggp() {
M
nix/programs/default.nix
→
nix/programs/default.nix
@@ -7,7 +7,6 @@
{ imports = [ - ./chromium.nix ./firefox.nix ./common.nix ];
M
nix/services/default.nix
→
nix/services/default.nix
@@ -12,6 +12,10 @@ defaultCacheTtl = 60 * 60 * 24 * 7;
maxCacheTtl = 60 * 60 * 24 * 7; pinentryFlavor = "qt"; }; + plan9port = { + fontsrv.enable = true; + plumber.enable = true; + }; }; }