diff --git a/homeManagerModules/desktop/cinnamon/default.nix b/homeManagerModules/desktop/cinnamon/default.nix index 139ef9ae..071422e5 100644 --- a/homeManagerModules/desktop/cinnamon/default.nix +++ b/homeManagerModules/desktop/cinnamon/default.nix @@ -34,7 +34,7 @@ terminal = ["" "t"]; home = ["f" "XF86Explorer"]; }; - + "org/cinnamon/desktop/keybindings/wm" = { # TODO: Declaratively disable conflict with panel applet. close = ["F4" "c"]; diff --git a/homeManagerModules/desktop/gnome/default.nix b/homeManagerModules/desktop/gnome/default.nix index 9bb271e0..43c9601c 100644 --- a/homeManagerModules/desktop/gnome/default.nix +++ b/homeManagerModules/desktop/gnome/default.nix @@ -45,7 +45,7 @@ style-panel = 0; unblur-in-overview = true; }; - + "org/gnome/system/location".enabled = true; }; }; diff --git a/nixosModules/base/networking/default.nix b/nixosModules/base/networking/default.nix index 8a8d50d7..3b2d8d55 100644 --- a/nixosModules/base/networking/default.nix +++ b/nixosModules/base/networking/default.nix @@ -21,16 +21,17 @@ config.age.secrets.wifi.path ]; profiles = { - "Dustin’s iPhone" = { + "Dustin's A54" = { connection = { - id = "Dustin’s iPhone"; + id = "Dustin's A54"; type = "wifi"; + uuid = "fc221cbd-b6fd-44e0-8679-5998933b2fff"; }; - wifi.ssid = "Dustin’s iPhone"; + wifi.ssid = "Dustin's A54"; wifi-security = { auth-alg = "open"; key-mgmt = "wpa-psk"; - psk = "$DustinsiPhonePSK"; + psk = "$DustinsA54PSK"; }; }; @@ -38,6 +39,7 @@ connection = { id = "javapatron"; type = "wifi"; + uuid = "bb61beaa-ec07-404c-bbce-5a08ae355de7"; }; wifi.ssid = "javapatron"; wifi-security = { @@ -46,6 +48,19 @@ }; }; + "Taproom Public WiFi" = { + connection = { + id = "Taproom Public WiFi"; + type = "wifi"; + uuid = "d79280e9-4a22-4125-9583-eb7b80abfeb6"; + }; + wifi.ssid = "Taproom Public WiFi"; + wifi-security = { + auth-alg = "open"; + key-mgmt = "wpa-psk"; + }; + }; + Stargate-Discovery = { connection = { id = "Stargate-Discovery"; @@ -59,16 +74,17 @@ }; }; - wattson = { + wallace = { connection = { - id = "wattson"; + id = "wallace"; type = "wifi"; + uuid = "6896b13d-9717-4a8d-8a08-2a97139bf833"; }; - wifi.ssid = "wattson"; + wifi.ssid = "wallace"; wifi-security = { auth-alg = "open"; key-mgmt = "wpa-psk"; - psk = "$wattsonPSK"; + psk = "$wallacePSK"; }; }; diff --git a/secrets/wifi.age b/secrets/wifi.age index ac006f58..7d8159d4 100644 Binary files a/secrets/wifi.age and b/secrets/wifi.age differ