Compare commits

...
6 Commits
Author SHA1 Message Date
wymiller 81cec030dc mod: screen capture
wip: want to do something different with this
2026-10-11 23:12:39 -04:00
wymiller b9ebc10f30 mod: change csharp lsp servers 2026-10-11 23:11:44 -04:00
wymiller 91ad28b207 mod: whitespace 2026-10-11 23:10:47 -04:00
wymiller 1e47ff812b mod: show public ip in waybar
on click to show
2026-10-11 23:10:30 -04:00
wymiller 744b773657 Merge remote-tracking branch 'origin' into desktops 2026-10-04 14:23:09 -04:00
gitea-actions[bot] bf799ca883 chore: update flake lock 2026-10-04 07:06:46 +00:00
7 changed files with 121 additions and 54 deletions

No files matched your search

+6 -6
View File
@@ -2,7 +2,7 @@
"layer": "top",
"modules-left": ["sway/workspaces"],
"modules-center": ["clock"],
"modules-right": ["custom/playerctl", "custom/weather", "pulseaudio", "network", "tray"],
"modules-right": ["custom/playerctl", "custom/weather", "pulseaudio", "custom/network", "tray"],
"sway/workspaces": {
"disable-scroll": true,
"all-outputs": true,
@@ -34,11 +34,11 @@
"exec": "wttrbar --fahrenheit --main-indicator 'temp_F' --location 'Grand Rapids'",
"return-type": "json"
},
"network": {
"format-wifi": " {essid} ({signalStrength}%)",
"format-ethernet": " {ipaddr}",
"format-disconnected": "⚠ Disconnected",
"family": "ipv4",
"custom/network": {
"format": "{text}",
"return-type": "json",
"exec": "bash $HOME/.config/waybar/network.sh",
"on-click": "bash $HOME/.config/waybar/network.sh toggle",
"interval": 5,
"tooltip": false
},
+54
View File
@@ -0,0 +1,54 @@
#!/usr/bin/env bash
set -u
state_dir="${XDG_RUNTIME_DIR:-/tmp}/waybar-${UID}"
state_file="$state_dir/public-ip"
if [[ ${1:-} == toggle ]]; then
mkdir -p -m 700 "$state_dir"
if [[ -s $state_file ]]; then
: > "$state_file"
else
public_ip=$(curl -4fsS --max-time 5 https://wtfismyip.com/json 2>/dev/null |
jq -er '.YourFuckingIPAddress | select(type == "string") | split(".") |
select(length == 4 and all(.[]; test("^[0-9]{1,3}$") and (tonumber <= 255))) |
join(".")' 2>/dev/null) || exit 0
printf '%s\n' "$public_ip" > "$state_file"
fi
exit 0
fi
route=$(ip -4 route get 1.1.1.1 2>/dev/null) || route=
if [[ ! $route =~ [[:space:]]dev[[:space:]]([^[:space:]]+) ]]; then
jq -cn '{text: "⚠ Disconnected", class: "disconnected"}'
exit 0
fi
interface=${BASH_REMATCH[1]}
if [[ ! $route =~ [[:space:]]src[[:space:]]([0-9.]+) ]]; then
jq -cn '{text: "⚠ Disconnected", class: "disconnected"}'
exit 0
fi
local_ip=${BASH_REMATCH[1]}
if [[ -s $state_file ]]; then
jq -cn --rawfile ip "$state_file" '{text: (" " + ($ip | rtrimstr("\n"))), class: "public"}'
exit 0
fi
if [[ $(nmcli -g GENERAL.TYPE device show "$interface" 2>/dev/null) == wifi ]]; then
essid=$(nmcli -g GENERAL.CONNECTION device show "$interface" 2>/dev/null | head -n 1)
signal=$(nmcli -t -f IN-USE,SIGNAL device wifi list ifname "$interface" --rescan no 2>/dev/null |
awk -F: '$1 == "*" { print $2; exit }')
if [[ -n $essid && $essid != -- ]]; then
text="$essid"
[[ -n $signal ]] && text="${text} (${signal}%)"
else
text="$local_ip"
fi
else
text="$local_ip"
fi
jq -cn --arg text "$text" '{text: $text, class: "connected"}'
+2 -2
View File
@@ -31,7 +31,7 @@ window#waybar {
#cpu,
#memory,
#pulseaudio,
#network,
#custom-network,
#battery,
#clock,
#custom-playerctl {
@@ -65,7 +65,7 @@ window#waybar {
animation-direction: alternate;
}
#network.disconnected {
#custom-network.disconnected {
color: #cc241d;
}
Generated
+45 -45
View File
@@ -32,11 +32,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1789888081,
"narHash": "sha256-GHz8B3/syibtGpMv344Qe61CRo2lZ7iN2V2hoT7MNRA=",
"lastModified": 1790492877,
"narHash": "sha256-RK9eeRQv9l3pQ8qNCdJ8fpkFCp/+QpNn7lR7Kkfrv8w=",
"ref": "refs/heads/master",
"rev": "d5a38bbc14a79967e3535c3e0951f53d9bf01800",
"revCount": 25,
"rev": "d3216bbe660f8265f1393ecf263ab5f8662f5a58",
"revCount": 26,
"type": "git",
"url": "https://scm.wyattjmiller.com/wymiller/caitsith.git"
},
@@ -267,11 +267,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1790312761,
"narHash": "sha256-Ie5wLHV8N17r8EALzfAsY1Bec6M7gIl+v+FbBmazpkQ=",
"lastModified": 1790872110,
"narHash": "sha256-dXrMwUGE/9pT0J7MeW1BuYxpnnPPc52/oLxfqQF/5q8=",
"owner": "purpleclay",
"repo": "go-overlay",
"rev": "602e108a3c17113c7a19983ff8c9b88a4ab935b6",
"rev": "8e136930a2a34c501d612f7b7b0ee8806531768f",
"type": "github"
},
"original": {
@@ -290,11 +290,11 @@
]
},
"locked": {
"lastModified": 1790312761,
"narHash": "sha256-Ie5wLHV8N17r8EALzfAsY1Bec6M7gIl+v+FbBmazpkQ=",
"lastModified": 1790872110,
"narHash": "sha256-dXrMwUGE/9pT0J7MeW1BuYxpnnPPc52/oLxfqQF/5q8=",
"owner": "purpleclay",
"repo": "go-overlay",
"rev": "602e108a3c17113c7a19983ff8c9b88a4ab935b6",
"rev": "8e136930a2a34c501d612f7b7b0ee8806531768f",
"type": "github"
},
"original": {
@@ -313,11 +313,11 @@
"rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1789887932,
"narHash": "sha256-ryX9MgESeWwjpFMgxlaF97FgtaRyfIELgFLEeUR8xLQ=",
"lastModified": 1790492923,
"narHash": "sha256-pi8p2jRW9pprb0ZFH50/Z9Bxv0bKgddMXbLZ0D03L3w=",
"ref": "refs/heads/master",
"rev": "70288a728cc39eb5f390f71ae24d4a58763216b1",
"revCount": 14,
"rev": "580082101efc0807637529e539886ee6c5f95672",
"revCount": 15,
"type": "git",
"url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
},
@@ -333,11 +333,11 @@
]
},
"locked": {
"lastModified": 1790215976,
"narHash": "sha256-VkR1rMGyjU9jtw8ISFx5uqR9e+LEaOlhHwrseFkiIVk=",
"lastModified": 1790996401,
"narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a6631107a83ceab5872f298a2ea710859c80c4cb",
"rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35",
"type": "github"
},
"original": {
@@ -355,11 +355,11 @@
]
},
"locked": {
"lastModified": 1790365885,
"narHash": "sha256-iQ0ebhiVo64NktTnwft9hNxlFu4j5cvljVxyJaEVIP4=",
"lastModified": 1790989254,
"narHash": "sha256-ZN+riaeFuE+DZ5zfqJiXlM12jLwZzeIXiNkU1YeHMXI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "7b4c5ec4bedaf1e062bbc1bcaeddbc6bd242aa1b",
"rev": "acd21c5a3420a9d5fd0ed06299b10828267ef9ba",
"type": "github"
},
"original": {
@@ -417,11 +417,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1790450978,
"narHash": "sha256-/eLCD/X9kaWJqPR47+fDozEC87Hjmm3i8gJbYmDAD7g=",
"lastModified": 1790920529,
"narHash": "sha256-nQyFkMR78WP6PiXKkDW2SjqzLf/spQqjRuxRGSbcV8k=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5e2305d577ca00acbba631b05cb1094d172b29f3",
"rev": "774debe7a0d1b496e35677ad955a1011c6ff74f3",
"type": "github"
},
"original": {
@@ -433,11 +433,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1790450978,
"narHash": "sha256-/eLCD/X9kaWJqPR47+fDozEC87Hjmm3i8gJbYmDAD7g=",
"lastModified": 1790920529,
"narHash": "sha256-nQyFkMR78WP6PiXKkDW2SjqzLf/spQqjRuxRGSbcV8k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5e2305d577ca00acbba631b05cb1094d172b29f3",
"rev": "774debe7a0d1b496e35677ad955a1011c6ff74f3",
"type": "github"
},
"original": {
@@ -487,11 +487,11 @@
"rust-overlay": "rust-overlay_4"
},
"locked": {
"lastModified": 1790492743,
"narHash": "sha256-z9zSi95pcqk2zmjq5XKw2kSAAiCLcAM3hxH8EukGKTw=",
"lastModified": 1791097561,
"narHash": "sha256-AmeVVy0WbW/y/sZv7ZGYn3dY6HuHPqvUgYorahAe4lM=",
"ref": "refs/heads/master",
"rev": "b1f009b0b557c4178600bc18fd495f0a8d54c35e",
"revCount": 103,
"rev": "55e8c40fbcd0c848c38002fdefb37de7084715be",
"revCount": 107,
"type": "git",
"url": "https://scm.wyattjmiller.com/wymiller/nur.git"
},
@@ -507,11 +507,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1790221470,
"narHash": "sha256-TzyWd4i7YCpqoF9xB8mfgDJ2sviAZysKH9R8YbQGjqA=",
"lastModified": 1790797021,
"narHash": "sha256-H2vA5yUaS58Wtdp46piMbRqSQe3Qn716i/oZPYoyhp8=",
"owner": "notashelf",
"repo": "nvf",
"rev": "95afe7a794216f53e217c5148c6fbe0b668192cf",
"rev": "2477cb0a5f394df36ddc72867c2657225d93d157",
"type": "github"
},
"original": {
@@ -563,11 +563,11 @@
]
},
"locked": {
"lastModified": 1789802016,
"narHash": "sha256-QVFfArbYaQMGK4dFV+5RUL72Ci+hNHVhaF/R9qJfDhs=",
"lastModified": 1790407471,
"narHash": "sha256-M8elY2UShg4ZuLTiRLEHO+ae5xQFp3/ReQdxp/R+1UU=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "26a71e661c47bd21a05d06fec749f3f7c75e9d12",
"rev": "4e9bb05a9ab6c37dc74c22974ebed6e36dc73eb2",
"type": "github"
},
"original": {
@@ -585,11 +585,11 @@
]
},
"locked": {
"lastModified": 1789802016,
"narHash": "sha256-QVFfArbYaQMGK4dFV+5RUL72Ci+hNHVhaF/R9qJfDhs=",
"lastModified": 1790407471,
"narHash": "sha256-M8elY2UShg4ZuLTiRLEHO+ae5xQFp3/ReQdxp/R+1UU=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "26a71e661c47bd21a05d06fec749f3f7c75e9d12",
"rev": "4e9bb05a9ab6c37dc74c22974ebed6e36dc73eb2",
"type": "github"
},
"original": {
@@ -606,11 +606,11 @@
]
},
"locked": {
"lastModified": 1790407471,
"narHash": "sha256-M8elY2UShg4ZuLTiRLEHO+ae5xQFp3/ReQdxp/R+1UU=",
"lastModified": 1791013993,
"narHash": "sha256-BiFPwFsbFnZH5GfWbQFKYuQNg+67aNQCoRSRNTeJFQc=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "4e9bb05a9ab6c37dc74c22974ebed6e36dc73eb2",
"rev": "7470661ba2b51156048af08464b82020223dc942",
"type": "github"
},
"original": {
@@ -624,11 +624,11 @@
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1790407471,
"narHash": "sha256-M8elY2UShg4ZuLTiRLEHO+ae5xQFp3/ReQdxp/R+1UU=",
"lastModified": 1791013993,
"narHash": "sha256-BiFPwFsbFnZH5GfWbQFKYuQNg+67aNQCoRSRNTeJFQc=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "4e9bb05a9ab6c37dc74c22974ebed6e36dc73eb2",
"rev": "7470661ba2b51156048af08464b82020223dc942",
"type": "github"
},
"original": {
+4 -1
View File
@@ -27,7 +27,10 @@
enable = true;
lsp.servers = [ "typescript-language-server" "deno" ];
};
csharp.enable = true;
csharp = {
enable = true;
lsp.servers = [ "omnisharp" ];
};
};
utility.surround.enable = true;
+3
View File
@@ -36,6 +36,9 @@ in {
xdg.configFile."sway/config".source = lib.mkForce (dirs.defaults + /sway/config);
xdg.configFile."waybar/config".source = lib.mkForce (dirs.defaults + /waybar/config);
xdg.configFile."waybar/style.css".source = lib.mkForce (dirs.defaults + /waybar/style.css);
xdg.configFile."waybar/network.sh".source = dirs.defaults + /waybar/network.sh;
home.packages = with pkgs; [ curl iproute2 networkmanager ];
programs.wofi = {
enable = pkgs.stdenv.isLinux;
+7
View File
@@ -22,6 +22,13 @@ in {
xdg.portal.config.common.default = ["gtk"];
})
(lib.mkIf cfg.sway.enable {
xdg.portal.wlr.settings.screencast = {
chooser_type = "dmenu";
chooser_cmd = "${pkgs.wmenu}/bin/wmenu -l 10 -p 'Select screen to share:'";
};
})
(lib.mkIf (usesPortal && config.services.gnome.gnome-keyring.enable) {
xdg.portal.config.common."org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
})