diff --git a/hosts/randolph/configuration.nix b/hosts/randolph/configuration.nix
index cc5326c..9973a8b 100644
--- a/hosts/randolph/configuration.nix
+++ b/hosts/randolph/configuration.nix
@@ -67,8 +67,10 @@
   services.resolved = {
     enable = true;
     # dnssec = "true";
-    domains = [ "~." ];
-    fallbackDns = [ "9.9.9.9" "149.112.112.112" ];
+    settings.Resolve = {
+      Domains = [ "~." ];
+      FallbackDns = [ "9.9.9.9" "149.112.112.112" ];
+    };
   };
 
   # Set your time zone.
@@ -105,11 +107,12 @@
   ###################################
 
   # Set login and power management options
-  services.logind.lidSwitch = "suspend";
-  services.logind.lidSwitchDocked =
-    "ignore"; # when an external monitor is plugged in
-  services.logind.powerKey = "ignore"; # handle this WM side
-  services.logind.powerKeyLongPress = "poweroff";
+  services.logind.settings.Login = {
+    HandleLidSwitch = "suspend";
+    HandleLidSwitchDocked = "ignore"; # if external monitor connected
+    HandlePowerKey = "ignore"; # handle this WM side
+    HandlePowerKeyLongPress = "poweroff";
+  };
 
   # Enable graphics.
   hardware.graphics.enable = true;
@@ -150,7 +153,7 @@
 
   # Enable sound.
   security.rtkit.enable = true; # needed for pipewire
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   services.pipewire = {
     enable = true;
     alsa.enable = true;
@@ -198,8 +201,7 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    # neovim
-    greetd.tuigreet
+    tuigreet
     ntfs3g
     android-tools
     kakoune
@@ -212,7 +214,7 @@
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.lib.getExe pkgs.greetd.tuigreet} --cmd 'zsh -c sway'";
+        command = "${pkgs.lib.getExe pkgs.tuigreet} --cmd 'zsh -c sway'";
       };
     };
   };
diff --git a/snippets/firefox.nix b/snippets/firefox.nix
index eb6fc28..cedc427 100644
--- a/snippets/firefox.nix
+++ b/snippets/firefox.nix
@@ -52,7 +52,7 @@
               urls = [{
                 template = "https://nixos.wiki/index.php?search={searchTerms}";
               }];
-              iconUpdateURL = "https://nixos.wiki/favicon.png";
+              icon = "https://nixos.wiki/favicon.png";
               updateInterval = 24 * 60 * 60 * 1000; # every day
               definedAliases = [ "@nw" ];
             };
@@ -73,7 +73,7 @@
                 template =
                   "https://wiki.archlinux.org/index.php?search={searchTerms}";
               }];
-              iconUpdateURL = "https://wiki.archlinux.org/favicon.ico";
+              icon = "https://wiki.archlinux.org/favicon.ico";
               definedAliases = [ "@aw" ];
             };
             "GeoGuessr Join" = {
diff --git a/snippets/git.nix b/snippets/git.nix
index 4095aee..b8b3947 100644
--- a/snippets/git.nix
+++ b/snippets/git.nix
@@ -2,9 +2,11 @@
 
   programs.git = {
     enable = true;
-    userName = "vorboyvo";
-    userEmail = "mrsirofvibe@outlook.com";
-    extraConfig = {
+    settings = {
+      user = {
+        name = "vorboyvo";
+        email = "vorboyvo@vorboyvo.com";
+      };
       init.defaultBranch = "main";
       core.editor = "kak";
       merge.tool = "kakmerge";
diff --git a/snippets/sway.nix b/snippets/sway.nix
index b176db8..b75a2e7 100644
--- a/snippets/sway.nix
+++ b/snippets/sway.nix
@@ -151,10 +151,9 @@ in {
   };
   services.swayidle = {
     enable = true;
-    events = [{
-      event = "before-sleep";
-      command = "${pkgs.lib.getExe pkgs.swaylock} -f";
-    }];
+    events = {
+      before-sleep = "${pkgs.lib.getExe pkgs.swaylock} -f";
+    };
   };
 
   programs.rofi = {
diff --git a/snippets/zsh.nix b/snippets/zsh.nix
index b01c4cf..8dfdb54 100644
--- a/snippets/zsh.nix
+++ b/snippets/zsh.nix
@@ -1,9 +1,9 @@
-{ pkgs, ... }: {
+{ ... }: {
   # Enabling bash from home-manager means environment variables set by HM get set correctly
   # Worst case, fallback to bash.
   programs.zsh = {
     enable = true;
-    initExtra = ''
+    initContent = ''
       # Set prompt
       # PS1='%(?..[%?] )%B%F{green}[%n@%m %~]%(!.#.$)%f%b '
     '';