opdavies/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style: reformat with nixpkgs-fmt

Browse source
This commit is contained in:
Oliver Davies 2023-05-03 22:19:59 +01:00
parent 1be69caabb
commit 4b459f08d4
15 changed files with 398 additions and 130 deletions

31
system/nixos/apollo/configuration.nix
View file

@ -5,13 +5,14 @@
{ config, pkgs, ... }:
let
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
home-manager = builtins.fetchTarball
"https://github.com/nix-community/home-manager/archive/master.tar.gz";
in
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
];
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
];
nix.settings.experimental-features = [ "nix-command" "flakes" ];
@ -97,10 +98,8 @@ in
];
};
environment.gnome.excludePackages = (with pkgs; [
gnome-photos
gnome-tour
]) ++ (with pkgs.gnome; [
environment.gnome.excludePackages = (with pkgs; [ gnome-photos gnome-tour ])
++ (with pkgs.gnome; [
atomix
cheese
evince
@ -120,10 +119,11 @@ in
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget
];
environment.systemPackages = with pkgs;
[
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget
];
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
@ -159,9 +159,8 @@ in
users.defaultUserShell = "/etc/profiles/per-user/opdavies/bin/zsh";
fonts.fonts = with pkgs; [
(nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" ]; })
];
fonts.fonts = with pkgs;
[ (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" ]; }) ];
services.cron = {
enable = true;

15
system/nixos/apollo/default.nix
View file

@ -4,15 +4,12 @@
imports = [
# ./configuration.nix
# ../../../home-manager/modules/common.nix
# ../../../home-manager/modules/git.nix
# ../../../home-manager/modules/home-manager.nix
# ../../../home-manager/modules/tmux.nix
# ../../../home-manager/modules/zsh.nix
# ../../../home-manager/modules/common.nix
# ../../../home-manager/modules/git.nix
# ../../../home-manager/modules/home-manager.nix
# ../../../home-manager/modules/tmux.nix
# ../../../home-manager/modules/zsh.nix
];
home.packages = with pkgs; [
docker
docker-compose
];
home.packages = with pkgs; [ docker docker-compose ];
}

29
system/nixos/apollo/hardware-configuration.nix
View file

@ -4,28 +4,26 @@
{ 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" "rtsx_pci_sdmmc" ];
boot.initrd.availableKernelModules =
[ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/62b28eee-5b67-41af-9fcf-95e8171e1897";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/62b28eee-5b67-41af-9fcf-95e8171e1897";
fsType = "ext4";
};
fileSystems."/boot/efi" =
{ device = "/dev/disk/by-uuid/378D-387D";
fsType = "vfat";
};
fileSystems."/boot/efi" = {
device = "/dev/disk/by-uuid/378D-387D";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/f95ef42e-09d9-4198-b8f3-2e22ea8c4f9e"; }
];
[{ device = "/dev/disk/by-uuid/f95ef42e-09d9-4198-b8f3-2e22ea8c4f9e"; }];
# 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,7 +34,8 @@
# networking.interfaces.wlp54s0.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;
hardware.bluetooth.enable = true;
}

13
system/nixos/nixedo/configuration.nix
View file

@ -4,13 +4,12 @@
{ config, pkgs, ... }:
let
nixpkgs = import ../../shared/nixpkgs.nix { };
in
{
let nixpkgs = import ../../shared/nixpkgs.nix { };
in {
nixpkgs = nixpkgs;
imports = [ # Include the results of the hardware scan.
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
];
@ -141,5 +140,9 @@ in
programs.zsh.histSize = 5000;
users.defaultUserShell = "/etc/profiles/per-user/opdavies/bin/zsh";
fonts.fonts = with pkgs;
[ (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" ]; }) ];
}