chore: autoformat
This commit is contained in:
parent
337ee6db4a
commit
be381d1ebd
18 changed files with 158 additions and 116 deletions
|
|
@ -1,7 +1,8 @@
|
|||
{ config
|
||||
, lib
|
||||
, modulesPath
|
||||
, ...
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
|
|
@ -23,38 +24,37 @@
|
|||
extraModulePackages = [ ];
|
||||
};
|
||||
|
||||
fileSystems."/" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@root" ];
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@root" ];
|
||||
};
|
||||
|
||||
fileSystems."/nix" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@nix" ];
|
||||
};
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@nix" ];
|
||||
};
|
||||
|
||||
fileSystems."/var/log" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@log" ];
|
||||
};
|
||||
fileSystems."/var/log" = {
|
||||
device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@log" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@home" ];
|
||||
};
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/492e3157-429e-4b9b-995f-c341c83b17ab";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@home" ];
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/50A0-7758";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
options = [
|
||||
"fmask=0022"
|
||||
"dmask=0022"
|
||||
];
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
|
|
|
|||
|
|
@ -1,11 +1,19 @@
|
|||
{ modulesPath, ... }:
|
||||
{
|
||||
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
|
||||
|
||||
|
||||
nixpkgs.hostPlatform = "x86_64-linux";
|
||||
|
||||
|
||||
boot.loader.grub.device = "/dev/sda";
|
||||
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"ata_piix"
|
||||
"uhci_hcd"
|
||||
"xen_blkfront"
|
||||
"vmw_pvscsi"
|
||||
];
|
||||
boot.initrd.kernelModules = [ "nvme" ];
|
||||
fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; };
|
||||
fileSystems."/" = {
|
||||
device = "/dev/sda1";
|
||||
fsType = "ext4";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{ config
|
||||
, lib
|
||||
, modulesPath
|
||||
, pkgs
|
||||
, ...
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
|
|
@ -21,15 +22,19 @@
|
|||
"sd_mod"
|
||||
"xhci_pci"
|
||||
];
|
||||
kernelParams = [ # used to improve VM perfomance (guix experiments)
|
||||
kernelParams = [
|
||||
# used to improve VM perfomance (guix experiments)
|
||||
"amd_pstate=active"
|
||||
"usbcore.autosuspend=-1"
|
||||
"hugepagesz=1G"
|
||||
"hugepages=16"
|
||||
"hugepagesz=1G"
|
||||
"hugepages=16"
|
||||
"default_hugepagesz=1G"
|
||||
];
|
||||
initrd.kernelModules = [ ];
|
||||
kernelModules = [ "kvm-amd" "iwlwifi" ];
|
||||
kernelModules = [
|
||||
"kvm-amd"
|
||||
"iwlwifi"
|
||||
];
|
||||
extraModulePackages = [ ];
|
||||
};
|
||||
fileSystems = {
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@
|
|||
(final: prev: {
|
||||
libnitrokey = prev.libnitrokey.overrideAttrs (old: {
|
||||
cmakeFlags = (old.cmakeFlags or [ ]) ++ [
|
||||
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
|
||||
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
|
||||
];
|
||||
});
|
||||
epsonscan2 = prev.epsonscan2.overrideAttrs (old: {
|
||||
cmakeFlags = (old.cmakeFlags or [ ]) ++ [
|
||||
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
|
||||
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
|
||||
];
|
||||
});
|
||||
})
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
enable = true;
|
||||
drivers = [ pkgs.epson-escpr ];
|
||||
};
|
||||
|
||||
|
||||
pcscd.enable = true;
|
||||
# xserver.displayManager.sessionCommands =
|
||||
# "${pkgs.xorg.xmodmap}/bin/xmodmap -e 'keycode 64 = Alt_L'";
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
# openssh.settings.X11Forwarding = true;
|
||||
};
|
||||
|
||||
virtualisation ={
|
||||
virtualisation = {
|
||||
docker = {
|
||||
enable = true;
|
||||
logDriver = "journald";
|
||||
|
|
@ -71,21 +71,21 @@
|
|||
"guest account" = "nobody";
|
||||
"map to guest" = "bad user";
|
||||
security = "user";
|
||||
# used for xp priter vm
|
||||
# # Windows XP compatibility settings
|
||||
# "server min protocol" = "NT1"; # Enable SMB1 for Windows XP
|
||||
# "client min protocol" = "NT1";
|
||||
# "ntlm auth" = "yes"; # Required for Windows XP
|
||||
# "lanman auth" = "yes"; # Required for Windows XP
|
||||
# };
|
||||
# # Share for Windows XP access
|
||||
# "shared" = {
|
||||
# "path" = "/home/thiago/shared";
|
||||
# "browseable" = "yes";
|
||||
# "read only" = "no";
|
||||
# "guest ok" = "yes";
|
||||
# "create mask" = "0644";
|
||||
# "directory mask" = "0755";
|
||||
# used for xp priter vm
|
||||
# # Windows XP compatibility settings
|
||||
# "server min protocol" = "NT1"; # Enable SMB1 for Windows XP
|
||||
# "client min protocol" = "NT1";
|
||||
# "ntlm auth" = "yes"; # Required for Windows XP
|
||||
# "lanman auth" = "yes"; # Required for Windows XP
|
||||
# };
|
||||
# # Share for Windows XP access
|
||||
# "shared" = {
|
||||
# "path" = "/home/thiago/shared";
|
||||
# "browseable" = "yes";
|
||||
# "read only" = "no";
|
||||
# "guest ok" = "yes";
|
||||
# "create mask" = "0644";
|
||||
# "directory mask" = "0755";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ pkgs
|
||||
, config
|
||||
, ...
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
boot = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
# Under maintanence
|
||||
{ pkgs
|
||||
, ...
|
||||
{
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
# Optional helper for manual (re)binding at runtime
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ in
|
|||
"scard"
|
||||
"wheel"
|
||||
"lp"
|
||||
"scanner"
|
||||
"scanner"
|
||||
]
|
||||
++ ifTheyExist [
|
||||
"docker"
|
||||
|
|
|
|||
|
|
@ -5,11 +5,13 @@
|
|||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, ... }:
|
||||
outputs =
|
||||
{ self, nixpkgs, ... }:
|
||||
let
|
||||
system = "aarch64-linux";
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
in {
|
||||
in
|
||||
{
|
||||
devShells.${system}.default = pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
git
|
||||
|
|
@ -26,4 +28,3 @@
|
|||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue