cleanup: nixfmt everything

This commit is contained in:
Noa Aarts 2024-10-28 11:04:52 +01:00
parent a784ba021f
commit a4c5e7aca8
Signed by: noa
GPG key ID: 1850932741EFF672
22 changed files with 317 additions and 224 deletions

View file

@ -2,24 +2,28 @@
# your system.Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, inputs, nix-colors, lib, ... }:
{
imports =
[
# Include the results of the hardware scan.
./hardware-configuration.nix
../../modules/games/steam.nix
../../modules/plasma
config,
pkgs,
inputs,
nix-colors,
lib,
...
}:
{
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
../../modules/games/steam.nix
../../modules/plasma
../../common
./restic.nix
];
../../common
./restic.nix
];
age.identityPaths = [ "${config.users.users.noa.home}/.ssh/id_ed25519" ];
hardware = {
bluetooth = {
enable = true;
@ -47,7 +51,10 @@
sandbox = true;
show-trace = true;
system-features = [ "nixos-test" "recursive-nix" ];
system-features = [
"nixos-test"
"recursive-nix"
];
sandbox-paths = [ "/bin/sh=${pkgs.busybox-sandbox-shell.out}/bin/busybox" ];
};
@ -69,7 +76,6 @@
# Set your time zone.
time.timeZone = "Europe/Amsterdam";
# Configure console keymap
console.keyMap = "us-acentos";
@ -81,7 +87,13 @@
noa = {
isNormalUser = true;
description = "Noa Aarts";
extraGroups = [ "networkmanager" "wheel" "docker" "wireshark" "dialout" ];
extraGroups = [
"networkmanager"
"wheel"
"docker"
"wireshark"
"dialout"
];
hashedPassword = "$6$rounds=512400$Zip3xoK2zcoR4qEL$N13YTHO5tpWfx2nKb1sye.ZPwfoRtMQ5f3YrMZqKzzoFoSSHHJ.l5ulCEa9HygFxZmBtPnwlseFEtl8ERnwF50";
openssh.authorizedKeys.keys = (import ../../common/ssh-keys.nix);
};
@ -102,7 +114,6 @@
restic
];
# TODO: find list of fonts to install
fonts.packages = with pkgs; [
font-awesome
@ -150,7 +161,6 @@
security.rtkit.enable = true;
boot = rec {
kernelPackages = pkgs.linuxPackages_latest;
extraModulePackages = with kernelPackages; [
v4l2loopback
@ -341,7 +351,6 @@
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave

View file

@ -1,36 +1,45 @@
# 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, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[
(modulesPath + "/installer/scan/not-detected.nix")
];
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules = [
"nvme"
"ahci"
"xhci_pci"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{
device = "/dev/disk/by-uuid/263716dd-52cb-4a91-ba0b-e39e492ed0e5";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/263716dd-52cb-4a91-ba0b-e39e492ed0e5";
fsType = "ext4";
};
fileSystems."/boot" =
{
device = "/dev/disk/by-uuid/B08E-916D";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/B08E-916D";
fsType = "vfat";
};
fileSystems."/home/noa/Pictures/library" =
{
device = "/dev/disk/by-uuid/93a74173-8719-4be2-86b3-dc80588b9cf8";
fsType = "ext4";
};
fileSystems."/home/noa/Pictures/library" = {
device = "/dev/disk/by-uuid/93a74173-8719-4be2-86b3-dc80588b9cf8";
fsType = "ext4";
};
swapDevices = [ ];

View file

@ -1,15 +1,20 @@
{ config, pkgs, inputs, lib, ... }:
{
config,
pkgs,
inputs,
lib,
...
}:
{
imports =
[
../../modules/hyprland.nix
../../modules/games
../../modules/applications
../../common/nvim/nvim.nix
../../common/discord/discord.nix
../../common/spotify.nix
];
imports = [
../../modules/hyprland.nix
../../modules/games
../../modules/applications
../../common/nvim/nvim.nix
../../common/discord/discord.nix
../../common/spotify.nix
];
# Home Manager needs a bit of information about you and the paths it should
# manage.
home.username = "noa";
@ -93,13 +98,12 @@
yubikey-manager-qt
yubico-piv-tool
libreoffice-qt6
libreoffice-qt6
inputs.flurry.packages.${system}.flurry
inputs.tsunami.packages.${system}.tsunami
];
# Home Manager is pretty good at managing dotfiles. The primary way to manage
# plain files is through 'home.file'.
home.file = {
@ -132,7 +136,6 @@
# /etc/profiles/per-user/noa/etc/profile.d/hm-session-vars.sh
#
home.sessionVariables = {
EDITOR = "nvim";
TERM = "kitty";
@ -153,8 +156,6 @@
};
};
dconf = {
enable = true;
settings = {
@ -198,14 +199,15 @@
x11.enable = true;
name = name;
size = 32;
package =
pkgs.runCommand "moveUp" { } ''
mkdir -p $out/share/icons
ln -s ${pkgs.fetchzip {
package = pkgs.runCommand "moveUp" { } ''
mkdir -p $out/share/icons
ln -s ${
pkgs.fetchzip {
url = url;
hash = hash;
}} $out/share/icons/${name}
'';
}
} $out/share/icons/${name}
'';
};
in
getFrom

View file

@ -1,4 +1,5 @@
{ config, ... }: {
{ config, ... }:
{
# configure agenix secrets
age.secrets = {
"restic/env".file = ../../secrets/restic/env.age;
@ -31,4 +32,3 @@
};
};
}

View file

@ -1,4 +1,9 @@
{ config, pkgs, inputs, ... }:
{
config,
pkgs,
inputs,
...
}:
{
imports = [
@ -34,7 +39,6 @@
lsd
];
modules = {
apps = {
enable = true;