ahrc-laptop/configuration.nix

@@ -5,8 +5,6 @@
 
   networking.hostName = "ahrc-laptop";
 
-  console.keyMap = "fr-pc";
-
   environment.systemPackages = with pkgs; [ powertop brightnessctl ];
 
   services.libinput.enable = true;

ahrc-laptop/home.nix

@@ -24,10 +24,10 @@
       decoration = {
         inactive_opacity = 1.0;
         drop_shadow = false;
+        dim_inactive = false;
         blur.enabled = false;
       };
       gestures.workspace_swipe = true;
-      input.kb_layout = "fr";
       input.touchpad = {
         disable_while_typing = false;
         natural_scroll = true;

ahrc-pc/configuration.nix

@@ -5,18 +5,14 @@
 
   networking.hostName = "ahrc-pc";
 
-  console.keyMap = "us";
-
-  services.openssh.enable = true;
-
   programs.bash.promptInit = ''
     if [ "$(whoami)" = root ]; then
-      color=31
-    else
       color=35
+    else
+      color=32
       user='\u@'
     fi
-    PS1="\[\033[0m\][\[\033[1;''${color}m\]''${user}\h\[\033[0m\] \[\033[1;34m\]\W\[\033[0m\]]\\$ "
+    PS1="\[\033[0m\](\[\033[1;''${color}m\]''${user}\h\[\033[0m\] \[\033[1;34m\]\W\[\033[0m\])\\$ "
   '';
 
   system.stateVersion = "24.05";

ahrc-pc/home.nix

@@ -23,9 +23,9 @@
       decoration = {
         inactive_opacity = 0.9;
         drop_shadow = true;
+        dim_inactive = true;
         blur.enabled = true;
       };
-      input.kb_layout = "us";
       gestures.workspace_swipe = false;
       misc.animate_manual_resizes = true;
     };

common/configuration.nix

@@ -12,7 +12,10 @@
   time.timeZone = "Europe/Paris";
 
   i18n.defaultLocale = "en_US.UTF-8";
-  console.font = "Lat2-Terminus16";
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "fr-pc";
+  };
 
   services.pipewire = {
     enable = true;

common/home.nix

@@ -173,7 +173,6 @@
         movefocus_cycles_fullscreen = false;
       };
       decoration = {
-        dim_inactive = false;
         rounding = 10;
         active_opacity = 1.0;
         fullscreen_opacity = 1.0;
@@ -191,6 +190,7 @@
         no_focus_fallback = true;
       };
       input = {
+        kb_layout = "fr";
         numlock_by_default = true;
         repeat_rate = 75;
         repeat_delay = 300;