flake.nix

@@ -47,13 +47,16 @@
       system = "x86_64-linux";
       specialArgs = { inherit inputs; };
       modules = [
-        ({ inputs, lib, ... }: {
+        ({ inputs, ... }: {
           nixpkgs = {
             config.allowUnfree = true;
             overlays = with inputs; [ emacs.overlay ];
           };
-          nix.registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
         })
+        {
+          nix.registry =
+            nixpkgs.lib.mapAttrs (_: value: { flake = value; }) inputs;
+        }
         snm.nixosModule
         ./modules/security.nix
         ./hosts/thrall

hosts/dregil/configuration.nix

@@ -11,12 +11,14 @@ let
     export __VK_LAYER_NV_optimus=NVIDIA_only
     exec "$@"
   '';
-in {
+in
-  imports = [
+{
-    # Include the results of the hardware scan.
+  imports =
-    ./hardware-configuration.nix
+    [
-    # <nixos-hardware/lenovo/legion/15ich>
+      # Include the results of the hardware scan.
-  ];
+      ./hardware-configuration.nix
+      # <nixos-hardware/lenovo/legion/15ich>
+    ];
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
@@ -28,8 +30,7 @@ in {
   networking.hostName = "dregil"; # Define your hostname.
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.networkmanager.enable =
+  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
-    true; # Easiest to use and most distros use this by default.
 
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
@@ -37,8 +38,7 @@ in {
 
   console = {
     font = "Lat2-Terminus16";
-    #useXkbConfig = true; # use xkbOptions in tty.
+    useXkbConfig = true; # use xkbOptions in tty.
-    keyMap = "dvorak";
   };
 
   # Enable the X11 windowing system.
@@ -47,36 +47,36 @@ in {
     exportConfiguration = true;
 
     # Configure keymap in X11
-    layout = "us";
+    layout = "dvorak";
 
     xkbOptions = "terminate:ctrl_alt_bksp,caps:escape,compose:ralt";
 
     videoDrivers = [ "nvidia" ]; # "modesetting" ];
 
-    displayManager.lightdm = { enable = true; };
+    displayManager.lightdm = {
+      enable = true;
+    };
 
     desktopManager.xfce.enable = true;
-    desktopManager.plasma5.enable = true;
+    
-
     # Enable touchpad support (enabled default in most desktopManager).
     libinput = {
       enable = true;
       touchpad.disableWhileTyping = true;
       touchpad.naturalScrolling = true;
-      mouse.naturalScrolling =
+      mouse.naturalScrolling = config.services.xserver.libinput.touchpad.naturalScrolling;
-        config.services.xserver.libinput.touchpad.naturalScrolling;
     };
   };
 
   fonts = {
     enableDefaultFonts = true;
     fonts = with pkgs; [
-      corefonts
+        corefonts
-      noto-fonts
+        noto-fonts
-      noto-fonts-emoji
+        noto-fonts-emoji
-      fira-code
+        fira-code
-      fira-code-symbols
+        fira-code-symbols
-      nerdfonts
+        nerdfonts
     ];
   };
 
@@ -90,37 +90,42 @@ in {
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.alex = {
     isNormalUser = true;
-    extraGroups = [
+    extraGroups = [ "wheel" # Enable ‘sudo’ for the user.
-      "wheel" # Enable ‘sudo’ for the user.
+                    "input"
-      "input"
+                  ];
-    ];
+ };
-  };
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    wget
+     wget
-    ripgrep
+     ripgrep
-    git
+     git
-    nvidia-offload
+     nvidia-offload
-    pinentry
+     pinentry
   ];
 
   # adjust channels to nixpkgs used on this system via this flake
   environment.etc."nix/inputs/nixpkgs".source = inputs.nixpkgs-unstable.outPath;
-  nix.nixPath = [ "nixpkgs=${inputs.nixpkgs-unstable}" ];
+  nix.nixPath = [
+    "nixpkgs=${inputs.nixpkgs-unstable}"
+  ];
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
   programs.gnupg.agent = {
-    enable = true;
+     enable = true;
-    enableSSHSupport = true;
+     enableSSHSupport = true;
   };
 
-  programs.neovim = { enable = true; };
+  programs.neovim = {
+    enable = true;
+  };
 
-  programs.steam = { enable = true; };
+  programs.steam = {
+    enable = true;
+  };
 
   # List services that you want to enable:
 

hosts/dregil/default.nix

@@ -6,16 +6,17 @@ let
 
   pkgs = import inputs.nixpkgs-unstable {
     inherit system;
-    config = { allowUnfree = true; };
+    config = {
+        allowUnfree = true;
+    };      
   };
-in nixosSystem {
+in
+nixosSystem {
   inherit system pkgs;
   specialArgs = { inherit inputs; };
   modules = [
     ../../modules/security.nix
     ../../modules/common-system.nix
     ./configuration.nix
-    inputs.home-manager-unstable.nixosModules.home-manager
-    ../../home/anne
   ];
 }

outputs/homeConfigurations/default.nix

@@ -13,11 +13,6 @@ in {
       ../../home/cli.nix
       {
         home = {
-          language.base = "en_US@UTF-8";
-
-          keyboard.type = "us";
-          keyboard.variant = "dvorak";
-
           packages = with pkgs; [
             alacritty # fast terminal
             firefox # the browser with the fox