From d78ad530237202b8bd39a16645333f3212d368f4 Mon Sep 17 00:00:00 2001 From: Ryan Pandya Date: Mon, 27 Jan 2025 01:12:32 -0800 Subject: [PATCH] Set up media mounts --- modules/apps/steam/default.nix | 6 +++ modules/components/default.nix | 2 +- modules/components/mounts/default.nix | 65 +++++++++++++++++++++++++++ modules/profiles/base.nix | 2 +- modules/profiles/desktop.nix | 8 ++-- todo | 3 +- 6 files changed, 79 insertions(+), 7 deletions(-) create mode 100644 modules/components/mounts/default.nix diff --git a/modules/apps/steam/default.nix b/modules/apps/steam/default.nix index e623a4d..6ad68ce 100644 --- a/modules/apps/steam/default.nix +++ b/modules/apps/steam/default.nix @@ -27,6 +27,7 @@ in }; }; config = lib.mkIf cfg.enable { + hardware.steam-hardware.enable = true; programs.java.enable = true; programs.steam = { enable = cfg.enableNative; @@ -39,6 +40,11 @@ in localNetworkGameTransfers.openFirewall = true; package = pkgs.steam.override { extraBwrapArgs = [ "--unsetenv TZ" ]; # https://github.com/NixOS/nixpkgs/issues/338266#issuecomment-2419568331 + extraPkgs = ( + pkgs: with pkgs; [ + gamemode + ] + ); extraLibraries = pkgs: with pkgs; [ alsa-lib diff --git a/modules/components/default.nix b/modules/components/default.nix index 8fc3082..ee9ab9d 100644 --- a/modules/components/default.nix +++ b/modules/components/default.nix @@ -3,7 +3,7 @@ ./boot # ./flatpak # ./fonts - # ./mounts + ./mounts ./networking ./nix ./nvidia diff --git a/modules/components/mounts/default.nix b/modules/components/mounts/default.nix new file mode 100644 index 0000000..d4e2d16 --- /dev/null +++ b/modules/components/mounts/default.nix @@ -0,0 +1,65 @@ +{ + lib, + config, + pkgs, + ... +}: +let + cfg = config.mounts; +in +{ + options = { + mounts = { + enable = lib.mkEnableOption "Enable mounts in NixOS"; + }; + }; + config = lib.mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + cifs-utils + nfs-utils + ]; + fileSystems = builtins.listToAttrs ( + builtins.map + (mount: { + name = "/media/${mount.name}"; + value = { + device = "media.home:/volume1/${mount.path}"; + fsType = "nfs"; + options = [ + # "x-systemd.automount" + # "noauto" + "x-systemd.idle-timeout=600" + "rw" + ]; + }; + }) + [ + { + name = "archive"; + path = "documents/documents/archive"; + } + { + name = "photos"; + path = "photos"; + } + { + name = "video"; + path = "video"; + } + { + name = "audio"; + path = "audio"; + } + { + name = "home"; + path = "homes/ryan"; + } + { + name = "fileshare"; + path = "fileshare"; + } + ] + ); + services.rpcbind.enable = true; + }; +} diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix index 89d6774..a956a2c 100644 --- a/modules/profiles/base.nix +++ b/modules/profiles/base.nix @@ -60,7 +60,7 @@ in # flatpak.enable = true; # fonts.enable = true; hardening.enable = true; - # mounts.enable = true; + mounts.enable = true; networking.enable = true; nixConfig.enable = true; packages.enable = true; diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index 4ba0070..3ee5e3e 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -109,7 +109,7 @@ in home.packages = with pkgs; [ # GUI Apps firefox - ungoogled-chromium + chromium logseq filezilla spotify @@ -124,7 +124,7 @@ in mimeApps = let audioPlayer = "org.fooyin.fooyin.desktop"; - browser = "app.zen_browser.zen.desktop"; + browser = "firefox.desktop"; editor = "org.kde.kate.desktop"; imageViewer = "org.kde.gwenview.desktop"; pdfViewer = "org.kde.okular.desktop"; @@ -148,11 +148,11 @@ in "application/xml" = editor; "application/x-shellscript" = editor; "application/x-yaml" = editor; - "inode/directory" = "org.kde.dolphin.desktop"; + "inode/directory" = "thunar.desktop"; "x-scheme-handler/bottles" = "com.usebottles.bottles.desktop"; "x-scheme-handler/http" = browser; "x-scheme-handler/https" = browser; - "x-scheme-handler/terminal" = "org.wezfurlong.wezterm.desktop"; + "x-scheme-handler/terminal" = "kitty.desktop"; } // lib.optionalAttrs vars.gaming { "application/x-cue" = "cdemu-client.desktop"; diff --git a/todo b/todo index 16f70db..1b451fc 100644 --- a/todo +++ b/todo @@ -13,4 +13,5 @@ TODO ags TODO sudo nopasswd TODO brightness controls TODO sounds (disable bell!!!) -TODO KDEConnect \ No newline at end of file +TODO KDEConnect +TODO Numlock \ No newline at end of file