megamanmalte/nixos
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

feat(modules/deck,modules/malte): drop USB config, add SD config, add mysql service

Browse source
This commit is contained in:
Malte Tammena 2023-11-30 18:22:38 +01:00
parent 5ad07e4f25
commit ab3f72ace2
3 changed files with 22 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hosts/murex-pecten.nix
View file

@ -112,10 +112,6 @@
services.login.yubicoAuth = true; services.login.yubicoAuth = true;
}; };
# TODO: Remove/Move
services.mysql.enable = true;
services.mysql.package = pkgs.mariadb;
services.udev.customRules = [ services.udev.customRules = [
# Rename the Scarlett Solo using udev # Rename the Scarlett Solo using udev
{ {

24
modules/deck.nix
View file

@ -34,21 +34,15 @@ in {
openssh.authorizedKeys.keyFiles = [../users/malte/yubikey.pub]; openssh.authorizedKeys.keyFiles = [../users/malte/yubikey.pub];
}; };
# My huge NVME USB Stick # include the sd card, if any is inserted
fileSystems."/butterjunge" = { fileSystems = {
device = "/dev/disk/by-id/usb-SHARGE_DISK_012345679841-0:0-part2"; "/home/deck/sdcard" = {
fsType = "btrfs"; device = "/dev/mmcblk0p1";
options = [ fsType = "ext4";
"compress=lzo" options = [
]; "nofail"
}; ];
fileSystems."/home/deck/butterjunge" = { };
device = "/butterjunge";
options = [
"bind"
"compress=lzo"
"map=1000/deck:@100/@users"
];
}; };
home-manager.users.deck.imports = [../users/deck/home.nix inputs.nix-colors.homeManagerModule inputs.hyprland.homeManagerModules.default]; home-manager.users.deck.imports = [../users/deck/home.nix inputs.nix-colors.homeManagerModule inputs.hyprland.homeManagerModules.default];

27
modules/malte.nix
View file

@ -59,20 +59,19 @@ in {
enableNvidiaPatches = config.settings.nvidiaUsed; enableNvidiaPatches = config.settings.nvidiaUsed;
}; };
# My huge NVME USB Stick # TODO: Remove/Move
fileSystems."/butterjunge" = { services.mysql = {
device = "/dev/disk/by-id/usb-SHARGE_DISK_012345679841-0:0-part2"; enable = true;
fsType = "btrfs"; package = pkgs.mariadb;
options = [ ensureDatabases = ["notenbuch"];
"compress=lzo" ensureUsers = [
]; {
}; name = "malte";
fileSystems."/home/malte/butterjunge" = { ensurePermissions = {
device = "/butterjunge"; "notenbuch.*" = "ALL PRIVILEGES";
options = [ "*.*" = "CREATE USER, GRANT OPTION, RELOAD, SELECT, DROP";
"bind" };
"compress=lzo" }
"map=1000/malte:@100/@users"
]; ];
}; };