From 0aaf800eee5f51a78c5cda662de1834b1e02b351 Mon Sep 17 00:00:00 2001
From: Quentin Aristote <aristote@irif.fr>
Date: Mon, 13 Mar 2023 17:19:38 +0000
Subject: inital commit

---
 nixos/gui.nix                             |  6 +-----
 nixos/hardware/default.nix                |  9 ++++----
 nixos/hardware/hardware-configuration.nix | 36 +++++++++++++------------------
 nixos/networking.nix                      | 17 +--------------
 nixos/nix.nix                             | 10 ++++-----
 5 files changed, 27 insertions(+), 51 deletions(-)

(limited to 'nixos')

diff --git a/nixos/gui.nix b/nixos/gui.nix
index 0342747..0f3da65 100644
--- a/nixos/gui.nix
+++ b/nixos/gui.nix
@@ -1,7 +1,6 @@
 { config, pkgs, nixpkgs, ... }:
 
-let background-image = config.home-manager.users.qaristote.home.wallpaper;
-in {
+{
   personal.gui = {
     enable = true;
     xserver.enable = true;
@@ -11,7 +10,6 @@ in {
 
   services.xserver = {
     displayManager.lightdm = {
-      # background = background-image;
       greeters.gtk = {
         extraConfig = ''
           user-background = false
@@ -19,6 +17,4 @@ in {
       };
     };
   };
-
-  programs.steam.enable = true;
 }
diff --git a/nixos/hardware/default.nix b/nixos/hardware/default.nix
index 0e8dc15..9c0fa3a 100644
--- a/nixos/hardware/default.nix
+++ b/nixos/hardware/default.nix
@@ -5,13 +5,14 @@
     ./hardware-configuration.nix
 
     # Community-curated hardware configuration
-    nixos-hardware.nixosModules.dell-latitude-7490
+    nixos-hardware.nixosModules.common-cpu-intel
+    nixos-hardware.nixosModules.common-pc-laptop
     nixos-hardware.nixosModules.common-pc-ssd
   ];
 
   personal.hardware = {
     usb.enable = true;
-    disks.crypted = "/dev/disk/by-uuid/ba5dc9cd-3a73-4a01-880b-8720844307ae";
+    disks.crypted = "/dev/disk/by-uuid/10aefeb6-e479-43cb-9848-53bd788a77ee";
     firmwareNonFree.enable = true;
     keyboard.keyMap = "fr";
     backlights = {
@@ -21,6 +22,6 @@
     sound.enable = true;
   };
 
-  # faulty Intel CPU
-  boot.kernelParams = [ "i915.dc_enable=0" "intel_idle.max_cstate=1" ];
+  # https://wiki.archlinux.org/title/Dell_Latitude_7280
+  boot.kernelParams = [ "intel_idle.max_cstate=4" ];
 }
diff --git a/nixos/hardware/hardware-configuration.nix b/nixos/hardware/hardware-configuration.nix
index 77f7942..e264459 100644
--- a/nixos/hardware/hardware-configuration.nix
+++ b/nixos/hardware/hardware-configuration.nix
@@ -4,31 +4,28 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/f5809224-8478-474f-b25d-dde1ada37957";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/c08fcfed-a250-4cda-b1d7-9483ea7b3136";
+      fsType = "ext4";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/330B-45DE";
-    fsType = "vfat";
-  };
-
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/8a6efcde-2361-40d5-a341-62188c014618";
-    fsType = "ext4";
-  };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/5C58-7F16";
+      fsType = "vfat";
+    };
 
   swapDevices =
-    [{ device = "/dev/disk/by-uuid/0cf1b50c-670c-4dc6-bb91-fc45d6148028"; }];
+    [ { device = "/dev/disk/by-uuid/cc2b2f1e-1c41-4b3e-9432-81f75d40a892"; }
+    ];
 
   # 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
@@ -36,11 +33,8 @@
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
-  # networking.interfaces.tun0.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
 
-  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/nixos/networking.nix b/nixos/networking.nix
index be4f223..367349f 100644
--- a/nixos/networking.nix
+++ b/nixos/networking.nix
@@ -12,26 +12,11 @@
   };
 
   networking = {
-    hostName = "latitude-7490";
-    hosts = {
-      "10.3.141.1" = [ "raspberrypi.local" ];
-      "192.168.1.10" = [ "dionysos.local" ];
-      # "10.233.1.2" = [ "searx.aristote.fr" "quentin.aristote.fr" "aristote.fr" ];
-    };
+    hostName = "latitude-7280";
 
     interfaces = {
       enp0s31f6.useDHCP = true;
       wlp2s0.useDHCP = true;
     };
   };
-
-  # NAT
-  boot.kernel.sysctl = { "net.ipv4.ip_forward" = 1; };
-  networking = {
-    nat = {
-      enable = true;
-      internalInterfaces = [ "ve-+" ];
-      externalInterface = "tun0";
-    };
-  };
 }
diff --git a/nixos/nix.nix b/nixos/nix.nix
index 350510d..87b88ae 100644
--- a/nixos/nix.nix
+++ b/nixos/nix.nix
@@ -9,10 +9,10 @@
   };
 
   system.autoUpgrade.flags = pkgs.personal.lib.updateInputFlags [
-    "latitude-7490/home-manager"
-    "latitude-7490/my-nixpkgs"
-    "latitude-7490/nixos-hardware"
-    "latitude-7490/nixpkgs"
-    "latitude-7490/stylix"
+    "latitude-7280/home-manager"
+    "latitude-7280/my-nixpkgs"
+    "latitude-7280/nixos-hardware"
+    "latitude-7280/nixpkgs"
+    "latitude-7280/stylix"
   ];
 }
-- 
cgit v1.2.3