misc: formatting + updates that weren't commited properly before
This commit is contained in:
Pierre Martin
@@ -5,13 +5,12 @@
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./framework.nix
|
||||
<home-manager/nixos>
|
||||
];
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./framework.nix
|
||||
<home-manager/nixos>
|
||||
];
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
@@ -30,25 +29,24 @@
|
||||
|
||||
# Enable networking
|
||||
networking.networkmanager.enable = true;
|
||||
networking.extraHosts = "
|
||||
";
|
||||
networking.extraHosts = "";
|
||||
|
||||
# Set your time zone.
|
||||
time.timeZone = "Europe/Paris";
|
||||
|
||||
# Select internationalisation properties.
|
||||
i18n.defaultLocale = "en_US.utf8";
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
|
||||
i18n.extraLocaleSettings = {
|
||||
LC_ADDRESS = "fr_FR.utf8";
|
||||
LC_IDENTIFICATION = "fr_FR.utf8";
|
||||
LC_MEASUREMENT = "fr_FR.utf8";
|
||||
LC_MONETARY = "fr_FR.utf8";
|
||||
LC_NAME = "fr_FR.utf8";
|
||||
LC_NUMERIC = "fr_FR.utf8";
|
||||
LC_PAPER = "fr_FR.utf8";
|
||||
LC_TELEPHONE = "fr_FR.utf8";
|
||||
LC_TIME = "fr_FR.utf8";
|
||||
LC_ADDRESS = "fr_FR.UTF-8";
|
||||
LC_IDENTIFICATION = "fr_FR.UTF-8";
|
||||
LC_MEASUREMENT = "fr_FR.UTF-8";
|
||||
LC_MONETARY = "fr_FR.UTF-8";
|
||||
LC_NAME = "fr_FR.UTF-8";
|
||||
LC_NUMERIC = "fr_FR.UTF-8";
|
||||
LC_PAPER = "fr_FR.UTF-8";
|
||||
LC_TELEPHONE = "fr_FR.UTF-8";
|
||||
LC_TIME = "fr_FR.UTF-8";
|
||||
};
|
||||
|
||||
# Configure keymap in X11
|
||||
@@ -59,15 +57,9 @@
|
||||
variant = "bepo";
|
||||
};
|
||||
|
||||
windowManager = {
|
||||
i3 = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
services.displayManager = {
|
||||
defaultSession = "none+i3";
|
||||
windowManager = { i3 = { enable = true; }; };
|
||||
};
|
||||
services.displayManager = { defaultSession = "none+i3"; };
|
||||
|
||||
# Configure console keymap
|
||||
console.keyMap = "fr";
|
||||
@@ -89,7 +81,7 @@
|
||||
|
||||
# Basics
|
||||
docker
|
||||
gitAndTools.gitFull
|
||||
gitFull
|
||||
vim
|
||||
|
||||
# Sound
|
||||
@@ -108,25 +100,36 @@
|
||||
# enable = true;
|
||||
# enableSSHSupport = true;
|
||||
# };
|
||||
programs.zsh.enable = true; # see https://github.com/NixOS/nixpkgs/issues/20548#issuecomment-261965667
|
||||
programs.zsh.enable =
|
||||
true; # see https://github.com/NixOS/nixpkgs/issues/20548#issuecomment-261965667
|
||||
programs.light.enable = true;
|
||||
|
||||
programs.nix-ld = {
|
||||
enable = true;
|
||||
libraries = with pkgs; [ fnm stdenv.cc.cc.lib ];
|
||||
};
|
||||
|
||||
# List services that you want to enable:
|
||||
services.nscd.enable = true;
|
||||
services.tlp.enable = true;
|
||||
services.upower.enable = true; # keyboard backlight
|
||||
services.gnome.at-spi2-core.enable = true; # see https://github.com/NixOS/nixpkgs/pull/49636/files
|
||||
services.gnome.gnome-keyring.enable = true; # see https://nixos.wiki/wiki/Visual_Studio_Code#Error_after_Sign_On
|
||||
services.gnome.at-spi2-core.enable =
|
||||
true; # see https://github.com/NixOS/nixpkgs/pull/49636/files
|
||||
services.gnome.gnome-keyring.enable =
|
||||
true; # see https://nixos.wiki/wiki/Visual_Studio_Code#Error_after_Sign_On
|
||||
services.blueman.enable = true;
|
||||
services.udisks2.enable = true;
|
||||
services.resolved.enable = true;
|
||||
services.gvfs.enable =
|
||||
true; # to view MTP devices in file manager - https://www.perplexity.ai/search/how-to-browse-files-from-bus-0-QWBoYG1gRLu3uMRqFSzw9A
|
||||
|
||||
# Enable the OpenSSH daemon.
|
||||
# services.openssh.enable = true;
|
||||
|
||||
# Open ports in the firewall.
|
||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||
# Ports: 9003 - Xdebug
|
||||
networking.firewall.allowedTCPPorts = [ 9003 ];
|
||||
networking.firewall.allowedUDPPorts = [ 9003 ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
# https://github.com/nix-community/nix-direnv/
|
||||
@@ -134,6 +137,7 @@
|
||||
keep-outputs = true
|
||||
keep-derivations = true
|
||||
'';
|
||||
nix.settings.extra-experimental-features = [ "nix-command" "flakes" ];
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#
|
||||
# NixOS Configuration for Framework Laptop
|
||||
# Source: https://gist.github.com/digitalknk/ee0379c1cd4597463c31a323ea5882a5
|
||||
# Alt: https://github.com/NixOS/nixos-hardware/blob/master/framework/default.nix
|
||||
@@ -17,8 +16,7 @@
|
||||
"layout=bls" # Read $KERNEL_INSTALL_LAYOUT from /etc/machine-info. Please move it to the layout= setting of /etc/kernel/install.conf.
|
||||
];
|
||||
|
||||
# Use latest kernel version because on 5.15 screen is not detected properly (and external monitor doesn't work either)
|
||||
boot.kernelPackages = pkgs.linuxPackages_6_1; # see https://github.com/NixOS/nixpkgs/issues/183955#issuecomment-1210468614
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
# prevent "/boot/efi No space left on device" errors - see https://github.com/NixOS/nixpkgs/issues/23926
|
||||
boot.loader.grub.configurationLimit = 10;
|
||||
@@ -47,12 +45,11 @@
|
||||
|
||||
# Display things like a boss
|
||||
## Make it work
|
||||
hardware.opengl.enable = true;
|
||||
hardware.opengl.extraPackages = with pkgs; [
|
||||
mesa.drivers # was mesa_drivers before 27th september 2022
|
||||
vaapiIntel
|
||||
vaapiVdpau
|
||||
libvdpau-va-gl
|
||||
hardware.graphics.enable = true;
|
||||
hardware.graphics.extraPackages = with pkgs; [
|
||||
mesa
|
||||
intel-vaapi-driver # used to be vaapiIntel
|
||||
libva-vdpau-driver # used to be vaapiVdpau
|
||||
intel-media-driver
|
||||
];
|
||||
## Make it nice (https://nixos.wiki/wiki/Xorg && https://wiki.archlinux.org/title/Framework_Laptop#HiDPI_settings)
|
||||
@@ -64,9 +61,9 @@
|
||||
services.xserver.dpi = 130;
|
||||
|
||||
environment.variables = {
|
||||
GDK_SCALE = "1.5";
|
||||
GDK_SCALE = "1.3";
|
||||
GDK_DPI_SCALE = "0.77"; # 1/1.3
|
||||
_JAVA_OPTIONS = "-Dsun.java2d.uiScale=1.5";
|
||||
_JAVA_OPTIONS = "-Dsun.java2d.uiScale=1.3";
|
||||
};
|
||||
|
||||
# Bring in some audio
|
||||
|
||||
@@ -4,27 +4,23 @@
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.availableKernelModules =
|
||||
[ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/db660732-f520-4e68-9141-b0899f221e82";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/db660732-f520-4e68-9141-b0899f221e82";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot/efi" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/D7D6-B4C6";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fileSystems."/boot/efi" = {
|
||||
device = "/dev/disk/by-uuid/D7D6-B4C6";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[{ device = "/dev/disk/by-uuid/da431bdf-cec4-4928-b44b-e6d2c3419063"; }];
|
||||
@@ -37,5 +33,6 @@
|
||||
# networking.interfaces.wlp166s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.cpu.intel.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user