Compare commits
6 Commits
e3a1143ca5
...
f7e23e39c7
Author | SHA1 | Date |
---|---|---|
Sam | f7e23e39c7 | |
Sam | 86f27abb2f | |
Sam | fa060dba70 | |
Sam | f411adbf20 | |
Sam | 5e0230dcdd | |
Sam | 1049ecbd76 |
14
flake.lock
14
flake.lock
|
@ -380,11 +380,11 @@
|
||||||
"nix-secrets": {
|
"nix-secrets": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721482736,
|
"lastModified": 1721484039,
|
||||||
"narHash": "sha256-jrR4tQeESMJ/vSDSDjw6N8t1137TiRFsXq8CsG05sLE=",
|
"narHash": "sha256-NIAfRofVQrYEE/XVbp3nmW1JYCxfv8gbuCEYySnZN18=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "cfdb75ffef8f3e91fe95823086fabf4743e5e65b",
|
"rev": "ad7a2afbe9c767101006c992b6031337f49c3777",
|
||||||
"revCount": 155,
|
"revCount": 157,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git"
|
"url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git"
|
||||||
},
|
},
|
||||||
|
@ -502,11 +502,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721472350,
|
"lastModified": 1721483124,
|
||||||
"narHash": "sha256-XFGmZB6GhnYsTOFouj60lc40OkZxpdk6mL2nTT0fIkU=",
|
"narHash": "sha256-pWsDpSZ/8necd7nvjV9P+EAARWaYgvn8tIDfUo6kJ/c=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "b4365ef44d92f9f6bd6ad3e54117d1719ebd2c57",
|
"rev": "a4c5fbcd97777ae321523253b042b13de0941a25",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
./scripts/get-focused-monitor.nix
|
./scripts/get-focused-monitor.nix
|
||||||
./scripts/git-commit-ai.nix
|
./scripts/git-commit-ai.nix
|
||||||
./scripts/aichat-wrapper.nix
|
./scripts/aichat-wrapper.nix
|
||||||
|
./scripts/dmenu-wifi.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
home.packages = [
|
home.packages = [
|
||||||
|
|
|
@ -0,0 +1,51 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
(writeShellScriptBin "dmenu-wifi" ''
|
||||||
|
nmcli dev wifi rescan
|
||||||
|
ssid_list=$(nmcli -f in-use,bssid,ssid,mode,chan,freq,rate,signal,bars,security dev wifi)
|
||||||
|
available_connections=$(echo "$ssid_list" | sed '/--.*Infra/d')
|
||||||
|
|
||||||
|
connection=$( echo "$available_connections" | dmenu -l 20)
|
||||||
|
bssid=$(echo "$connection" | sed 's/^.\s*//;s/\s\s.*$//')
|
||||||
|
ssid=$(echo "$connection" | sed 's/^.\s*[0-9;A-Z;:]*\s\s//;s/\s*Infra\s*[0-9].*$//')
|
||||||
|
[[ "$connection" = "" ]] && notify-send -t 5000 "Wifi Connect" "Cancelled" && exit 0
|
||||||
|
[[ $( echo "$connection" | grep "IN-USE" -o) = "IN-USE" ]] && notify-send -t 5000 "Wifi Connect" "Please select valid network" && exit 0
|
||||||
|
[[ -n "$(echo "$connection" | grep '\*')" ]] && notify-send -t 5000 "Wifi Connect" "Already Connected to: $(echo "$ssid")" && exit 0
|
||||||
|
|
||||||
|
notify-send -t 5000 "Network Manager" "Attempting to connect to $ssid..."
|
||||||
|
nmcli connection modify "$ssid" 802-11-wireless.bssid "$bssid"
|
||||||
|
nmcli device wifi connect "$bssid"
|
||||||
|
return_code=$?
|
||||||
|
if [ $return_code == 4 ];
|
||||||
|
then
|
||||||
|
notify-send -t 5000 "Wifi Connect" "Please enter password for '$ssid'..."
|
||||||
|
prompt="Enter Password for '$ssid'"
|
||||||
|
pwd=$(echo "" | dmenu -p "$prompt")
|
||||||
|
nmcli device wifi connect "$bssid" password "$pwd"
|
||||||
|
return_code=$?
|
||||||
|
fi
|
||||||
|
case "$return_code" in
|
||||||
|
0) notify-send -t 5000 "Wifi Connect" "Successfully connected to: $ssid!"
|
||||||
|
pkill -RTMIN+12 dwmblocks
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
3) notify-send -t 5000 "Wifi Connect" "Connection to $ssid failed. Timeout expired?"
|
||||||
|
pkill -RTMIN+12 dwmblocks
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
4)
|
||||||
|
notify-send -t 5000 "Wifi Connect" "Connection to $ssid failed. Possibly wrong password?"
|
||||||
|
nmcli connection delete id "$ssid"
|
||||||
|
pkill -RTMIN+12 dwmblocks
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
*) notify-send -t 5000 "Wifi Connect" "Connection to $ssid failed. Error code $?"
|
||||||
|
echo "Failed. Exiting"
|
||||||
|
pkill -RTMIN+12 dwmblocks
|
||||||
|
exit 1
|
||||||
|
esac
|
||||||
|
'')
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
(writeShellScriptBin "sb-cpu-pct" ''
|
(writeShellScriptBin "sb-battery" ''
|
||||||
BAT=/sys/class/power_supply/BAT0/capacity
|
BAT=/sys/class/power_supply/BAT0/capacity
|
||||||
|
|
||||||
# Exit script if no battery detected
|
# Exit script if no battery detected
|
||||||
|
|
|
@ -37,6 +37,7 @@ in
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
blacklistedKernelModules = [ "snd_hda_intel" "snd_soc_skl" ];
|
blacklistedKernelModules = [ "snd_hda_intel" "snd_soc_skl" ];
|
||||||
|
kernelModules = [ "iwlwifi" ];
|
||||||
kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest;
|
kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest;
|
||||||
loader = {
|
loader = {
|
||||||
systemd-boot.enable = true;
|
systemd-boot.enable = true;
|
||||||
|
@ -45,9 +46,12 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
hardware.firmware = [
|
hardware = {
|
||||||
pkgs.sof-firmware
|
enableRedistributableFirmware = true;
|
||||||
];
|
firmware = [
|
||||||
|
pkgs.sof-firmware
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "citadel";
|
hostName = "citadel";
|
||||||
|
|
|
@ -21,6 +21,9 @@ in
|
||||||
};
|
};
|
||||||
secrets = {
|
secrets = {
|
||||||
"passwords/root".neededForUsers = true;
|
"passwords/root".neededForUsers = true;
|
||||||
|
"ssh_keys/deploy_key/id_ed25519" = {
|
||||||
|
path = "/etc/ssh/deploy_key-ssh-ed25519";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,6 +16,7 @@ in
|
||||||
|
|
||||||
extraGroups = [
|
extraGroups = [
|
||||||
"wheel"
|
"wheel"
|
||||||
|
"networkmanager"
|
||||||
];
|
];
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue