diff --git a/hosts/alice/hardware-configuration.nix b/hosts/alice/hardware-configuration.nix
index 999b1e4..ba9f0e0 100644
--- a/hosts/alice/hardware-configuration.nix
+++ b/hosts/alice/hardware-configuration.nix
@@ -12,10 +12,12 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = [];
-  boot.extraModulePackages = [];
+  boot = {
+    initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
+    initrd.kernelModules = [];
+    kernelModules = [];
+    extraModulePackages = [];
+  };
 
   fileSystems."/" = {
     device = "UUID=288cfd6e-dd6d-4ac4-bc2f-36c1309f8619";
diff --git a/users/buffet/bash.nix b/users/buffet/bash.nix
index 84ded45..0336c31 100644
--- a/users/buffet/bash.nix
+++ b/users/buffet/bash.nix
@@ -8,75 +8,77 @@ in {
       INPUTRC = inputrc;
     };
 
-    programs.direnv.enableBashIntegration = true;
-    programs.fzf.enableBashIntegration = true;
+    programs = {
+      direnv.enableBashIntegration = true;
+      fzf.enableBashIntegration = true;
 
-    programs.bash = {
-      enable = true;
-      historyControl = ["erasedups" "ignorespace"];
+      bash = {
+        enable = true;
+        historyControl = ["erasedups" "ignorespace"];
 
-      shellAliases = {
-        e = "\"$EDITOR\"";
-        mkdir = "mkdir -p";
-        rg = "rg -S";
-        update = let
-          change-message = pkgs.writeScript "change-commit-message" ''
-            #!/bin/sh
-            sed -i '1s/.*/chore: update/' "$1"
-          '';
-        in "nix flake update --commit-lock-file && EDITOR=${change-message} git commit --amend";
+        shellAliases = {
+          e = "\"$EDITOR\"";
+          mkdir = "mkdir -p";
+          rg = "rg -S";
+          update = let
+            change-message = pkgs.writeScript "change-commit-message" ''
+              #!/bin/sh
+              sed -i '1s/.*/chore: update/' "$1"
+            '';
+          in "nix flake update --commit-lock-file && EDITOR=${change-message} git commit --amend";
+        };
+
+        shellOptions = [
+          "cdspell"
+          "checkjobs"
+          "extglob"
+          "globstar"
+          "histappend"
+          "nocaseglob"
+        ];
+
+        bashrcExtra = ''
+          [[ -f ~/.profile ]] && . ~/.profile
+        '';
+
+        initExtra = ''
+          __prompt() {
+          	local status="$?"
+          	local row
+          	local col
+
+          	IFS=';' read -rs -dR -p $'\e[6n' row col >/dev/tty
+          	if [[ $col != 1 ]]; then
+          		printf '%s' $'\e[0;7m%\n\e[0m'
+          	fi
+
+          	PS1='\[\e[0;1m\]['
+
+          	case $status in
+          	0) PS1+='\[\e[32m\]' ;;
+          	*) PS1+='\[\e[31m\]' ;;
+          	esac
+
+          	if [[ "$PWD" == "$HOME" ]]; then
+          		PS1+="~"
+          	elif [[ "$PWD" == / ]]; then
+          		PS1+=/
+          	else
+          		PS1+="''${PWD##*/}"
+          	fi
+
+          	PS1+='\[\e[0;1m\]]\[\e[0m\]'
+
+          	[[ $CONTAINER_ID ]] && PS1+="'"
+
+          	PS1+=' '
+          }
+          PROMPT_COMMAND=__prompt
+
+          bind '"\C-o": "\C-a\C-k fg; if [[ $? == 1 ]]; then nvim; fi\n"'
+          bind '"\e\C-m": "\C-e | nvim\C-m"'
+        '';
       };
-
-      shellOptions = [
-        "cdspell"
-        "checkjobs"
-        "extglob"
-        "globstar"
-        "histappend"
-        "nocaseglob"
-      ];
-
-      bashrcExtra = ''
-        [[ -f ~/.profile ]] && . ~/.profile
-      '';
-
-      initExtra = ''
-        __prompt() {
-        	local status="$?"
-        	local row
-        	local col
-
-        	IFS=';' read -rs -dR -p $'\e[6n' row col >/dev/tty
-        	if [[ $col != 1 ]]; then
-        		printf '%s' $'\e[0;7m%\n\e[0m'
-        	fi
-
-        	PS1='\[\e[0;1m\]['
-
-        	case $status in
-        	0) PS1+='\[\e[32m\]' ;;
-        	*) PS1+='\[\e[31m\]' ;;
-        	esac
-
-        	if [[ "$PWD" == "$HOME" ]]; then
-        		PS1+="~"
-        	elif [[ "$PWD" == / ]]; then
-        		PS1+=/
-        	else
-        		PS1+="''${PWD##*/}"
-        	fi
-
-        	PS1+='\[\e[0;1m\]]\[\e[0m\]'
-
-        	[[ $CONTAINER_ID ]] && PS1+="'"
-
-        	PS1+=' '
-        }
-        PROMPT_COMMAND=__prompt
-
-        bind '"\C-o": "\C-a\C-k fg; if [[ $? == 1 ]]; then nvim; fi\n"'
-        bind '"\e\C-m": "\C-e | nvim\C-m"'
-      '';
     };
   };
 }