From d5235f5bf3a0a77ebe62b6897d97a0f6cf5702b1 Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 12 Sep 2024 12:44:10 +0200 Subject: [PATCH 1/5] Flake: update secrets --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index c435b3c..4a74ca9 100644 --- a/flake.lock +++ b/flake.lock @@ -577,11 +577,11 @@ "secrets": { "flake": false, "locked": { - "lastModified": 1726126607, - "narHash": "sha256-CMd+hkjciWowLKPZJIUVE2EaQzRH2EcLYonfiANilOE=", + "lastModified": 1726137390, + "narHash": "sha256-RaTOgscAl0pnAT/1DwyitTfFNwFDPZaqN/vTaqAoCTM=", "ref": "refs/heads/main", - "rev": "75ce423d0b8c05927ef3b55d1f7d5e7deaac9aa6", - "revCount": 21, + "rev": "994526ba9affd6e6d617b1743126a36846530c93", + "revCount": 24, "type": "git", "url": "ssh://forgejo@git.everest.tailscale:4222/Toast/nix-secrets" }, From c018979cb26ddfb2f25d6478cf8e6edc627d5dfa Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 12 Sep 2024 12:56:14 +0200 Subject: [PATCH 2/5] Gnome: add extensions --- roles/gnome/gnome.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/roles/gnome/gnome.nix b/roles/gnome/gnome.nix index a6c6e1e..fdcd669 100644 --- a/roles/gnome/gnome.nix +++ b/roles/gnome/gnome.nix @@ -1,6 +1,12 @@ -{...}: { - services.xserver = { - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; +{pkgs, ...}: { + services = { + xserver = { + displayManager.gdm.enable = true; + desktopManager.gnome.enable = true; + }; + gnome.gnome-browser-connector.enable = true; }; + environment.systemPackages = with pkgs.gnomeExtensions; [ + appindicator + ]; } From 09274de08c160173cb6cc52480e3b7046910afe8 Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 12 Sep 2024 13:18:11 +0200 Subject: [PATCH 3/5] Gnome: enable extensions --- roles/gnome/gnome.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/roles/gnome/gnome.nix b/roles/gnome/gnome.nix index fdcd669..8bf5198 100644 --- a/roles/gnome/gnome.nix +++ b/roles/gnome/gnome.nix @@ -6,7 +6,15 @@ }; gnome.gnome-browser-connector.enable = true; }; + + # Extensions environment.systemPackages = with pkgs.gnomeExtensions; [ appindicator ]; + + home-manager.users.toast = { + dconf.settings = { + "org/gnome/shell".enabled-extensions = ["appindicatorsupport@rgcjonas.gmail.com"]; + }; + }; } From 3baa80bf1f1c86ba6c4b569df1ac14a1d8c620db Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 12 Sep 2024 14:17:12 +0200 Subject: [PATCH 4/5] Gnome: add dash-to-dock --- roles/gnome/gnome.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/gnome/gnome.nix b/roles/gnome/gnome.nix index 8bf5198..5911d3d 100644 --- a/roles/gnome/gnome.nix +++ b/roles/gnome/gnome.nix @@ -10,11 +10,15 @@ # Extensions environment.systemPackages = with pkgs.gnomeExtensions; [ appindicator + dash-to-dock ]; home-manager.users.toast = { dconf.settings = { - "org/gnome/shell".enabled-extensions = ["appindicatorsupport@rgcjonas.gmail.com"]; + "org/gnome/shell".enabled-extensions = [ + "appindicatorsupport@rgcjonas.gmail.com" + "dash-to-dock@micxgx.gmail.com" + ]; }; }; } From ca38820ac67ca4a75d1793c4b7ca8b86487756d6 Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 12 Sep 2024 14:18:12 +0200 Subject: [PATCH 5/5] Machines/iMac: use the systemd initrd --- machines/iMac/hardware-configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/machines/iMac/hardware-configuration.nix b/machines/iMac/hardware-configuration.nix index f16c257..30fc201 100644 --- a/machines/iMac/hardware-configuration.nix +++ b/machines/iMac/hardware-configuration.nix @@ -14,6 +14,7 @@ boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci"]; boot.initrd.kernelModules = []; + boot.initrd.systemd.enable = true; boot.kernelModules = ["kvm-intel" "wl"]; boot.extraModulePackages = [config.boot.kernelPackages.broadcom_sta];