Update formatter
This commit is contained in:
parent
4eea2232fb
commit
d8235cb2a9
55 changed files with 1031 additions and 664 deletions
|
@ -1,4 +1,5 @@
|
|||
{ config, pkgs, ... }: {
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
|
||||
imports = [
|
||||
./filesystems.nix
|
||||
|
@ -16,7 +17,8 @@
|
|||
#TODO: Clean up next section
|
||||
services.xserver.dpi = 180;
|
||||
|
||||
virtualisation = { # TODO: This should probably be somewhere else.
|
||||
virtualisation = {
|
||||
# TODO: This should probably be somewhere else.
|
||||
docker = {
|
||||
enable = true;
|
||||
enableOnBoot = false;
|
||||
|
|
|
@ -1,4 +1,10 @@
|
|||
{ config, pkgs, lib, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
boot.initrd.luks.devices = {
|
||||
"root".device = "/dev/disk/by-uuid/fae1b81e-894c-47b4-92e5-0a817fd6f66f";
|
||||
"swap".device = "/dev/disk/by-uuid/dc1fe9ff-7eb7-40c3-8fbd-d99398e5e5d6";
|
||||
|
@ -21,10 +27,9 @@
|
|||
};
|
||||
};
|
||||
|
||||
swapDevices = [{ device = "/dev/mapper/swap"; }];
|
||||
swapDevices = [ { device = "/dev/mapper/swap"; } ];
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
}
|
||||
|
|
|
@ -2,15 +2,17 @@
|
|||
|
||||
{
|
||||
hardware.printers.ensureDefaultPrinter = "hsr-mfp-8261";
|
||||
hardware.printers.ensurePrinters = [{
|
||||
name = "hsr-mfp-8261";
|
||||
deviceUri = "smb://hsr.ch/printsrv-d.hsr.ch/d8261-a4mfp";
|
||||
location = "HSR 8.261";
|
||||
model = "HP/hp-color_laserjet_mfp_m577-ps.ppd.gz";
|
||||
ppdOptions = {
|
||||
Duplex = "DuplexNoTumble";
|
||||
PageSize = "A4";
|
||||
auth-info-required = "username,password";
|
||||
};
|
||||
}];
|
||||
hardware.printers.ensurePrinters = [
|
||||
{
|
||||
name = "hsr-mfp-8261";
|
||||
deviceUri = "smb://hsr.ch/printsrv-d.hsr.ch/d8261-a4mfp";
|
||||
location = "HSR 8.261";
|
||||
model = "HP/hp-color_laserjet_mfp_m577-ps.ppd.gz";
|
||||
ppdOptions = {
|
||||
Duplex = "DuplexNoTumble";
|
||||
PageSize = "A4";
|
||||
auth-info-required = "username,password";
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{ config, pkgs, ... }: {
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
|
||||
imports = [
|
||||
./filesystems.nix
|
||||
|
@ -11,7 +12,8 @@
|
|||
../../defaults/desktop
|
||||
];
|
||||
|
||||
virtualisation = { # TODO: This should probably be somewhere else.
|
||||
virtualisation = {
|
||||
# TODO: This should probably be somewhere else.
|
||||
docker = {
|
||||
enable = true;
|
||||
enableOnBoot = false;
|
||||
|
@ -38,5 +40,4 @@
|
|||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "23.11"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
|
|
@ -1,29 +1,39 @@
|
|||
{ config, pkgs, lib, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
|
||||
boot.initrd.luks.devices = { "luks".device = "/dev/disk/by-label/luks"; };
|
||||
|
||||
fileSystems = let rootdev = "/dev/disk/by-label/hv_ochsenchopf";
|
||||
in {
|
||||
"/" = {
|
||||
device = rootdev;
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nixos" ];
|
||||
};
|
||||
"/home" = {
|
||||
device = rootdev;
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=home" ];
|
||||
};
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-label/boot";
|
||||
fsType = "vfat";
|
||||
};
|
||||
boot.initrd.luks.devices = {
|
||||
"luks".device = "/dev/disk/by-label/luks";
|
||||
};
|
||||
|
||||
swapDevices = [{ device = "/dev/disk/by-label/swap"; }];
|
||||
fileSystems =
|
||||
let
|
||||
rootdev = "/dev/disk/by-label/hv_ochsenchopf";
|
||||
in
|
||||
{
|
||||
"/" = {
|
||||
device = rootdev;
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nixos" ];
|
||||
};
|
||||
"/home" = {
|
||||
device = rootdev;
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=home" ];
|
||||
};
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-label/boot";
|
||||
fsType = "vfat";
|
||||
};
|
||||
};
|
||||
|
||||
swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
}
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{ config, pkgs, ... }: {
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
|
||||
imports = [
|
||||
./filesystems.nix
|
||||
|
@ -14,7 +15,8 @@
|
|||
#../../defaults/printing
|
||||
];
|
||||
|
||||
virtualisation = { # TODO: This should probably be somewhere else.
|
||||
virtualisation = {
|
||||
# TODO: This should probably be somewhere else.
|
||||
docker = {
|
||||
enable = true;
|
||||
enableOnBoot = false;
|
||||
|
@ -32,5 +34,4 @@
|
|||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "22.11"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
|
|
@ -1,6 +1,11 @@
|
|||
{ config, pkgs, lib, ... }: {
|
||||
boot.initrd.luks.devices.system.device =
|
||||
"/dev/disk/by-uuid/bf353bb1-43bf-453f-ae7e-0fa9b4d8778c";
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
boot.initrd.luks.devices.system.device = "/dev/disk/by-uuid/bf353bb1-43bf-453f-ae7e-0fa9b4d8778c";
|
||||
boot.initrd.kernelModules = [ "dm-snapshot" ];
|
||||
|
||||
fileSystems = {
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{ config, pkgs, ... }: {
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
networking = {
|
||||
networkmanager.enable = true;
|
||||
useDHCP = false;
|
||||
|
|
|
@ -2,15 +2,17 @@
|
|||
|
||||
{
|
||||
hardware.printers.ensureDefaultPrinter = "hsr-mfp-8261";
|
||||
hardware.printers.ensurePrinters = [{
|
||||
name = "hsr-mfp-8261";
|
||||
deviceUri = "smb://hsr.ch/printsrv-d.hsr.ch/d8261-a4mfp";
|
||||
location = "HSR 8.261";
|
||||
model = "HP/hp-color_laserjet_mfp_m577-ps.ppd.gz";
|
||||
ppdOptions = {
|
||||
Duplex = "DuplexNoTumble";
|
||||
PageSize = "A4";
|
||||
auth-info-required = "username,password";
|
||||
};
|
||||
}];
|
||||
hardware.printers.ensurePrinters = [
|
||||
{
|
||||
name = "hsr-mfp-8261";
|
||||
deviceUri = "smb://hsr.ch/printsrv-d.hsr.ch/d8261-a4mfp";
|
||||
location = "HSR 8.261";
|
||||
model = "HP/hp-color_laserjet_mfp_m577-ps.ppd.gz";
|
||||
ppdOptions = {
|
||||
Duplex = "DuplexNoTumble";
|
||||
PageSize = "A4";
|
||||
auth-info-required = "username,password";
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue