From bcc25d4598afb24cf103cd70450d908d27036fe6 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Mon, 8 Apr 2024 19:09:55 +0200 Subject: [PATCH] removed uncessesary option for secondary drive --- modules/nixos/apps/onedrive/default.nix | 24 +++++++++++++++++++++ systems/x86_64-linux/yggdrasil/default.nix | 1 + systems/x86_64-linux/yggdrasil/hardware.nix | 23 ++++++++++++++------ 3 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 modules/nixos/apps/onedrive/default.nix diff --git a/modules/nixos/apps/onedrive/default.nix b/modules/nixos/apps/onedrive/default.nix new file mode 100644 index 0000000..9e28521 --- /dev/null +++ b/modules/nixos/apps/onedrive/default.nix @@ -0,0 +1,24 @@ +{ + lib, + config, + pkgs, + ... +}: +with lib; +with lib.wyrdgard; +let + cfg = config.wyrdgard.apps.onedrive; +in +{ + options.wyrdgard.apps.onedrive = with types; { + enable = mkEnableOption "Enable OneDrive integration"; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ onedrivegui ]; + + services.onedrive = { + enable = true; + }; + }; +} diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix index c639176..f56262e 100644 --- a/systems/x86_64-linux/yggdrasil/default.nix +++ b/systems/x86_64-linux/yggdrasil/default.nix @@ -22,6 +22,7 @@ with lib.wyrdgard; vivaldi = enabled; discord = enabled; _1password = enabled; + onedrive = enabled; }; system = { diff --git a/systems/x86_64-linux/yggdrasil/hardware.nix b/systems/x86_64-linux/yggdrasil/hardware.nix index 654c830..9ddb9d9 100644 --- a/systems/x86_64-linux/yggdrasil/hardware.nix +++ b/systems/x86_64-linux/yggdrasil/hardware.nix @@ -11,7 +11,8 @@ { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ + boot = { + initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" @@ -19,23 +20,33 @@ "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ + initrd.kernelModules = [ ]; + kernelModules = [ "kvm-amd" "btusb" ]; - boot.extraModulePackages = [ ]; + extraModulePackages = [ ]; +}; - fileSystems."/" = { +fileSystems = { + "/" = { device = "/dev/disk/by-uuid/444a9216-59d1-46e0-9643-0b716a42ba0b"; fsType = "ext4"; }; - fileSystems."/boot" = { + "/boot" = { device = "/dev/disk/by-uuid/8310-585A"; fsType = "vfat"; }; + "/storage" = { + device = "/dev/disk/by-uuid/ea9e4f80-21e0-409c-885b-5e898b86fe76"; + fsType = "ext4"; + }; +}; + + + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking