From a01a04cf3e52be0e5a4d4253667d164adef0f17a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 9 Aug 2023 23:00:46 +0200 Subject: [PATCH] add game drive as mount --- modules/users/jopejoe1/default.nix | 1 + systems/kami/default.nix | 2 -- systems/kami/hardware.nix | 21 +++++++++++++-------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/modules/users/jopejoe1/default.nix b/modules/users/jopejoe1/default.nix index 45a7e60..300535c 100644 --- a/modules/users/jopejoe1/default.nix +++ b/modules/users/jopejoe1/default.nix @@ -10,6 +10,7 @@ description = "Johannes Jöns"; initialPassword = "password"; extraGroups = [ "wheel" "networkmanager" ]; + uid = 1000; packages = with pkgs; [ kate libsForQt5.ark diff --git a/systems/kami/default.nix b/systems/kami/default.nix index defbc07..10bbdb4 100644 --- a/systems/kami/default.nix +++ b/systems/kami/default.nix @@ -12,8 +12,6 @@ services.xserver.desktopManager.kodi.enable = true; - boot.supportedFilesystems = [ "ntfs" "btrfs" "zfs" ]; - boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; diff --git a/systems/kami/hardware.nix b/systems/kami/hardware.nix index 7f84861..1ec9e4b 100644 --- a/systems/kami/hardware.nix +++ b/systems/kami/hardware.nix @@ -23,21 +23,26 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/99a47ace-7e69-4520-b914-d4fe5b31dc79"; + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/99a47ace-7e69-4520-b914-d4fe5b31dc79"; fsType = "btrfs"; options = [ "subvol=@" ]; }; - - fileSystems."/boot/efi" = - { device = "/dev/disk/by-uuid/1F26-8168"; + "/boot/efi" = { + device = "/dev/disk/by-uuid/1F26-8168"; fsType = "vfat"; }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/78d6db21-b823-4ca4-b495-7782d3e56ddc"; + "/home" = { + device = "/dev/disk/by-uuid/78d6db21-b823-4ca4-b495-7782d3e56ddc"; fsType = "ext4"; }; + "/media/gaming" = { + device = "/dev/disk/by-uuid/4038F97238F966F6"; + fsType = "ntfs"; + options = [ "rw" "uid=${config.users.users.jopejoe1.uid}"]; + }; + }; swapDevices = [ ];