From 032df33f955f1c142233541ec375ff23b9d01729 Mon Sep 17 00:00:00 2001 From: stupidcomputer Date: Sat, 18 May 2024 22:19:16 -0500 Subject: [PATCH 1/6] add khard config --- .config/khard/khard.conf | 19 +++++++++++++++++++ home/khard/default.nix | 13 +++++++++++++ home/x11.nix | 1 + 3 files changed, 33 insertions(+) create mode 100644 .config/khard/khard.conf create mode 100644 home/khard/default.nix diff --git a/.config/khard/khard.conf b/.config/khard/khard.conf new file mode 100644 index 0000000..4e57eb3 --- /dev/null +++ b/.config/khard/khard.conf @@ -0,0 +1,19 @@ +[addressbooks] +[[main]] +path = ~/vdir/people/main/20cda0dd-5922-4905-8956-859c989a6519 +[general] +default_action = list +editor = nvim +merge_editor = nvim, -d + +[contact table] +display = first_name +group_by_addressbook = no +reverse = no +show_nicknames = no +show_uids = yes +show_kinds = no +sort = last_name +localize_dates = yes +preferred_phone_number_type = pref, cell, home +preferred_email_address_type = pref, work, home diff --git a/home/khard/default.nix b/home/khard/default.nix new file mode 100644 index 0000000..a8224ef --- /dev/null +++ b/home/khard/default.nix @@ -0,0 +1,13 @@ +{ lib, config, pkgs, home, ... }: + +{ + home.packages = with pkgs; [ + khard + ]; + + home.file = { + ".config/khard/config" = { + source = ../../.config/khard/config; + }; + }; +} diff --git a/home/x11.nix b/home/x11.nix index c13f6d7..206cc20 100644 --- a/home/x11.nix +++ b/home/x11.nix @@ -10,6 +10,7 @@ ./wallpapers ./vdirsyncer ./khal + ./khard ./isync ./todoman ./neomutt From f7c7671dcef772ced8e68d23cb2754514b40fd60 Mon Sep 17 00:00:00 2001 From: stupidcomputer Date: Sat, 25 May 2024 10:32:43 -0500 Subject: [PATCH 2/6] update khard config location --- home/khard/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/khard/default.nix b/home/khard/default.nix index a8224ef..f8127ca 100644 --- a/home/khard/default.nix +++ b/home/khard/default.nix @@ -7,7 +7,7 @@ home.file = { ".config/khard/config" = { - source = ../../.config/khard/config; + source = ../../.config/khard/khard.conf; }; }; } From 8563eede6308ddee5496ff739eba4d606f84295c Mon Sep 17 00:00:00 2001 From: stupidcomputer Date: Sat, 25 May 2024 10:32:57 -0500 Subject: [PATCH 3/6] mlg has two displays now --- builds/utils/sh/disp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/builds/utils/sh/disp b/builds/utils/sh/disp index 5d7f04b..27adda2 100755 --- a/builds/utils/sh/disp +++ b/builds/utils/sh/disp @@ -56,23 +56,19 @@ case "$(hostname)" in case "$1" in "invert") xrandr \ - --output HDMI-0 --mode 1920x1080 --pos 3840x0 --rotate right --rate 60 \ --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 - bspc monitor HDMI-0 -d 9 ;; *) xrandr \ - --output HDMI-0 --mode 1920x1080 --pos 3840x0 --rotate right --rate 60 \ --output DP-0 --off \ --output DP-1-1 --primary --mode 1920x1080 --pos 0x352 --rotate normal --rate 180 \ --output DP-1-2 --mode 1920x1080 --pos 1920x352 --rotate normal --rate 180 bspc monitor DP-1-1 -d 1 3 5 7 bspc monitor DP-1-2 -d 2 4 6 8 - bspc monitor HDMI-0 -d 9 ;; esac xinput set-prop 'INSTANT USB GAMING MOUSE ' 'libinput Accel Speed' -1 From edceb9cf4e19ab2c6250d239eb38c8ccca4d14e7 Mon Sep 17 00:00:00 2001 From: stupidcomputer Date: Sat, 25 May 2024 10:33:13 -0500 Subject: [PATCH 4/6] add special case for htmldjango --- .config/nvim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index feaa02d..25e4838 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -92,6 +92,7 @@ function setTabbing(lang, width) end setTabbing("python", 4) +setTabbing("htmldjango", 4) setTabbing("javascript", 4) setTabbing("css", 4) setTabbing("html", 4) From db20d9e047d7288e0355b8d3992ed76d2d432e2f Mon Sep 17 00:00:00 2001 From: stupidcomputer Date: Sat, 25 May 2024 14:06:08 -0500 Subject: [PATCH 5/6] plus 20 focus --- boxes/mlg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boxes/mlg/default.nix b/boxes/mlg/default.nix index e2de063..b05d4a0 100644 --- a/boxes/mlg/default.nix +++ b/boxes/mlg/default.nix @@ -10,7 +10,7 @@ ../../modules/common.nix ../../modules/x11.nix ../../modules/discord.nix - ../../modules/gaming.nix +# ../../modules/gaming.nix ../../modules/rbw.nix ]; From cb5a27847054055ac58111467d16feacd69763b6 Mon Sep 17 00:00:00 2001 From: stupidcomputer Date: Sat, 25 May 2024 14:06:20 -0500 Subject: [PATCH 6/6] bump flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 4b91062..29524d3 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1714043889, - "narHash": "sha256-f7aben2pbfL/CzphiAAwwe5CrmSYRZv3UF7zaGkD+Pc=", + "lastModified": 1716609804, + "narHash": "sha256-MSIbLOzFVjJ0uSfWThdtH87/60p9Cr4qM1VybYJeVK0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "fee36e584de8c0034f311b76b5da1b81dad0b17b", + "rev": "b56c33d04975db768b7306c79060c25e6259366b", "type": "gitlab" }, "original": { @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1714043624, - "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", + "lastModified": 1715381426, + "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", "owner": "nix-community", "repo": "home-manager", - "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", + "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713995372, - "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", + "lastModified": 1716361217, + "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", + "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", "type": "github" }, "original": {