Plarpoon · Plarpoon · Oct 8, 2023 · Oct 8, 2023
diff --git a/flake.nix b/flake.nix
@@ -19,54 +19,60 @@
   };
 
   # Define the outputs for the flake
-  outputs = { self, nixpkgs, home-manager, plasma-manager, ... }@inputs:
-    let
-      # Define some variables
-      username = "plarpoon";
-      stateVersion = "23.11";
-    in
+  outputs =
+    { nixpkgs, home-manager, ... }@inputs:
     {
       nixosConfigurations = {
         # Define a NixOS configuration for the 'bjorn' host
         bjorn = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
           modules = [
             # Import the 'bjorn' host's configuration.nix file
             ./hosts/bjorn/configuration.nix
-
+            ./modules/nixos
             # Enable Home Manager
             home-manager.nixosModules.home-manager
-
-            ({ config, pkgs, ... }: {
+            {
               # Configure Home Manager
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-
-              system.stateVersion = stateVersion;
-            })
+              home-manager = {
+                useGlobalPkgs = true;
+                useUserPackages = true;
+                extraSpecialArgs = {
+                  inherit inputs;
+                };
+                users.plarpoon.imports = [
+                  ./modules/home-manager
+                  ./users/plarpoon
+                ];
+              };
+            }
           ];
-          specialArgs = { inherit inputs username stateVersion; };
+          specialArgs = {
+            inherit inputs;
+          };
         };
 
         # Define a NixOS configuration for the 'daisy' host
         daisy = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
           modules = [
             # Import the 'daisy' host's configuration.nix file
             ./hosts/daisy/configuration.nix
 
             # Enable Home Manager
             home-manager.nixosModules.home-manager
-
-            ({ config, pkgs, ... }: {
+            {
               # Configure Home Manager
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-
-              system.stateVersion = stateVersion;
-            })
+              home-manager = {
+                useGlobalPkgs = true;
+                useUserPackages = true;
+                extraSpecialArgs = {
+                  inherit inputs;
+                };
+              };
+            }
           ];
-          specialArgs = { inherit inputs username stateVersion; };
+          specialArgs = {
+            inherit inputs;
+          };
         };
       };
     };

diff --git a/hosts/bjorn/configuration.nix b/hosts/bjorn/configuration.nix
@@ -1,62 +1,62 @@
-{ config, inputs, lib, pkgs, username, stateVersion, vars, ... }:
-
-let
-  sharedConfig = import ../default.nix { inherit config inputs lib pkgs username stateVersion vars; };
-in
 {
+
+  ##FIX ME
+  boot.loader.grub.devices = [ "nodev" ];
+
   imports = [
     # Import your hardware configuration
     ./hardware-configuration.nix
-
-    # Import the shared configuration
-    sharedConfig
   ];
+  ## My modules
+  kde = {
+    enable = true;
+  };
 
-  config = {
-    ## Users
-    users.users = {
-      "${username}" = {
-        isNormalUser = true; # The user is a normal user (not a system user)
-        openssh.authorizedKeys.keys = [
+  ## Users
+  users.users = {
+    plarpoon = {
+      isNormalUser = true; # The user is a normal user (not a system user)
+      openssh.authorizedKeys.keys =
+        [
           # Add your SSH public key(s) here, if you plan on using SSH to connect to this user
         ];
-        extraGroups = [ "wheel" "networkmanager" ]; # The user is part of the 'wheel' and 'networkmanager' groups
-      };
+      extraGroups = [
+        "wheel"
+        "networkmanager"
+      ]; # The user is part of the 'wheel' and 'networkmanager' groups
     };
+  };
 
-    networking.nameservers = [
-      "45.90.28.0#bjorn-e38da2.dns.nextdns.io"
-      "2a07:a8c0::#bjorn-e38da2.dns.nextdns.io"
-    ];
-
-    services.resolved = {
-      enable = true; # Enable systemd-resolved for DNS resolution
-      dnssec = "true"; # Enable DNSSEC for DNS resolution
-      domains = [ "~." ]; # Use these DNS servers for all domains
-      fallbackDns = [
-        "45.90.30.0#bjorn-e38da2.dns.nextdns.io"
-        "2a07:a8c1::#bjorn-e38da2.dns.nextdns.io"
-      ];
-      extraConfig = ''
-        DNSOverTLS=yes   # Use DNS over TLS for DNS resolution
-      '';
-    };
+  networking.nameservers = [
+    "45.90.28.0#bjorn-e38da2.dns.nextdns.io"
+    "2a07:a8c0::#bjorn-e38da2.dns.nextdns.io"
+  ];
 
-    ## Networking
-    networking = {
-      hostName = "bjorn"; # Set this system's hostname
+  services.resolved = {
+    enable = true; # Enable systemd-resolved for DNS resolution
+    dnssec = "true"; # Enable DNSSEC for DNS resolution
+    domains = [ "~." ]; # Use these DNS servers for all domains
+    fallbackDns = [
+      "45.90.30.0#bjorn-e38da2.dns.nextdns.io"
+      "2a07:a8c1::#bjorn-e38da2.dns.nextdns.io"
+    ];
+    extraConfig = ''
+      DNSOverTLS=yes   # Use DNS over TLS for DNS resolution
+    '';
+  };
 
-      networkmanager.enable = true; # Enable NetworkManager for network configuration
+  ## Networking
+  networking = {
+    hostName = "bjorn"; # Set this system's hostname
 
-      useDHCP = false; # Do not use DHCP for network configuration (use static IP addresses)
-    };
+    networkmanager.enable = true; # Enable NetworkManager for network configuration
 
-    hardware.enableRedistributableFirmware = true; # Enable redistributable firmware (may be required for some hardware)
+    useDHCP = false; # Do not use DHCP for network configuration (use static IP addresses)
+  };
 
-    hardware.cpu.intel.updateMicrocode = true; # Update CPU microcode (for Intel CPUs)
+  hardware.enableRedistributableFirmware = true; # Enable redistributable firmware (may be required for some hardware)
 
-    system.stateVersion = stateVersion; # Set the system state version
+  hardware.cpu.intel.updateMicrocode = true; # Update CPU microcode (for Intel CPUs)
 
-    plasma.enable = true; # Enable KDE Plasma
-  };
+  system.stateVersion = "23.11";
 }
diff --git a/hosts/bjorn/hardware-configuration.nix b/hosts/bjorn/hardware-configuration.nix
@@ -1,32 +1,40 @@
 # 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, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/31a7982a-0630-4de8-b399-76d40dbae1eb";
-      fsType = "btrfs";
-      options = [ "subvol=@" ];
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/31a7982a-0630-4de8-b399-76d40dbae1eb";
+    fsType = "btrfs";
+    options = [ "subvol=@" ];
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/1F02-0734";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/1F02-0734";
+    fsType = "vfat";
+  };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/12ac8ba7-3642-471d-af1d-66a806fe1a31"; }
-    ];
+  swapDevices = [ {
+    device = "/dev/disk/by-uuid/12ac8ba7-3642-471d-af1d-66a806fe1a31";
+  } ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -38,5 +46,7 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault
+      config.hardware.enableRedistributableFirmware;
 }
diff --git a/hosts/daisy/configuration.nix b/hosts/daisy/configuration.nix
@@ -1 +1,9 @@
-# ...
+{
+  networking.hostName = "daisy";
+  nixpkgs.hostPlatform = "x86_64-linux";
+  system.stateVersion = "23.11";
+
+  ##remove these
+  fileSystems."/".label = "x";
+  boot.loader.grub.devices = [ "nodev" ];
+}
diff --git a/hosts/default.nix b/hosts/default.nix
@@ -1,13 +1,33 @@
-{ config, inputs, lib, pkgs, username, stateVersion, vars, ... }:
+{
+  config,
+  inputs,
+  lib,
+  pkgs,
+  username,
+  stateVersion,
+  vars,
+  ...
+}:
 
 let
-  sharedConfig = import ../modules/default.nix { inherit config inputs lib pkgs username stateVersion vars; };
+  sharedConfig = import ../modules/default.nix {
+    inherit
+      config
+      inputs
+      lib
+      pkgs
+      username
+      stateVersion
+      vars
+    ;
+  };
 in
 {
-  imports = [
-    # Import the shared configuration
-    sharedConfig
-  ];
+  imports =
+    [
+      # Import the shared configuration
+      sharedConfig
+    ];
 
   ## Nix configuration
   nix = {
@@ -54,7 +74,10 @@ in
   ## Set the system locale
   i18n = {
     defaultLocale = "it_IT.UTF-8";
-    supportedLocales = [ "en_US.UTF-8/UTF-8" "it_IT.UTF-8/UTF-8" ];
+    supportedLocales = [
+      "en_US.UTF-8/UTF-8"
+      "it_IT.UTF-8/UTF-8"
+    ];
   };
 
   # Set the console keymap
@@ -100,7 +123,7 @@ in
       whatsapp-for-linux # WhatsApp client
 
       # Encryption
-      gnupg # OpenPGP implementation 
+      gnupg # OpenPGP implementation
 
       # Image Editing
       gimp-with-plugins # GNU Image Manipulation Program
@@ -147,9 +170,9 @@ in
 
   displayManager.sddm.enable = true; # Enable the SDDM display manager
 
-  layout.xserver.layout= "it"; # Set the keyboard layout
+  layout.xserver.layout = "it"; # Set the keyboard layout
 
-   ## Pinentry
-   programs.gnupg.agent.enable= true;
-   programs.gnupg.agent.pinentryFlavor= "qt";
+  ## Pinentry
+  programs.gnupg.agent.enable = true;
+  programs.gnupg.agent.pinentryFlavor = "qt";
 }
diff --git a/modules/default.nix b/modules/default.nix
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
@@ -0,0 +1 @@
+{ imports = [ ./plasma.nix ]; }