🏗️ Changed laptop to a framework 13

flake.nix

···
               home-manager.useUserPackages = true;
               home-manager.extraSpecialArgs = {
                 type = "laptop";
+                kb = "us";
               };
               home-manager.users."fantomitechno" = import ./home;
             }
···
               home-manager.useUserPackages = true;
               home-manager.extraSpecialArgs = {
                 type = "desktop";
+                kb = "fr";
               };
               home-manager.users."fantomitechno" = import ./home;
             }
···
               home-manager.useUserPackages = true;
               home-manager.extraSpecialArgs = {
                 type = "laptop";
+                kb = "fr";
               };
               home-manager.users."fantomitechno" = import ./home;
             }

home/niri/config/common/config.kdl

···
 
 input {
     keyboard {
-        xkb {
-            layout "fr,us,es"
-        }
         numlock
     }
     touchpad {

home/niri/config/desktop.kdl home/niri/config/desktopfr.kdl

···
 include "common/config.kdl"
 
+
+input {
+    keyboard {
+        xkb {
+            layout "fr,us"
+        }
+    }
+}
+
 output "HDMI-A-1" {
     mode "1920x1080@60.000"
     scale 1

home/niri/config/laptop.kdl home/niri/config/common/laptop.kdl

···
-include "common/config.kdl"
+include "config.kdl"
 
 output "eDP-1" {
     mode "1920x1080@60.049"

home/niri/config/laptopfr.kdl

···
+include "common/laptop.kdl"
+
+input {
+    keyboard {
+        xkb {
+            layout "fr,us"
+        }
+    }
+}

home/niri/config/laptopus.kdl

···
+include "common/laptop.kdl"
+
+input {
+    keyboard {
+        xkb {
+            layout "us,fr"
+            variant "intl"
+        }
+    }
+}

home/niri/default.nix

···
-{ config, type, ... }:
+{
+  config,
+  type,
+  kb,
+  ...
+}:
 let
   dotfileFolder = "${config.home.homeDirectory}/dotfiles";
   niriFolder = "${dotfileFolder}/home/niri";
 in
 {
   xdg.configFile."niri/config.kdl".source =
-    config.lib.file.mkOutOfStoreSymlink "${niriFolder}/config/${type}.kdl";
+    config.lib.file.mkOutOfStoreSymlink "${niriFolder}/config/${type}${kb}.kdl";
   xdg.configFile."niri/common".source =
     config.lib.file.mkOutOfStoreSymlink "${niriFolder}/config/common";
 

hosts/laptop/configuration.nix

···
 
   # Bootloader
   boot.loader = {
-    systemd-boot.enable = false;
-    grub.enable = true;
-    grub.device = "/dev/nvme0n1";
-    grub.minegrub-theme = {
-      enable = true;
-      splash = "100% NixOS";
-      background = "background_options/1.18 - [Caves And Cliffs 2].png";
-    };
-    grub.useOSProber = true;
+    systemd-boot.enable = true;
     efi.canTouchEfiVariables = true;
   };
   boot.kernelPackages = pkgs.linuxPackages;
 
   services.xserver.xkb = {
-    layout = "fr";
+    layout = "us";
     variant = "";
   };
 
   networking.hostName = "fantomitechno-laptop";
 
   # Configure console keymap
-  console.keyMap = "fr";
+  console.keyMap = "us";
 
   environment.variables = {
     LD_LIBRARY_PATH = "/run/opengl-driver/lib";

hosts/laptop/hardware-configuration.nix

···
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usb_storage"
-    "sd_mod"
-    "rtsx_pci_sdmmc"
-  ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/7f4fa576-9bed-4a84-9088-9ff55c839f94";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/b3eaa7e8-812e-4a8b-b491-5a9d3fe50b08";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/9CC2-23D1";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
 
   swapDevices = [ ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }