Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Compare commits

base: Toast:5926168b3f59a50e2759312cea643b92374e5b64
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05
..
compare: Toast:70f9fdecddeaeee06c137ab9a87e4a48d570846f
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05

No commits in common. "5926168b3f59a50e2759312cea643b92374e5b64" and "70f9fdecddeaeee06c137ab9a87e4a48d570846f" have entirely different histories.
5926168b3f ... 70f9fdecdd

3 changed files with 7 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.justfile
View file

@ -19,8 +19,8 @@ update-input input:
nix flake lock --update-input {{input}} nix flake lock --update-input {{input}}
@edit-secrets: @edit-secrets:
git clone ssh://forgejo@git.everest.sable-pancake.ts.net:4222/Toast/nix-secrets.git /tmp/secrets git clone http://git.everest.sable-pancake.ts.net/Toast/nix-secrets.git /tmp/secrets
sed -i 's\git+ssh://forgejo@git.everest.sable-pancake.ts.net:4222/Toast/nix-secrets\/tmp/secrets\g' flake.nix sed -i 's\git+http://git.everest.sable-pancake.ts.net/Toast/nix-secrets\/tmp/secrets\g' flake.nix
just -q update-input secrets just -q update-input secrets
echo "{{bold}}All done!" echo "{{bold}}All done!"
echo "{{normal}}Remember to restore flake.nix" echo "{{normal}}Remember to restore flake.nix"

8
flake.lock generated
View file

@ -377,11 +377,11 @@
"secrets": { "secrets": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713107869, "lastModified": 1710238597,
"narHash": "sha256-TniJoCQfJ3OXrcqhH/8xcV6o4Sa5C/4KSRtk0c0/RK4=", "narHash": "sha256-N0CVdpIyAkofXIHS9SUuDS27gS5HiYue+i4CBtk9IqE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "a00a07cd931b6eab722727a0606837cb895997f0", "rev": "e05ec0b3a77ea7c2aecf699894cdabac1b377bab",
"revCount": 11, "revCount": 9,
"type": "git", "type": "git",
"url": "ssh://forgejo@git.everest.sable-pancake.ts.net:4222/Toast/nix-secrets" "url": "ssh://forgejo@git.everest.sable-pancake.ts.net:4222/Toast/nix-secrets"
}, },

46
roles/desktop/services/networkmanager.nix
View file

@ -1,55 +1,11 @@
{ {config, ...}: let
config,
flakeSelf,
...
}: let
tailscaleName = config.services.tailscale.interfaceName; tailscaleName = config.services.tailscale.interfaceName;
in { in {
age.secrets = {
wifiPasswords.file = "${flakeSelf.inputs.secrets}/wifi-passwords.age";
};
networking.networkmanager = { networking.networkmanager = {
enable = true; enable = true;
unmanaged = [ unmanaged = [
"interface-name:${tailscaleName}" "interface-name:${tailscaleName}"
]; ];
wifi.macAddress = "random"; wifi.macAddress = "random";
ensureProfiles = {
environmentFiles = [config.age.secrets.wifiPasswords.path];
profiles = {
"4g-modem" = {
connection = {
id = "4G Modem";
type = "wifi";
};
ipv4.method = "auto";
wifi = {
mode = "infrastructure";
ssid = "TP-Link_CCB4";
};
wifi-security = {
auth-alg = "open";
key-mgmt = "wpa-psk";
psk = "$MODEM";
};
};
phone = {
connection = {
id = "Phone";
type = "wifi";
};
ipv4.method = "auto";
wifi = {
mode = "infrastructure";
ssid = "Redmi Note 10 Pro_5197";
};
wifi-security = {
auth-alg = "open";
key-mgmt = "sae";
psk = "$PHONE";
};
};
};
};
}; };
} }