Johan Rong hace 5 meses
padre
commit
746ac3ca9b

+ 1 - 1
home/features/application/sway/default.nix

@@ -231,7 +231,7 @@ in
       #  -b "Exit" "swaymsg exit" \
       #  -b "Reboot" "reboot"
 
-      exec swaybg -i "/storage/Pictures/Backgrounds/reef-1920x1080-2.png" -m fill
+      exec swaybg -i "$HOME/Pictures/Backgrounds/reef-1920x1080-2.png" -m fill
 
       exec_always {
         systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK

+ 0 - 30
hosts/desktop-nixos-workstation/configuration.nix

@@ -1,32 +1,5 @@
 { config, pkgs, lib, ... }:
 
-let
-  #user = "johron";
-  #storageRoot = "/storage";
-
-  #folders = [
-  #  "Applications"
-  #  "Documents"
-  #  "Downloads"
-  #  "Games"
-  #  "Machines"
-  #  "Music"
-  #  "Pictures"
-  #  "Projects"
-  #  "Scripts"
-  #  "Videos"
-  #  "Wineprefixes"
-  #];
-
-  #mkBindMount = folder: {
-  #  name = "/home/${user}/${folder}";
-  #  value = {
-  #    device = "${storageRoot}/${folder}";
-  #    options = [ "bind" "nofail" "x-systemd.automount" ];
-  #    depends = [ storageRoot ];
-  #  };
-  #};
-in
 {
   imports = [
     ./networking.nix
@@ -46,9 +19,6 @@ in
   nixpkgs.config.allowUnfree = true;
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  #fileSystems = lib.mkMerge [
-  #  (builtins.listToAttrs (map mkBindMount folders))
-  #];
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;

+ 12 - 0
hosts/desktop-nixos-workstation/hardware-configuration.nix

@@ -31,6 +31,18 @@
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
+  fileSystems."/nvme" =
+    { device = "/dev/disk/by-uuid/aa535a01-d005-4fd2-9e95-3787ce33b6f3";
+      fsType = "btrfs";
+      options = [ "defaults" "nofail" ];
+    };
+
+  fileSystems."/hdd" =
+    { device = "/dev/disk/by-uuid/995f3a39-f893-497d-bc2a-c0cb1f4c913c";
+      fsType = "ext4";
+      options = [ "defaults" "nofail" ];
+    };
+
   swapDevices = [ ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";