fabianhauser/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Rename hummelberg-new to hummelberg

Browse source
This commit is contained in:
Fabian Hauser 2021-04-10 17:06:55 +02:00
parent 51f5e7eab9
commit 19bdd28b42
9 changed files with 133 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
host/hummelberg-new/filesystems.nix
View file

@ -1,30 +0,0 @@
{ 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";
};
fileSystems = {
"/" = {
device = "/dev/mapper/root";
fsType = "btrfs";
options = [ "subvol=nixos" ];
};
"/home" = {
device = "/dev/mapper/root";
fsType = "btrfs";
options = [ "subvol=home" ];
};
"/boot" = {
device = "/dev/disk/by-uuid/1FB9-3DB0";
fsType = "vfat";
};
};
swapDevices = [{ device = "/dev/mapper/swap"; }];
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
}

26
host/hummelberg-new/networking.nix
View file

@ -1,26 +0,0 @@
{ config, pkgs, ... }:
{
networking = {
networkmanager.enable = true;
useDHCP = false;
#wireless.enable = true; # Enables wireless support via wpa_supplicant.
hostName = "hummelberg-new";
};
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
#networking.wireguard.enable = true;
#networking.wireguard.interfaces = let
# meta = import ../../meta;
# vnetworks = meta.network.virtual;
# vnetworkName = "mgmt";
#in {
# "wg-${vnetworkName}" =
# pkgs.lib.qois.wireguard.makeInterface config.networking.hostName
# vnetworkName vnetworks.${vnetworkName};
#};
}

26
host/hummelberg-new/default.nix → host/hummelberg-old/default.nix
View file

@ -3,40 +3,28 @@
imports = [ imports = [
./filesystems.nix ./filesystems.nix
./networking.nix ./networking.nix
#./printing.nix ./printing.nix
#./backup.nix #TODO: Extract applications from desktop role #./backup.nix #TODO: Extract applications from desktop role
../../hardware/thinkpad-p14s.nix ../../hardware/dell-precision-3530.nix
../../defaults/base ../../defaults/base
../../defaults/cifs-auth-fix ../../defaults/cifs-auth-fix
../../defaults/desktop ../../defaults/desktop
#../../defaults/games ../../defaults/development-tools
../../defaults/user-configuration ../../defaults/games
../../defaults/user-configuration/fhauser ../../defaults/printing
#../../defaults/printing
]; ];
#TODO: Clean up next section
services.xserver.dpi = 180;
virtualisation = { # TODO: This should probably be somewhere else.
docker = {
enable = true;
enableOnBoot = false;
};
libvirtd.enable = true;
};
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Amsterdam"; time.timeZone = "Europe/Amsterdam";
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like fi:le locations and database versions # settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave # on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "20.09"; # Did you read the comment? system.stateVersion = "20.03"; # Did you read the comment?
} }

64
host/hummelberg-old/filesystems.nix Normal file
View file

@ -0,0 +1,64 @@
{ config, pkgs, lib, ... }:
let
networkShares = let
hsr_options = [
"defaults"
"noauto"
#"iocharset=utf8"
"soft"
"user=fhauser"
"domain=hsr.ch"
"uid=1000"
"gid=1000"
];
hsr_share = share_name:
{ domain ? "hsr.ch/root", path ? share_name, extra_options ? [ ] }:
lib.nameValuePair "/mnt/hsr/${share_name}" {
device = "//${domain}/${path}";
fsType = "cifs";
options = hsr_options ++ extra_options;
noCheck = true;
};
in lib.mapAttrs' hsr_share {
"skripte".path = "alg/skripte";
"scratch".path = "alg/scratch";
"fhauser".domain = "c101.hsr.ch";
#"fabian.hauser".domain = "svm-c113.ost.ch"; # User!
"afe" = { };
"auw" = { };
"ebooks" = {
path = "alg/ebooks";
extra_options = [ "ro" ];
};
};
in {
boot.initrd.luks.devices = {
"root".device = "/dev/disk/by-uuid/28d2914f-c053-40a8-ad90-f2743190c772";
"swap".device = "/dev/disk/by-uuid/ed89158d-4460-4012-86d7-f8761127371c";
};
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/6396b6eb-a7e6-430c-8c97-970404f88b35";
fsType = "btrfs";
options = [ "subvol=nixos" ];
};
"/home" = {
device = "/dev/disk/by-uuid/6396b6eb-a7e6-430c-8c97-970404f88b35";
fsType = "btrfs";
options = [ "subvol=home" ];
};
"/boot" = {
device = "/dev/disk/by-uuid/E86E-3C6C";
fsType = "vfat";
};
} // networkShares;
swapDevices = [{ device = "/dev/mapper/swap"; }];
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
}

26
host/hummelberg-old/networking.nix Normal file
View file

@ -0,0 +1,26 @@
{ config, pkgs, ... }:
{
networking = {
networkmanager.enable = true;
useDHCP = false;
#wireless.enable = true; # Enables wireless support via wpa_supplicant.
hostName = "hummelberg";
};
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
networking.wireguard.enable = true;
networking.wireguard.interfaces = let
meta = import ../../meta;
vnetworks = meta.network.virtual;
vnetworkName = "mgmt";
in {
"wg-${vnetworkName}" =
pkgs.lib.qois.wireguard.makeInterface config.networking.hostName
vnetworkName vnetworks.${vnetworkName};
};
}

0
host/hummelberg-new/printing.nix → host/hummelberg-old/printing.nix
View file

26
host/hummelberg/default.nix
View file

@ -3,28 +3,40 @@
imports = [ imports = [
./filesystems.nix ./filesystems.nix
./networking.nix ./networking.nix
./printing.nix #./printing.nix
#./backup.nix #TODO: Extract applications from desktop role #./backup.nix #TODO: Extract applications from desktop role
../../hardware/dell-precision-3530.nix ../../hardware/thinkpad-p14s.nix
../../defaults/base ../../defaults/base
../../defaults/cifs-auth-fix ../../defaults/cifs-auth-fix
../../defaults/desktop ../../defaults/desktop
../../defaults/development-tools #../../defaults/games
../../defaults/games ../../defaults/user-configuration
../../defaults/printing ../../defaults/user-configuration/fhauser
#../../defaults/printing
]; ];
#TODO: Clean up next section
services.xserver.dpi = 180;
virtualisation = { # TODO: This should probably be somewhere else.
docker = {
enable = true;
enableOnBoot = false;
};
libvirtd.enable = true;
};
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Amsterdam"; time.timeZone = "Europe/Amsterdam";
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like fi:le locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave # on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "20.03"; # Did you read the comment? system.stateVersion = "20.09"; # Did you read the comment?
} }

48
host/hummelberg/filesystems.nix
View file

@ -1,59 +1,25 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }: {
let
networkShares = let
hsr_options = [
"defaults"
"noauto"
#"iocharset=utf8"
"soft"
"user=fhauser"
"domain=hsr.ch"
"uid=1000"
"gid=1000"
];
hsr_share = share_name:
{ domain ? "hsr.ch/root", path ? share_name, extra_options ? [ ] }:
lib.nameValuePair "/mnt/hsr/${share_name}" {
device = "//${domain}/${path}";
fsType = "cifs";
options = hsr_options ++ extra_options;
noCheck = true;
};
in lib.mapAttrs' hsr_share {
"skripte".path = "alg/skripte";
"scratch".path = "alg/scratch";
"fhauser".domain = "c101.hsr.ch";
#"fabian.hauser".domain = "svm-c113.ost.ch"; # User!
"afe" = { };
"auw" = { };
"ebooks" = {
path = "alg/ebooks";
extra_options = [ "ro" ];
};
};
in {
boot.initrd.luks.devices = { boot.initrd.luks.devices = {
"root".device = "/dev/disk/by-uuid/28d2914f-c053-40a8-ad90-f2743190c772"; "root".device = "/dev/disk/by-uuid/fae1b81e-894c-47b4-92e5-0a817fd6f66f";
"swap".device = "/dev/disk/by-uuid/ed89158d-4460-4012-86d7-f8761127371c"; "swap".device = "/dev/disk/by-uuid/dc1fe9ff-7eb7-40c3-8fbd-d99398e5e5d6";
}; };
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/disk/by-uuid/6396b6eb-a7e6-430c-8c97-970404f88b35"; device = "/dev/mapper/root";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=nixos" ]; options = [ "subvol=nixos" ];
}; };
"/home" = { "/home" = {
device = "/dev/disk/by-uuid/6396b6eb-a7e6-430c-8c97-970404f88b35"; device = "/dev/mapper/root";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=home" ]; options = [ "subvol=home" ];
}; };
"/boot" = { "/boot" = {
device = "/dev/disk/by-uuid/E86E-3C6C"; device = "/dev/disk/by-uuid/1FB9-3DB0";
fsType = "vfat"; fsType = "vfat";
}; };
} // networkShares; };
swapDevices = [{ device = "/dev/mapper/swap"; }]; swapDevices = [{ device = "/dev/mapper/swap"; }];

20
host/hummelberg/networking.nix
View file

@ -13,14 +13,14 @@
# networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
networking.wireguard.enable = true; #networking.wireguard.enable = true;
networking.wireguard.interfaces = let #networking.wireguard.interfaces = let
meta = import ../../meta; # meta = import ../../meta;
vnetworks = meta.network.virtual; # vnetworks = meta.network.virtual;
vnetworkName = "mgmt"; # vnetworkName = "mgmt";
in { #in {
"wg-${vnetworkName}" = # "wg-${vnetworkName}" =
pkgs.lib.qois.wireguard.makeInterface config.networking.hostName # pkgs.lib.qois.wireguard.makeInterface config.networking.hostName
vnetworkName vnetworks.${vnetworkName}; # vnetworkName vnetworks.${vnetworkName};
}; #};
} }