mirror of
https://github.com/ItsDrike/nixdots
synced 2025-06-29 03:10:43 +00:00
Run alejandra
This commit is contained in:
parent
286920def4
commit
c00134da1c
152 changed files with 827 additions and 721 deletions
|
@ -1,5 +1,4 @@
|
|||
{ inputs, ... }:
|
||||
let
|
||||
{inputs, ...}: let
|
||||
inherit (inputs) self;
|
||||
inherit (inputs.nixpkgs) lib;
|
||||
|
||||
|
@ -9,27 +8,30 @@ let
|
|||
../home
|
||||
../options
|
||||
];
|
||||
in
|
||||
{
|
||||
in {
|
||||
herugrim = lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit lib inputs self; };
|
||||
modules = [
|
||||
./herugrim
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
inputs.impermanence.nixosModules.impermanence
|
||||
inputs.lanzaboote.nixosModules.lanzaboote
|
||||
] ++ shared;
|
||||
specialArgs = {inherit lib inputs self;};
|
||||
modules =
|
||||
[
|
||||
./herugrim
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
inputs.impermanence.nixosModules.impermanence
|
||||
inputs.lanzaboote.nixosModules.lanzaboote
|
||||
]
|
||||
++ shared;
|
||||
};
|
||||
|
||||
voyager = lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit lib inputs self; };
|
||||
modules = [
|
||||
./voyager
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
inputs.impermanence.nixosModules.impermanence
|
||||
inputs.lanzaboote.nixosModules.lanzaboote
|
||||
] ++ shared;
|
||||
specialArgs = {inherit lib inputs self;};
|
||||
modules =
|
||||
[
|
||||
./voyager
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
inputs.impermanence.nixosModules.impermanence
|
||||
inputs.lanzaboote.nixosModules.lanzaboote
|
||||
]
|
||||
++ shared;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,10 +1,13 @@
|
|||
{ lib, pkgs, ... }:
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
boot.supportedFilesystems = [ "btrfs" ];
|
||||
boot.supportedFilesystems = ["btrfs"];
|
||||
|
||||
# My flake disables this by default for security reasons. However,
|
||||
# with an encrypted setup, which requires entering password before
|
||||
|
@ -42,7 +45,7 @@
|
|||
# Configure automatic root subvolume wiping on boot from initrd
|
||||
autoWipeBtrfs = {
|
||||
enable = true;
|
||||
devices."/dev/disk/by-label/NIXROOT".subvolumes = [ "root" ];
|
||||
devices."/dev/disk/by-label/NIXROOT".subvolumes = ["root"];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -1,60 +1,64 @@
|
|||
# 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")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
boot.initrd.luks.devices."cryptfs".device = "/dev/disk/by-label/NIXCRYPTROOT";
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-label/NIXROOT";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" "noatime" "compress=zstd:3" ];
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/NIXROOT";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=root" "noatime" "compress=zstd:3"];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-label/NIXROOT";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=home" "noatime" "compress=zstd:3" ];
|
||||
};
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-label/NIXROOT";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=home" "noatime" "compress=zstd:3"];
|
||||
};
|
||||
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-label/NIXROOT";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nix" "noatime" "compress=zstd:3" ];
|
||||
};
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-label/NIXROOT";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=nix" "noatime" "compress=zstd:3"];
|
||||
};
|
||||
|
||||
fileSystems."/var/log" =
|
||||
{ device = "/dev/disk/by-label/NIXROOT";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=log" "noatime" "compress=zstd:3" ];
|
||||
neededForBoot = true;
|
||||
};
|
||||
fileSystems."/var/log" = {
|
||||
device = "/dev/disk/by-label/NIXROOT";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=log" "noatime" "compress=zstd:3"];
|
||||
neededForBoot = true;
|
||||
};
|
||||
|
||||
fileSystems."/persist" =
|
||||
{ device = "/dev/disk/by-label/NIXROOT";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=persist" "noatime" "compress=zstd:3" ];
|
||||
neededForBoot = true;
|
||||
};
|
||||
fileSystems."/persist" = {
|
||||
device = "/dev/disk/by-label/NIXROOT";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=persist" "noatime" "compress=zstd:3"];
|
||||
neededForBoot = true;
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-label/NIXBOOT";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-label/NIXBOOT";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-label/SWAP"; }
|
||||
];
|
||||
swapDevices = [
|
||||
{device = "/dev/disk/by-label/SWAP";}
|
||||
];
|
||||
|
||||
# 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
|
||||
|
|
|
@ -1,16 +1,18 @@
|
|||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page, on
|
||||
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
boot.supportedFilesystems = [ "btrfs" ];
|
||||
boot.supportedFilesystems = ["btrfs"];
|
||||
hardware.enableAllFirmware = true;
|
||||
|
||||
# My flake disables this by default for security reasons. However, with an encrypted setup,
|
||||
|
@ -120,7 +122,7 @@
|
|||
# Configure automatic root subvolume wiping on boot from initrd
|
||||
autoWipeBtrfs = {
|
||||
enable = true;
|
||||
devices."/dev/disk/by-label/NIXOS-FS".subvolumes = [ "root" ];
|
||||
devices."/dev/disk/by-label/NIXOS-FS".subvolumes = ["root"];
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -133,7 +135,7 @@
|
|||
device = {
|
||||
roles = {
|
||||
type = "laptop";
|
||||
virtual-machine = false;
|
||||
virtual-machine = false;
|
||||
};
|
||||
cpu.type = "amd";
|
||||
gpu.type = "amd";
|
||||
|
@ -144,7 +146,7 @@
|
|||
security = {
|
||||
auditd = {
|
||||
enable = true;
|
||||
autoPrune.enable = true;
|
||||
autoPrune.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -161,28 +163,28 @@
|
|||
|
||||
git = {
|
||||
userName = "ItsDrike";
|
||||
userEmail = "itsdrike@protonmail.com";
|
||||
signing = {
|
||||
enable = true;
|
||||
userEmail = "itsdrike@protonmail.com";
|
||||
signing = {
|
||||
enable = true;
|
||||
key = "FA2745890B7048C0";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
wms.hyprland = {
|
||||
enable = true;
|
||||
monitor = [
|
||||
# Primary / laptop display
|
||||
"eDP-1, 1920x1200@60, 0x1080, 1"
|
||||
monitor = [
|
||||
# Primary / laptop display
|
||||
"eDP-1, 1920x1200@60, 0x1080, 1"
|
||||
|
||||
# HDMI-A-1 above primary
|
||||
"HDMI-A-1, 1920x1080@60, 0x0, 1"
|
||||
"HDMI-A-1, 1920x1080@60, 0x0, 1"
|
||||
|
||||
# HDMI-A-1 left to primary
|
||||
#"HDMI-A-1, 1920x1080@60, 1920x1080, 1"
|
||||
# HDMI-A-1 left to primary
|
||||
#"HDMI-A-1, 1920x1080@60, 1920x1080, 1"
|
||||
|
||||
# Mirror the primary (laptop) monitor on externals
|
||||
", preferred, auto, 1, mirror, eDP-1"
|
||||
];
|
||||
# Mirror the primary (laptop) monitor on externals
|
||||
", preferred, auto, 1, mirror, eDP-1"
|
||||
];
|
||||
};
|
||||
|
||||
programs = {
|
||||
|
@ -205,7 +207,7 @@
|
|||
};
|
||||
webcord.enable = true;
|
||||
mpv.enable = true;
|
||||
nomacs.enable = true; # TODO: probably disable
|
||||
nomacs.enable = true; # TODO: probably disable
|
||||
qimgv.enable = true;
|
||||
qbittorrent.enable = true;
|
||||
obs.enable = true;
|
||||
|
|
|
@ -1,60 +1,64 @@
|
|||
# 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")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
boot.initrd.luks.devices."cryptfs".device = "/dev/disk/by-label/NIXOS-CRYPTFS";
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-label/NIXOS-FS";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" "noatime" "compress=zstd:3" ];
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/NIXOS-FS";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=root" "noatime" "compress=zstd:3"];
|
||||
};
|
||||
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-label/NIXOS-FS";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nix" "noatime" "compress=zstd:3" ];
|
||||
};
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-label/NIXOS-FS";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=nix" "noatime" "compress=zstd:3"];
|
||||
};
|
||||
|
||||
fileSystems."/persist" =
|
||||
{ device = "/dev/disk/by-label/NIXOS-FS";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=persist" "noatime" "compress=zstd:3" ];
|
||||
neededForBoot = true;
|
||||
};
|
||||
fileSystems."/persist" = {
|
||||
device = "/dev/disk/by-label/NIXOS-FS";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=persist" "noatime" "compress=zstd:3"];
|
||||
neededForBoot = true;
|
||||
};
|
||||
|
||||
fileSystems."/data" =
|
||||
{ device = "/dev/disk/by-label/NIXOS-FS";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=data" "noatime" "compress=zstd:3" ];
|
||||
};
|
||||
fileSystems."/data" = {
|
||||
device = "/dev/disk/by-label/NIXOS-FS";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=data" "noatime" "compress=zstd:3"];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-label/EFI";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-label/EFI";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0022" "dmask=0022"];
|
||||
};
|
||||
|
||||
fileSystems."/.btrfs" =
|
||||
{ device = "/dev/disk/by-label/NIXOS-FS";
|
||||
fsType = "btrfs";
|
||||
options = [ "noatime" "compress=zstd:3" ];
|
||||
};
|
||||
fileSystems."/.btrfs" = {
|
||||
device = "/dev/disk/by-label/NIXOS-FS";
|
||||
fsType = "btrfs";
|
||||
options = ["noatime" "compress=zstd:3"];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-label/SWAP"; }
|
||||
];
|
||||
swapDevices = [
|
||||
{device = "/dev/disk/by-label/SWAP";}
|
||||
];
|
||||
|
||||
# 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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue