summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock12
-rw-r--r--flake.nix2
-rw-r--r--home/default.nix4
-rw-r--r--nixos/gui.nix6
-rw-r--r--nixos/hardware/default.nix9
-rw-r--r--nixos/hardware/hardware-configuration.nix36
-rw-r--r--nixos/networking.nix17
-rw-r--r--nixos/nix.nix10
8 files changed, 35 insertions, 61 deletions
diff --git a/flake.lock b/flake.lock
index 166cf65..12b5de9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -79,11 +79,11 @@
"utils": "utils"
},
"locked": {
- "lastModified": 1678662458,
- "narHash": "sha256-BW+C3Pln6LVrGMVEN2Py0cY+a+VEEddhW86cNj8GB3E=",
+ "lastModified": 1678714646,
+ "narHash": "sha256-L7u4ua/p3cTptqlTVwT1OaQMGkexULjQhKmUxRUYmMQ=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "46f637bd801b4d6d2afa06e13b6776e9fbfb0a79",
+ "rev": "7fe539dfbba8a158a455b54697d1bd7e97b37c60",
"type": "github"
},
"original": {
@@ -179,11 +179,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1678631509,
- "narHash": "sha256-+eyd+CJUAZbk0KqqhyJtai+BmiM2/K54xE91fI2eGD0=",
+ "lastModified": 1678693419,
+ "narHash": "sha256-bbSv5yqZAW6dz+3f3f3pOUZbxpPN+3OgCljgn7P+nnQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b38db2c901b30a37d345751f4f6418d416e7e46e",
+ "rev": "8e3fad82be64c06fbfb9fd43993aec9ef4623936",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index b46f4a0..70b4c2f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,7 +14,7 @@
nixosModules =
[ overlays-module my-nixpkgs.nixosModules.personal ./nixos ];
in {
- nixosConfigurations.latitude-7490 = nixpkgs.lib.nixosSystem {
+ nixosConfigurations.latitude-7280 = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = { inherit nixos-hardware home-manager homeModules stylix; };
modules = nixosModules;
diff --git a/home/default.nix b/home/default.nix
index 7695a82..a591630 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -4,15 +4,13 @@
personal = {
profiles = {
dev = true;
- multimedia = true;
social = true;
syncing = true;
};
identities = {
- personal = true;
work = true;
};
};
- accounts.email.accounts.personal.primary = true;
+ accounts.email.accounts.work.primary = true;
}
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"
];
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-19 00:39:36 +0000