diff options
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/boot.nix | 4 | ||||
| -rw-r--r-- | nixos/default.nix | 5 | ||||
| -rw-r--r-- | nixos/environment.nix | 4 | ||||
| -rw-r--r-- | nixos/gui.nix | 4 | ||||
| -rw-r--r-- | nixos/hardware/default.nix | 9 | ||||
| -rw-r--r-- | nixos/hardware/hardware-configuration.nix | 23 | ||||
| -rw-r--r-- | nixos/networking.nix | 12 | ||||
| -rw-r--r-- | nixos/nix.nix | 4 | ||||
| -rw-r--r-- | nixos/users.nix | 4 |
9 files changed, 27 insertions, 42 deletions
diff --git a/nixos/boot.nix b/nixos/boot.nix index 8d3a148..83060bf 100644 --- a/nixos/boot.nix +++ b/nixos/boot.nix @@ -1,6 +1,4 @@ -{ config, pkgs, ... }: - -{ +{pkgs, ...}: { personal.boot = { grub.enable = true; efi.enable = true; diff --git a/nixos/default.nix b/nixos/default.nix index e6c7a88..f3c5cda 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,10 +1,7 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). - -{ lib, config, pkgs, ... }: - -{ +{...}: { imports = [ ./boot.nix ./environment.nix diff --git a/nixos/environment.nix b/nixos/environment.nix index a266ca0..2d27671 100644 --- a/nixos/environment.nix +++ b/nixos/environment.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{...}: { personal.environment = { enable = true; locale.enable = true; diff --git a/nixos/gui.nix b/nixos/gui.nix index 1252ecf..01be46e 100644 --- a/nixos/gui.nix +++ b/nixos/gui.nix @@ -1,6 +1,4 @@ -{ config, pkgs, nixpkgs, ... }: - -{ +{...}: { personal.gui = { enable = true; xserver.enable = true; diff --git a/nixos/hardware/default.nix b/nixos/hardware/default.nix index 0e8dc15..0405ff4 100644 --- a/nixos/hardware/default.nix +++ b/nixos/hardware/default.nix @@ -1,7 +1,6 @@ -{ nixos-hardware, ... }: - -{ - imports = [ # Include the results of the hardware scan. +{nixos-hardware, ...}: { + imports = [ + # Include the results of the hardware scan. ./hardware-configuration.nix # Community-curated hardware configuration @@ -22,5 +21,5 @@ }; # faulty Intel CPU - boot.kernelParams = [ "i915.dc_enable=0" "intel_idle.max_cstate=1" ]; + boot.kernelParams = ["i915.dc_enable=0" "intel_idle.max_cstate=1"]; } diff --git a/nixos/hardware/hardware-configuration.nix b/nixos/hardware/hardware-configuration.nix index 77f7942..e876888 100644 --- a/nixos/hardware/hardware-configuration.nix +++ b/nixos/hardware/hardware-configuration.nix @@ -1,16 +1,18 @@ # 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, ... }: - { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot.initrd.availableKernelModules = - [ "xhci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + config, + lib, + modulesPath, + ... +}: { + imports = [(modulesPath + "/installer/scan/not-detected.nix")]; + + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "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"; @@ -27,8 +29,7 @@ fsType = "ext4"; }; - swapDevices = - [{ device = "/dev/disk/by-uuid/0cf1b50c-670c-4dc6-bb91-fc45d6148028"; }]; + swapDevices = [{device = "/dev/disk/by-uuid/0cf1b50c-670c-4dc6-bb91-fc45d6148028";}]; # 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 diff --git a/nixos/networking.nix b/nixos/networking.nix index 7620b3d..66b453d 100644 --- a/nixos/networking.nix +++ b/nixos/networking.nix @@ -1,6 +1,4 @@ -{ config, pkgs, ... }: - -{ +{...}: { personal.networking = { enable = true; bluetooth.enable = true; @@ -14,8 +12,8 @@ networking = { hostName = "latitude-7490"; hosts = { - "10.3.141.1" = [ "raspberrypi.local" ]; - "192.168.1.10" = [ "dionysos.local" ]; + "10.3.141.1" = ["raspberrypi.local"]; + "192.168.1.10" = ["dionysos.local"]; # "10.233.1.2" = [ "searx.aristote.fr" "quentin.aristote.fr" "aristote.fr" ]; }; @@ -26,11 +24,11 @@ }; # NAT - boot.kernel.sysctl = { "net.ipv4.ip_forward" = 1; }; + boot.kernel.sysctl = {"net.ipv4.ip_forward" = 1;}; networking = { nat = { enable = true; - internalInterfaces = [ "ve-+" ]; + internalInterfaces = ["ve-+"]; externalInterface = "wlp2s0"; }; }; diff --git a/nixos/nix.nix b/nixos/nix.nix index bf251a3..5d114df 100644 --- a/nixos/nix.nix +++ b/nixos/nix.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{pkgs, ...}: { personal.nix = { enable = true; autoUpgrade = true; diff --git a/nixos/users.nix b/nixos/users.nix index c3185cf..dd5e5f4 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -1,6 +1,4 @@ -{ config, ... }: - -{ +{config, ...}: { personal.user = { enable = true; name = "qaristote"; |