diff --git a/flake.lock b/flake.lock index 3e9e3ca..31595f3 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1718835324, - "narHash": "sha256-U5eKTPAXppfSIqKqMIgbyuTBy1gr2seSOUl8sUSR8FE=", + "lastModified": 1718990734, + "narHash": "sha256-sSW+JRtbKYCtu0ljj0UPXHSYEZdmfS9y22Zy+qprRm8=", "ref": "refs/heads/main", - "rev": "fabc30df52ab5d2c369fc8acd4ff909a6ba3b8ac", - "revCount": 4870, + "rev": "4a8b13ea4f8e5111390471c9212d10d4d032e837", + "revCount": 4872, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -230,11 +230,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718530797, - "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", + "lastModified": 1718895438, + "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", + "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", "type": "github" }, "original": { @@ -262,11 +262,11 @@ }, "nur": { "locked": { - "lastModified": 1718871997, - "narHash": "sha256-sNCO80wsJBb3/NkYY1BQONhuJdlkTVsNqwClOj2KId0=", + "lastModified": 1718992251, + "narHash": "sha256-wHPXfpeleFtZZx4T/QJP4QDvVxjHE2sGmd+EDXBlWug=", "owner": "nix-community", "repo": "NUR", - "rev": "c1f28d4ba410603d97f9a05564937c7af13e3ace", + "rev": "ec879287be7dbca645a82a9d9dfbd206835f3736", "type": "github" }, "original": { diff --git a/hosts/Aloria/default.nix b/hosts/Aloria/default.nix index e8834b9..ee348e1 100644 --- a/hosts/Aloria/default.nix +++ b/hosts/Aloria/default.nix @@ -31,6 +31,8 @@ }]; }; }; + fileSystems."/home/server".device = pkgs.lib.mkForce "10.0.0.1:/home/server"; + networking.wireless.iwd.enable = true; networking.wireless.iwd.settings = { IPv6 = { @@ -40,5 +42,4 @@ AutoConnect = true; }; }; - } diff --git a/hosts/Common/default.nix b/hosts/Common/default.nix index 3055bc9..c15fb13 100644 --- a/hosts/Common/default.nix +++ b/hosts/Common/default.nix @@ -56,24 +56,19 @@ options = [ "x-systemd.automount" "x-systemd.mount-timeout=1" "_netdev" "noauto" "timeo=1" ]; }; fileSystems."/home/user/Workspace" = { - device = "192.168.1.2:/home/server/Workspace"; - fsType = "nfs"; - options = [ "x-systemd.automount" "x-systemd.mount-timeout=1" "_netdev" "noauto" "timeo=1" ]; + device = "/home/server/Workspace"; + options = [ "bind" ]; }; fileSystems."/home/user/Documents" = { - device = "192.168.1.2:/home/server/Storage/Thomas/Documents"; - fsType = "nfs"; - options = [ "x-systemd.automount" "x-systemd.mount-timeout=1" "_netdev" "noauto" "timeo=1" ]; + device = "/home/server/Storage/Thomas/Documents"; + options = [ "bind" ]; }; fileSystems."/home/user/Pictures" = { - device = "192.168.1.2:/home/server/Storage/Thomas/Pictures"; - fsType = "nfs"; - options = [ "x-systemd.automount" "x-systemd.mount-timeout=1" "_netdev" "noauto" "timeo=1" ]; + device = "/home/server/Storage/Thomas/Pictures"; + options = [ "bind" ]; }; fileSystems."/home/user/Videos" = { - device = "192.168.1.2:/home/server/Storage/Thomas/Videos"; - fsType = "nfs"; - options = [ "x-systemd.automount" "x-systemd.mount-timeout=1" "_netdev" "noauto" "timeo=1" ]; + device = "/home/server/Storage/Thomas/Videos"; + options = [ "bind" ]; }; - } diff --git a/hosts/Common/desktop.nix b/hosts/Common/desktop.nix index 5dea59c..1bb1f31 100644 --- a/hosts/Common/desktop.nix +++ b/hosts/Common/desktop.nix @@ -4,8 +4,6 @@ hardware.opengl = { enable = true; - driSupport = true; - driSupport32Bit = true; }; fonts.packages = with pkgs; [