From 1be3c2feaac665098749c9b888d8318d0986a3e2 Mon Sep 17 00:00:00 2001 From: stupidcomputer Date: Sat, 25 May 2024 21:01:05 -0500 Subject: [PATCH 1/5] invert monitors --- builds/utils/sh/disp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/builds/utils/sh/disp b/builds/utils/sh/disp index 27adda2..9b35d8d 100755 --- a/builds/utils/sh/disp +++ b/builds/utils/sh/disp @@ -55,14 +55,6 @@ case "$(hostname)" in "mlg") case "$1" in "invert") - xrandr \ - --output DP-0 --off \ - --output DP-1-2 --primary --mode 1920x1080 --pos 0x352 --rotate normal --rate 180 \ - --output DP-1-1 --mode 1920x1080 --pos 1920x352 --rotate normal --rate 180 - bspc monitor DP-1-2 -d 1 3 5 7 - bspc monitor DP-1-1 -d 2 4 6 8 - ;; - *) xrandr \ --output DP-0 --off \ --output DP-1-1 --primary --mode 1920x1080 --pos 0x352 --rotate normal --rate 180 \ @@ -70,6 +62,14 @@ case "$(hostname)" in bspc monitor DP-1-1 -d 1 3 5 7 bspc monitor DP-1-2 -d 2 4 6 8 ;; + *) + xrandr \ + --output DP-0 --off \ + --output DP-1-2 --primary --mode 1920x1080 --pos 0x352 --rotate normal --rate 180 \ + --output DP-1-1 --mode 1920x1080 --pos 1920x352 --rotate normal --rate 180 + bspc monitor DP-1-2 -d 1 3 5 7 + bspc monitor DP-1-1 -d 2 4 6 8 + ;; esac xinput set-prop 'INSTANT USB GAMING MOUSE ' 'libinput Accel Speed' -1 From 36b441f054fb47b0b60073d9187c4c31176fd98c Mon Sep 17 00:00:00 2001 From: stupidcomputer Date: Tue, 28 May 2024 10:14:25 -0500 Subject: [PATCH 2/5] add a shift+ins to insert special characters --- .config/sxhkd/sxhkdrc | 3 +++ builds/utils/sh/special_ins | 14 ++++++++++++++ 2 files changed, 17 insertions(+) create mode 100755 builds/utils/sh/special_ins diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index 940dcf6..3c8bb65 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -53,3 +53,6 @@ super + {t,f,s} # x230t specific -- activate the tablet menu XF86RotateWindows tabletmenu + +shift + Insert + special_ins diff --git a/builds/utils/sh/special_ins b/builds/utils/sh/special_ins new file mode 100755 index 0000000..6cc23c9 --- /dev/null +++ b/builds/utils/sh/special_ins @@ -0,0 +1,14 @@ +# insert special characters universally in xorg + +( +tmenu < Date: Tue, 28 May 2024 10:14:39 -0500 Subject: [PATCH 3/5] remove comments from statusbar and change statusbar location to ~/.cache/statusbar --- builds/statusbar/statusbar/statusbar.py | 7 +++---- builds/utils/sh/mode | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/builds/statusbar/statusbar/statusbar.py b/builds/statusbar/statusbar/statusbar.py index 8c74ede..4e796d0 100644 --- a/builds/statusbar/statusbar/statusbar.py +++ b/builds/statusbar/statusbar/statusbar.py @@ -116,7 +116,7 @@ def filecheckerfactory(filename: str, modname: str, timeout=60): battery = filecheckerfactory("/sys/class/power_supply/BAT0/capacity", "bat") batterystatus = filecheckerfactory("/sys/class/power_supply/BAT0/status", "batstat") -sxhkdmode = filemodfactory("/home/usr/.cache/sxhkd_mode", "sxhkdmode") +sxhkdmode = filemodfactory("/home/usr/.cache/statusbar/sxhkd_mode", "sxhkdmode") def render(modules) -> str: columns, _ = os.get_terminal_size(0) @@ -144,10 +144,9 @@ def render(modules) -> str: stdout.flush() def main(): + os.mkdir("/home/usr/.cache/statusbar") + if argv[1] == "start_statusbars": -# signal.signal(signal.SIGINT, signal.SIG_IGN) -# os.system("pkill statusbar") -# signal.signal(signal.SIGINT, signal.SIG_DFL) # get the monitors xrandr = subprocess.Popen(['xrandr'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) output = list(xrandr.stdout) diff --git a/builds/utils/sh/mode b/builds/utils/sh/mode index d020d65..7ad2263 100755 --- a/builds/utils/sh/mode +++ b/builds/utils/sh/mode @@ -4,7 +4,7 @@ if [ -n "$1" ]; then pkill sxhkd sxhkd -c ~/.config/sxhkd/$1 & disown [ -f "~/.config/sxhkd/$1.sh" ] && ~/.config/sxhkd/$1.sh - echo "$1" > ~/.cache/sxhkd_mode + echo "$1" > ~/.cache/statusbar/sxhkd_mode exit fi From 5620e61f31f4d28f97aa34ce9d3db4b57bc805d9 Mon Sep 17 00:00:00 2001 From: stupidcomputer Date: Wed, 12 Jun 2024 12:14:20 -0500 Subject: [PATCH 4/5] make the statusbar program actually work --- builds/statusbar/statusbar/statusbar.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/builds/statusbar/statusbar/statusbar.py b/builds/statusbar/statusbar/statusbar.py index 4e796d0..bbb7c69 100644 --- a/builds/statusbar/statusbar/statusbar.py +++ b/builds/statusbar/statusbar/statusbar.py @@ -144,7 +144,10 @@ def render(modules) -> str: stdout.flush() def main(): - os.mkdir("/home/usr/.cache/statusbar") + try: + os.mkdir("/home/usr/.cache/statusbar") + except FileExistsError: + pass if argv[1] == "start_statusbars": # get the monitors From d9f3b421089ed63d3979d622c2c449164d4d2605 Mon Sep 17 00:00:00 2001 From: stupidcomputer Date: Wed, 12 Jun 2024 12:14:31 -0500 Subject: [PATCH 5/5] upgrade to 24.05 --- flake.lock | 102 ++++++++++++++++++++++--------------------- flake.nix | 6 +-- home/rbw/default.nix | 2 +- modules/gnupg.nix | 1 - 4 files changed, 56 insertions(+), 55 deletions(-) diff --git a/flake.lock b/flake.lock index 29524d3..8b2518d 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1716609804, - "narHash": "sha256-MSIbLOzFVjJ0uSfWThdtH87/60p9Cr4qM1VybYJeVK0=", + "lastModified": 1718165009, + "narHash": "sha256-/N2ZesXMM5Fw9mpQhSCCieGxM/9jysbQQBLYHiSQppI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "b56c33d04975db768b7306c79060c25e6259366b", + "rev": "7e3ce9990c382947c33f0def2a1c33c420d8c710", "type": "gitlab" }, "original": { @@ -58,11 +58,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -93,16 +93,16 @@ ] }, "locked": { - "lastModified": 1715381426, - "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", + "lastModified": 1717527182, + "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", "owner": "nix-community", "repo": "home-manager", - "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", + "rev": "845a5c4c073f74105022533907703441e0464bc3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1713166947, - "narHash": "sha256-Vk+eyK7EcvoXf6IxEuaKVmme2ui6W/mketcrZxfFmGg=", + "lastModified": 1716729631, + "narHash": "sha256-IerjU5GUeKc0eW9FPOdlPveSGJ2ZrO+lIfuHPUmUF2I=", "owner": "nix-community", "repo": "home-manager", - "rev": "6779167a739240778d34024b89ecf6404fb28f9e", + "rev": "fc4492181833eaaa7a26a8081c0615d95792d825", "type": "github" }, "original": { @@ -199,47 +199,32 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716361217, - "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", + "lastModified": 1718086528, + "narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", + "rev": "47b604b07d1e8146d5398b42d3306fdebd343986", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-23_05": { + "nixpkgs-24_05": { "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.05", - "type": "indirect" - } - }, - "nixpkgs-23_11": { - "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "type": "indirect" } }, @@ -276,11 +261,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1705856552, - "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { @@ -370,32 +355,49 @@ "blobs": "blobs", "flake-compat": "flake-compat", "nixpkgs": "nixpkgs_2", - "nixpkgs-23_05": "nixpkgs-23_05", - "nixpkgs-23_11": "nixpkgs-23_11", + "nixpkgs-24_05": "nixpkgs-24_05", "utils": "utils" }, "locked": { - "lastModified": 1706219574, - "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", + "lastModified": 1718084203, + "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", + "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixos-mailserver", "type": "gitlab" } }, - "utils": { + "systems": { "locked": { - "lastModified": 1605370193, - "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "5021eac20303a61fafe17224c087f5519baed54d", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7e8a58d..8e01315 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,9 @@ inputs = { # regular nixos stuff - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; firefox-addons = { @@ -13,7 +13,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; simple-nixos-mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11"; + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; }; nix-colors = { url = "github:misterio77/nix-colors"; diff --git a/home/rbw/default.nix b/home/rbw/default.nix index 060dcc2..90bb3f9 100644 --- a/home/rbw/default.nix +++ b/home/rbw/default.nix @@ -6,7 +6,7 @@ settings = { base_url = "https://bitwarden.beepboop.systems"; email = "bit@beepboop.systems"; -# pinentry = "gtk"; + pinentry = pkgs.pinentry-gnome3; }; }; } diff --git a/modules/gnupg.nix b/modules/gnupg.nix index 8784ba1..df3da55 100644 --- a/modules/gnupg.nix +++ b/modules/gnupg.nix @@ -3,7 +3,6 @@ { programs.gnupg.agent = { enable = true; - pinentryFlavor = "gtk2"; enableSSHSupport = true; }; }