Merge pull request #3 from srid/p71

Add P71 configuration, and generalize for multiple computers

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "bbenoist.nix"
+    ]
+}

flake.nix

@@ -6,23 +6,29 @@
     home-manager.url = "github:nix-community/home-manager";
   };
 
-  outputs = { self, home-manager, nixpkgs }: {
-    nixosConfigurations.x1c7 = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      modules = [
-        # System configuration
-        ./configuration.nix
-        ./modules/passwordstore.nix
-        ./modules/protonmail-bridge.nix
+  outputs = { self, home-manager, nixpkgs }: 
+    let 
+      # Make configuration for any computer I use in my home office.
+      mkHomeMachine = configurationNix: nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          # System configuration
+          configurationNix
+          ./modules/passwordstore.nix
+          ./modules/protonmail-bridge.nix
+          ./modules/monitor-brightness.nix
 
-        # home-manager configuration
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.srid = import ./home.nix;
-        }
-      ];
+          # home-manager configuration
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.srid = import ./home.nix;
+          }
+        ];
+      };
+    in {
+      nixosConfigurations.p71 = mkHomeMachine ./p71/configuration.nix;
+      nixosConfigurations.x1c7 = mkHomeMachine ./x1c7/configuration.nix;
     };
-  };
 }

modules/monitor-brightness.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  # ddcutils requires i2c
+  boot.kernelModules = [ "i2c-dev" ];
+
+  environment.systemPackages = with pkgs; [
+    ddcutil
+  ];
+}

p71/configuration.nix

@@ -0,0 +1,99 @@
+{ config, pkgs, lib, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/4200ca92-3b3c-4a41-98d5-92bbc0a5597e";
+      fsType = "ext4";
+    };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/7C8B-3F49";
+      fsType = "vfat";
+    };
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/b03a08aa-1c9c-4674-b03b-ec59003306f5"; }
+    ];
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  # high-resolution display
+  hardware.video.hidpi.enable = lib.mkDefault true;
+
+
+  # Use the systemd-boot EFI boot loader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  nixpkgs.config.allowUnfree = true;
+  nix = {
+    package = pkgs.nixFlakes;
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
+  };
+
+  networking.hostName = "p71"; # Define your hostname.
+  networking.networkmanager.enable = true;
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Set your time zone.
+  time.timeZone = "America/New_York";
+
+  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+  # Per-interface useDHCP will be mandatory in the future, so this generated config
+  # replicates the default behaviour.
+  networking.useDHCP = false;
+  networking.interfaces.enp0s31f6.useDHCP = true;
+  networking.interfaces.wlp4s0.useDHCP = true;
+
+  # Enable the X11 windowing system.
+  services.xserver = {
+    enable = true;
+    videoDrivers = [ "nvidia" "intel" ];
+  };
+
+  # Enable the GNOME 3 Desktop Environment.
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome3.enable = true;
+  
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.srid = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user.
+  };
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+    gnome3.gnome-tweaks
+    brave
+    vscode
+    obsidian
+  ];
+
+  services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "20.09"; # Did you read the comment?
+
+}
+