From b1bc3c019eeaa1503c37035b08ebc91078d53920 Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Thu, 1 Jul 2021 23:54:54 +0200 Subject: [PATCH] Add froidmpa-laptop --- configs/home/cli.nix | 14 +-- configs/home/full.nix | 2 +- hosts/froidmpa-laptop/configuration.nix | 97 +++++++++++++++++++ .../hardware-configuration.nix | 32 ++++++ 4 files changed, 137 insertions(+), 8 deletions(-) create mode 100644 hosts/froidmpa-laptop/configuration.nix create mode 100644 hosts/froidmpa-laptop/hardware-configuration.nix diff --git a/configs/home/cli.nix b/configs/home/cli.nix index 6a8d0c3..41ad6a0 100644 --- a/configs/home/cli.nix +++ b/configs/home/cli.nix @@ -106,11 +106,11 @@ recursive = true; }; - home.file.".config/ranger/plugins" = { - source = builtins.fetchGit { - url = "git://github.com/alexanderjeurissen/ranger_devicons.git"; - rev = "68ffbffd086b0e9bb98c74705abe891b756b9e11"; - }; - recursive = true; - }; +# home.file.".config/ranger/plugins" = { +# source = builtins.fetchGit { +# url = "git://github.com/alexanderjeurissen/ranger_devicons.git"; +# rev = "68ffbffd086b0e9bb98c74705abe891b756b9e11"; +# }; +# recursive = true; +# }; } diff --git a/configs/home/full.nix b/configs/home/full.nix index cd680e4..52ae625 100644 --- a/configs/home/full.nix +++ b/configs/home/full.nix @@ -5,7 +5,7 @@ ./xmonad.nix ./gui.nix ./dev.nix - ./email.nix +# ./email.nix ]; home.packages = with pkgs; [ diff --git a/hosts/froidmpa-laptop/configuration.nix b/hosts/froidmpa-laptop/configuration.nix new file mode 100644 index 0000000..5ced5d9 --- /dev/null +++ b/hosts/froidmpa-laptop/configuration.nix @@ -0,0 +1,97 @@ +{ config, lib, pkgs, ... }: +{ + imports = [ + + ./hardware-configuration.nix + ../../configs/system.nix + ../../configs/network.nix + ../../configs/virtualisation.nix + ../../configs/games.nix + ]; + + # Required, otherwise the kernel freezes on boot + boot.kernelParams = [ "nomodeset" ]; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking = { + hostName = "froidmpa-laptop"; + networkmanager.enable = true; + }; + + networking.interfaces.enp2s0.useDHCP = true; + networking.interfaces.wlo1.useDHCP = true; + + console = { + font = "Lat2-Terminus16"; + keyMap = "fr"; + }; + + i18n = { + defaultLocale = "en_US.UTF-8"; + }; + + time.timeZone = "Europe/Amsterdam"; + + environment.systemPackages = with pkgs; [ + ]; + + hardware.bluetooth = { + enable = true; + # Enable A2DP Sink + settings = { + General = { + Enable = "Source,Sink,Media,Socket"; + }; + }; + }; + hardware.pulseaudio = { + enable = true; + + # Use full build to have Bluetooth support + package = pkgs.pulseaudioFull; + }; + services.blueman.enable = true; + + home-manager.users.froidmpa = {pkgs, config, ...}: { + imports = [ + ../../configs/home/full.nix + ]; + programs.git = { + enable = true; + userName = "Paul-Henri Froidmont"; + userEmail = "git.contact-57n2p@froidmont.org"; + }; + services.network-manager-applet.enable = true; + services.blueman-applet.enable = true; + services.grobi = { + enable = true; + executeAfter = ["${pkgs.systemd}/bin/systemctl --user restart stalonetray" "${pkgs.feh}/bin/feh --bg-fill ~/.wallpaper.png"]; + rules = [ + { + name = "Work HDMI"; + outputs_connected = [ "HDMI-1" ]; + configure_single = "HDMI-1"; + primary = true; + atomic = true; + } + { + name = "Work USBC"; + outputs_connected = [ "DP-1" ]; + configure_single = "DP-1"; + primary = true; + atomic = true; + } + { + name = "Fallback"; + configure_single = "eDP-1"; + } + ]; + }; + }; + # Enable touchpad support. + services.xserver.libinput.enable = true; + + system.stateVersion = "21.05"; # Did you read the comment? +} diff --git a/hosts/froidmpa-laptop/hardware-configuration.nix b/hosts/froidmpa-laptop/hardware-configuration.nix new file mode 100644 index 0000000..55fee45 --- /dev/null +++ b/hosts/froidmpa-laptop/hardware-configuration.nix @@ -0,0 +1,32 @@ +# 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 = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/a8abad9b-5615-4887-8431-3d80b78d073e"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/1e900b2e-daea-4558-b18f-3d3a5843de61"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/077C-758A"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/bb8fa9ef-9b8f-413d-913a-6c891649a954"; } + ]; + +}