christoph/flake-nixinator
1
Fork 0
Code Activity

reformat with nixfmt

Browse Source
This commit is contained in:
Christoph Urlacher
2022-07-03 22:23:06 +02:00
parent 0b790d2ee1
commit ddd7cce61d
6 changed files with 94 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
flake.nix
View File

@ -38,11 +38,10 @@
nur = inputs.nur.overlay;
emacs = inputs.emacs-overlay.overlay;
};
in
# The rec expression turns a basic set into a set where self-referencing is possible.
# It is a shorthand for recursive and allows to use the values defined in this set from its own scope.
rec {
in rec {
# System configurations + HomeManager module
# Accessible via 'nixos-rebuild'
@ -68,8 +67,10 @@
# HomeManager
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true; # Use systems pkgs, disables nixpkgs.* options in home.nix
home-manager.useUserPackages = true; # Enable installing packages through users.christoph.packages
home-manager.useGlobalPkgs =
true; # Use systems pkgs, disables nixpkgs.* options in home.nix
home-manager.useUserPackages =
true; # Enable installing packages through users.christoph.packages
home-manager.users.christoph = import ./home/home.nix;
# Make our overlays available in home.nix

2
home/home.nix
View File

@ -99,7 +99,7 @@ rec {
};
# sessionPath
# sessionPath = [];
pointerCursor.package = pkgs.numix-cursor-theme;
pointerCursor.gtk.enable = true;

9
home/modules/emacs.nix
View File

@ -36,9 +36,8 @@ in {
# What home packages should be enabled
home.packages = with pkgs; [
# NOTE: I have problems with emacsPgtkNativeComp/emacsPgtk and also emacs28NativeComp GUI
((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [
epkgs.vterm
]))
((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages
(epkgs: [ epkgs.vterm ]))
binutils
zstd
@ -66,9 +65,7 @@ in {
# enable = true;
# };
home.sessionPath = [
"/home/${config.home.username}/.emacs.d/bin"
];
home.sessionPath = [ "/home/${config.home.username}/.emacs.d/bin" ];
# We tell HomeManager where the config files belong
# home.file.".config/doom" = {

4
nixos/cachix.nix
View File

@ -1,4 +1,3 @@
# WARN: this file will get overwritten by $ cachix use <name>
{ pkgs, lib, ... }:
@ -6,7 +5,8 @@ let
folder = ./cachix;
toImport = name: value: folder + ("/" + name);
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
imports = lib.mapAttrsToList toImport
(lib.filterAttrs filterCaches (builtins.readDir folder));
in {
inherit imports;
nix.binaryCaches = [ "https://cache.nixos.org/" ];

32
nixos/configuration.nix
View File

@ -5,8 +5,7 @@
{ inputs, lib, config, pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
imports = [ # Include the results of the hardware scan.
./hardware-configuration.nix
# NixCommunity binary cache
@ -72,7 +71,8 @@
enableAllFirmware = true;
enableRedistributableFirmware = true; # Also enables microcode update
nvidia.modesetting.enable = true; # Not officially supported by NVidia but needed for wayland
nvidia.modesetting.enable =
true; # Not officially supported by NVidia but needed for wayland
opengl.enable = true;
opengl.driSupport = true;
opengl.driSupport32Bit = true;
@ -99,10 +99,7 @@
};
# https://github.com/NixOS/nixpkgs/issues/179486
i18n.supportedLocales = [
"en_US.UTF-8/UTF-8"
"de_DE.UTF-8/UTF-8"
];
i18n.supportedLocales = [ "en_US.UTF-8/UTF-8" "de_DE.UTF-8/UTF-8" ];
# TODO: Other ports (tcp/udp/ssh...)?
# Open ports in the firewall.
@ -190,7 +187,8 @@
fonts = {
enableDefaultFonts = true; # Some default fonts for unicode coverage
fontDir.enable = true; # Puts fonts to /run/current-system/sw/share/X11/fonts
fontDir.enable =
true; # Puts fonts to /run/current-system/sw/share/X11/fonts
# Font packages go here, don't do this with HomeManager as I need the fonts in the fontdir for flatpak apps
fonts = with pkgs; [
@ -224,7 +222,16 @@
users.users.christoph = {
isNormalUser = true;
description = "Christoph";
extraGroups = [ "networkmanager" "wheel" "audio" "realtime" "docker" "adbusers" "scanner" "lp" ];
extraGroups = [
"networkmanager"
"wheel"
"audio"
"realtime"
"docker"
"adbusers"
"scanner"
"lp"
];
shell = pkgs.fish; # TODO: Is this needed if programs.fish.enable = true?
# We do this with HomeManager
packages = with pkgs; [ ];
@ -277,7 +284,8 @@
acpid.enable = true;
dbus.enable = true;
flatpak.enable = true; # Not quite the nix style but useful for bottles/proprietary stuff
flatpak.enable =
true; # Not quite the nix style but useful for bottles/proprietary stuff
fstrim.enable = true;
fwupd.enable = true;
locate.enable = true; # Periodically update index
@ -290,9 +298,7 @@
autoPrune.enable = true;
};
virtualisation.libvirtd = {
enable = true;
};
virtualisation.libvirtd = { enable = true; };
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions

10
nixos/hardware-configuration.nix
View File

@ -4,11 +4,10 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
@ -50,7 +49,8 @@
# networking.interfaces.wlp3s0.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;
# high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true;
}