fix: network on asahi

sioodmy · Dec 2, 2024 · 7e9929b · 7e9929b
1 parent 38df86a
commit 7e9929b
Show file tree

Hide file tree

Showing 38 changed files with 49 additions and 19 deletions.
diff --git a/system/net/default.nix b/system/net/default.nix
@@ -1,4 +1,10 @@
-{...}: {
+{
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib) mkIf;
+in {
   networking = {
     nameservers = ["127.0.0.1" "::1"];
     dhcpcd.extraConfig = "nohook resolv.conf";
@@ -7,7 +13,7 @@
       unmanaged = ["docker0" "rndis0"];
       dns = "none";
       wifi = {
-        macAddress = "random";
+        macAddress = mkIf (! config.hardware.asahi.enable) "random";
         powersave = true;
       };
     };

diff --git a/user/hyprland/default.nix b/user/hyprland/default.nix
diff --git a/user/misc-scripts/default.nix b/user/misc-scripts/default.nix
diff --git a/user/misc-scripts/webcam.nix b/user/misc-scripts/webcam.nix
diff --git a/user/theme/_sources/generated.json b/user/theme/_sources/generated.json
@@ -0,0 +1,22 @@
+{
+    "nord-nvim": {
+        "cargoLocks": null,
+        "date": "2024-06-16",
+        "extract": null,
+        "name": "nord-nvim",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "andersevenrud",
+            "repo": "nordic.nvim",
+            "rev": "c88388b2a5f6e621df2718c316b856d4971bb89d",
+            "sha256": "sha256-ipmt0xD2zTfoh8fyYG4+09uVL2ef98FE9VwWpWJtQks=",
+            "type": "github"
+        },
+        "version": "c88388b2a5f6e621df2718c316b856d4971bb89d"
+    }
+}
diff --git a/user/theme/_sources/generated.nix b/user/theme/_sources/generated.nix
@@ -0,0 +1,16 @@
+# This file was generated by nvfetcher, please do not modify it manually.
+{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
+{
+  nord-nvim = {
+    pname = "nord-nvim";
+    version = "c88388b2a5f6e621df2718c316b856d4971bb89d";
+    src = fetchFromGitHub {
+      owner = "andersevenrud";
+      repo = "nordic.nvim";
+      rev = "c88388b2a5f6e621df2718c316b856d4971bb89d";
+      fetchSubmodules = false;
+      sha256 = "sha256-ipmt0xD2zTfoh8fyYG4+09uVL2ef98FE9VwWpWJtQks=";
+    };
+    date = "2024-06-16";
+  };
+}
diff --git a/theme/default.nix → user/theme/default.nix b/theme/default.nix → user/theme/default.nix
diff --git a/user/theme/nvfetcher.toml b/user/theme/nvfetcher.toml
@@ -0,0 +1,3 @@
+[nord-nvim]
+src.git = "https://github.com/andersevenrud/nordic.nvim"
+fetch.github = "andersevenrud/nordic.nvim"
diff --git a/theme/wall.jpg → user/theme/wall.jpg b/theme/wall.jpg → user/theme/wall.jpg
diff --git a/user/anyrun/config.ron → user/wrapped/anyrun/config.ron b/user/anyrun/config.ron → user/wrapped/anyrun/config.ron
diff --git a/user/anyrun/default.nix → user/wrapped/anyrun/default.nix b/user/anyrun/default.nix → user/wrapped/anyrun/default.nix
diff --git a/user/anyrun/style.nix → user/wrapped/anyrun/style.nix b/user/anyrun/style.nix → user/wrapped/anyrun/style.nix
diff --git a/user/foot/default.nix → user/wrapped/foot/default.nix b/user/foot/default.nix → user/wrapped/foot/default.nix
diff --git a/user/hypr/default.nix → user/wrapped/hypr/default.nix b/user/hypr/default.nix → user/wrapped/hypr/default.nix
diff --git a/user/hypr/tohyprconf.nix → user/wrapped/hypr/tohyprconf.nix b/user/hypr/tohyprconf.nix → user/wrapped/hypr/tohyprconf.nix
diff --git a/user/hyprlock/default.nix → user/wrapped/hyprlock/default.nix b/user/hyprlock/default.nix → user/wrapped/hyprlock/default.nix
diff --git a/user/hyprlock/hypridle.conf → user/wrapped/hyprlock/hypridle.conf b/user/hyprlock/hypridle.conf → user/wrapped/hyprlock/hypridle.conf
diff --git a/user/hyprlock/hyprlock.conf → user/wrapped/hyprlock/hyprlock.conf b/user/hyprlock/hyprlock.conf → user/wrapped/hyprlock/hyprlock.conf
diff --git a/user/mako/default.nix → user/wrapped/mako/default.nix b/user/mako/default.nix → user/wrapped/mako/default.nix
diff --git a/user/nvim/_sources/generated.json → user/wrapped/nvim/_sources/generated.json b/user/nvim/_sources/generated.json → user/wrapped/nvim/_sources/generated.json
diff --git a/user/nvim/_sources/generated.nix → user/wrapped/nvim/_sources/generated.nix b/user/nvim/_sources/generated.nix → user/wrapped/nvim/_sources/generated.nix
diff --git a/user/nvim/default.nix → user/wrapped/nvim/default.nix b/user/nvim/default.nix → user/wrapped/nvim/default.nix
diff --git a/user/nvim/init.lua → user/wrapped/nvim/init.lua b/user/nvim/init.lua → user/wrapped/nvim/init.lua
diff --git a/user/nvim/init.vim → user/wrapped/nvim/init.vim b/user/nvim/init.vim → user/wrapped/nvim/init.vim
diff --git a/user/nvim/nvfetcher.toml → user/wrapped/nvim/nvfetcher.toml b/user/nvim/nvfetcher.toml → user/wrapped/nvim/nvfetcher.toml
diff --git a/user/tofi/default.nix → user/wrapped/tofi/default.nix b/user/tofi/default.nix → user/wrapped/tofi/default.nix
diff --git a/user/tofi/emojis → user/wrapped/tofi/emojis b/user/tofi/emojis → user/wrapped/tofi/emojis
diff --git a/user/tofi/scripts.nix → user/wrapped/tofi/scripts.nix b/user/tofi/scripts.nix → user/wrapped/tofi/scripts.nix
diff --git a/user/waybar/default.nix → user/wrapped/waybar/default.nix b/user/waybar/default.nix → user/wrapped/waybar/default.nix
diff --git a/user/waybar/style.nix → user/wrapped/waybar/style.nix b/user/waybar/style.nix → user/wrapped/waybar/style.nix
diff --git a/user/waybar/waybar-conf.nix → user/wrapped/waybar/waybar-conf.nix b/user/waybar/waybar-conf.nix → user/wrapped/waybar/waybar-conf.nix
diff --git a/user/zsh/aliases.nix → user/wrapped/zsh/aliases.nix b/user/zsh/aliases.nix → user/wrapped/zsh/aliases.nix
diff --git a/user/zsh/config.zsh → user/wrapped/zsh/config.zsh b/user/zsh/config.zsh → user/wrapped/zsh/config.zsh
diff --git a/user/zsh/default.nix → user/wrapped/zsh/default.nix b/user/zsh/default.nix → user/wrapped/zsh/default.nix
diff --git a/user/zsh/starship.nix → user/wrapped/zsh/starship.nix b/user/zsh/starship.nix → user/wrapped/zsh/starship.nix
diff --git a/user/zsh/starship.zsh → user/wrapped/zsh/starship.zsh b/user/zsh/starship.zsh → user/wrapped/zsh/starship.zsh
diff --git a/user/zsh/zinit.nix → user/wrapped/zsh/zinit.nix b/user/zsh/zinit.nix → user/wrapped/zsh/zinit.nix
diff --git a/user/zsh/zoxide.zsh → user/wrapped/zsh/zoxide.zsh b/user/zsh/zoxide.zsh → user/wrapped/zsh/zoxide.zsh