From 384c40f7ac97a078ae9c976d10864ef851a1eaf8 Mon Sep 17 00:00:00 2001 From: kat witch Date: Sun, 22 Nov 2020 09:56:50 +0000 Subject: [PATCH] Changed Rust to use rustup instead of using Nix provided cargo+rustc for VSCode compatibility. Samhain has been adjusted for automounts and to provide transmission+SMB for /disks/BigEXT instead of for /var/lib/transmission/Downloads which was residing on the SSD. --- configuration/hosts/samhain/configuration.nix | 6 +++++- .../hosts/samhain/hardware-configuration.nix | 12 ++++++++++++ configuration/profiles/desktop/default.nix | 2 ++ configuration/profiles/development/default.nix | 4 ++-- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/configuration/hosts/samhain/configuration.nix b/configuration/hosts/samhain/configuration.nix index 4d35fad6..a907513a 100644 --- a/configuration/hosts/samhain/configuration.nix +++ b/configuration/hosts/samhain/configuration.nix @@ -26,7 +26,11 @@ services.transmission = { enable = true; + home = "/disk/BigEXT/transmission"; settings = { + download-dir = "/disks/BigEXT/Share/"; + incomplete-dir = "/disks/BigEXT/Share/.incomplete"; + incomplete-dir-enabled = true; rpc-bind-address = "0.0.0.0"; rpc-whitelist = "127.0.0.1,192.168.1.*"; }; @@ -49,7 +53,7 @@ ''; shares = { public = { - path = "/var/lib/transmission/Downloads"; + path = "/disks/BigEXT/Share"; browseable = "yes"; "read only" = "no"; "guest ok" = "yes"; diff --git a/configuration/hosts/samhain/hardware-configuration.nix b/configuration/hosts/samhain/hardware-configuration.nix index 04ac3f57..ae990113 100644 --- a/configuration/hosts/samhain/hardware-configuration.nix +++ b/configuration/hosts/samhain/hardware-configuration.nix @@ -27,6 +27,18 @@ fsType = "vfat"; }; + fileSystems."/disks/BigExfat" = + { device = "/dev/disk/by-uuid/5F0E-F368"; + fsType = "exfat"; + }; + + fileSystems."/disks/BigEXT" = + { device = "/dev/disk/by-uuid/f9797766-59d6-4fca-9a2a-7bade7f57291"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."mewmapper".device = "/dev/disk/by-uuid/2802caf9-2dd6-4365-a022-f1359911a1db"; + swapDevices = [{ device = "/dev/disk/by-uuid/88595373-9566-401b-8c9b-03bbc8314f1b"; }]; diff --git a/configuration/profiles/desktop/default.nix b/configuration/profiles/desktop/default.nix index c9918da4..79b93952 100644 --- a/configuration/profiles/desktop/default.nix +++ b/configuration/profiles/desktop/default.nix @@ -21,12 +21,14 @@ in { pkgs.discord pkgs.tdesktop pkgs.dino + pkgs.vegur pkgs.nitrogen pkgs.terminator pkgs.appimage-run pkgs.scrot pkgs.gimp pkgs.vscode + pkgs.cryptsetup pkgs.neofetch pkgs.htop ]; diff --git a/configuration/profiles/development/default.nix b/configuration/profiles/development/default.nix index d4152353..c75b3e0f 100644 --- a/configuration/profiles/development/default.nix +++ b/configuration/profiles/development/default.nix @@ -9,8 +9,8 @@ pkgs.jetbrains.phpstorm pkgs.nixfmt pkgs.carnix - pkgs.rustc - pkgs.cargo + pkgs.rustup + pkgs.gcc ]; }; }