hosts/randolph/configuration.nix

@@ -9,7 +9,6 @@
     ./hardware-configuration.nix
     ../../snippets/samba.nix
     ../../snippets/lix.nix
-    ../../snippets/scanning.nix
   ];
 
   ################################################
@@ -67,10 +66,8 @@
   services.resolved = {
     enable = true;
     # dnssec = "true";
-    settings.Resolve = {
-      Domains = [ "~." ];
-      FallbackDns = [ "9.9.9.9" "149.112.112.112" ];
-    };
+    domains = [ "~." ];
+    fallbackDns = [ "9.9.9.9" "149.112.112.112" ];
   };
 
   # Set your time zone.
@@ -107,12 +104,11 @@
   ###################################
 
   # Set login and power management options
-  services.logind.settings.Login = {
-    HandleLidSwitch = "suspend";
-    HandleLidSwitchDocked = "ignore"; # if external monitor connected
-    HandlePowerKey = "ignore"; # handle this WM side
-    HandlePowerKeyLongPress = "poweroff";
-  };
+  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";
 
   # Enable graphics.
   hardware.graphics.enable = true;
@@ -130,17 +126,7 @@
   # });
 
   # Enable CUPS to print documents.
-   services.printing = {
-     enable = true;
-     drivers = with pkgs; [
-       cups-filters
-       # driverless
-       ghostscript
-       colord
-     ];
-     logLevel = "debug";
-   };
-  # services.printing.enable = false;
+  services.printing.enable = true;
 
   # Enable SANE for scanning.
   # hardware.sane = {
@@ -153,7 +139,7 @@
 
   # Enable sound.
   security.rtkit.enable = true; # needed for pipewire
-  services.pulseaudio.enable = false;
+  hardware.pulseaudio.enable = false;
   services.pipewire = {
     enable = true;
     alsa.enable = true;
@@ -201,7 +187,8 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    tuigreet
+    # neovim
+    greetd.tuigreet
     ntfs3g
     android-tools
     kakoune
@@ -214,7 +201,7 @@
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.lib.getExe pkgs.tuigreet} --cmd 'zsh -c sway'";
+        command = "${pkgs.lib.getExe pkgs.greetd.tuigreet} --cmd 'zsh -c sway'";
       };
     };
   };

snippets/common_home.nix

@@ -91,7 +91,6 @@
     darktable
     gthumb
     anki
-    butterfly
   ] ++ # Selection of graphical apps
   [
     prismlauncher

snippets/firefox.nix

@@ -52,7 +52,7 @@
               urls = [{
                 template = "https://nixos.wiki/index.php?search={searchTerms}";
               }];
-              icon = "https://nixos.wiki/favicon.png";
+              iconUpdateURL = "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}";
               }];
-              icon = "https://wiki.archlinux.org/favicon.ico";
+              iconUpdateURL = "https://wiki.archlinux.org/favicon.ico";
               definedAliases = [ "@aw" ];
             };
             "GeoGuessr Join" = {

snippets/git.nix

@@ -2,11 +2,9 @@
 
   programs.git = {
     enable = true;
-    settings = {
-      user = {
-        name = "vorboyvo";
-        email = "vorboyvo@vorboyvo.com";
-      };
+    userName = "vorboyvo";
+    userEmail = "mrsirofvibe@outlook.com";
+    extraConfig = {
       init.defaultBranch = "main";
       core.editor = "kak";
       merge.tool = "kakmerge";

snippets/scanning.nix

@@ -1,10 +0,0 @@
-# for configuration.nix
-{ config, lib, pkgs, ... }:
-{
-  hardware.sane = {
-    enable = true;
-    extraBackends = [ pkgs.sane-airscan pkgs.epkowa ];
-  };
-
-  environment.systemPackages = with pkgs; [ naps2 ];
-}

snippets/sway.nix

@@ -8,7 +8,7 @@ let
   mod = "Mod4";
   shutdownMenu = pkgs.writeShellScript "shutdownmenu"
     (builtins.readFile "${scripts}/shutdownmenu.sh");
-  backgroundImage = "${extra}/nga_ceiling.jpg";
+  backgroundImage = "${extra}/kuwaitboat.jpg";
   multiTouchGesturesConfig = ''
     bindgesture swipe:4:up focus parent
     bindgesture swipe:4:left workspace prev
@@ -151,9 +151,10 @@ in {
   };
   services.swayidle = {
     enable = true;
-    events = {
-      before-sleep = "${pkgs.lib.getExe pkgs.swaylock} -f";
-    };
+    events = [{
+      event = "before-sleep";
+      command = "${pkgs.lib.getExe pkgs.swaylock} -f";
+    }];
   };
 
   programs.rofi = {

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;
-    initContent = ''
+    initExtra = ''
       # Set prompt
       # PS1='%(?..[%?] )%B%F{green}[%n@%m %~]%(!.#.$)%f%b '
     '';