From 35738c49bd3e6683a439e97965a035a15ffe196e Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Sun, 9 Feb 2025 12:35:48 +0300 Subject: [PATCH 1/3] feat(home): add mpv config --- modules/home-config.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/home-config.nix b/modules/home-config.nix index d541930..c71b13e 100644 --- a/modules/home-config.nix +++ b/modules/home-config.nix @@ -230,7 +230,29 @@ in core.fileMode = false; }; }; + mpv = { + enable = true; + package = ( + pkgs.mpv-unwrapped.wrapper { + scripts = with pkgs.mpvScripts; [ + mpris + sponsorblock + thumbfast + uosc + visualizer + ]; + mpv = pkgs.mpv-unwrapped.override { + waylandSupport = true; + }; + } + ); + + config = { + profile = "high-quality"; + ytdl-format = "bestvideo+bestaudio"; + }; + }; neovim = { defaultEditor = true; viAlias = true; From 9054423e8471477f240f3a88e1b466a6057b32db Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Sun, 9 Feb 2025 12:36:25 +0300 Subject: [PATCH 2/3] fix(desktop): xdg on kde 6 --- modules/desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/desktop.nix b/modules/desktop.nix index 8f9e86c..6b5ce86 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -80,7 +80,7 @@ xdg.portal = { enable = true; - extraPortals = [ pkgs.xdg-desktop-portal-kde ]; + extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ]; xdgOpenUsePortal = true; }; From ac6cba81990b76fc7eb33134ce0b4d2dee47b2d3 Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Sun, 9 Feb 2025 12:36:59 +0300 Subject: [PATCH 3/3] feat(sabo): mount the nas --- machines/sabo/hardware-configuration.nix | 114 +++++++++++++++++------ 1 file changed, 83 insertions(+), 31 deletions(-) diff --git a/machines/sabo/hardware-configuration.nix b/machines/sabo/hardware-configuration.nix index aa094ef..48fb493 100644 --- a/machines/sabo/hardware-configuration.nix +++ b/machines/sabo/hardware-configuration.nix @@ -1,49 +1,101 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "uas" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "uas" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; + boot.kernelParams = [ "pcie_port_pm=off" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/62a9eb3b-801e-4a1d-b945-39e71d036973"; - fsType = "btrfs"; - options = [ "subvol=@" ]; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/62a9eb3b-801e-4a1d-b945-39e71d036973"; + fsType = "btrfs"; + options = [ "subvol=@" ]; + }; - boot.initrd.luks.devices."nixos-root".device = "/dev/disk/by-uuid/7d512c0d-d47f-488e-ac15-6b91410b1e0b"; + boot.initrd.luks.devices."nixos-root".device = + "/dev/disk/by-uuid/7d512c0d-d47f-488e-ac15-6b91410b1e0b"; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/5767-963F"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/5767-963F"; + fsType = "vfat"; + options = [ + "fmask=0022" + "dmask=0022" + ]; + }; - fileSystems."/home" = - { device = "/dev/disk/by-uuid/62a9eb3b-801e-4a1d-b945-39e71d036973"; - fsType = "btrfs"; - options = [ "subvol=@home" ]; - }; + fileSystems."/home" = { + device = "/dev/disk/by-uuid/62a9eb3b-801e-4a1d-b945-39e71d036973"; + fsType = "btrfs"; + options = [ "subvol=@home" ]; + }; - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/62a9eb3b-801e-4a1d-b945-39e71d036973"; - fsType = "btrfs"; - options = [ "subvol=@nix" ]; - }; + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/62a9eb3b-801e-4a1d-b945-39e71d036973"; + fsType = "btrfs"; + options = [ "subvol=@nix" ]; + }; - fileSystems."/var/log" = - { device = "/dev/disk/by-uuid/62a9eb3b-801e-4a1d-b945-39e71d036973"; - fsType = "btrfs"; - options = [ "subvol=@log" ]; - }; + fileSystems."/var/log" = { + device = "/dev/disk/by-uuid/62a9eb3b-801e-4a1d-b945-39e71d036973"; + fsType = "btrfs"; + options = [ "subvol=@log" ]; + }; + fileSystems."/mnt/nas/music" = { + device = "192.168.1.2:/volume1/music"; + options = [ + "nfsvers=4.2" + "x-systemd.automount" + "noauto" + "rw" + "relatime" + "user" + "acl" + "defaults" + ]; + fsType = "nfs"; + }; + + services.rpcbind.enable = true; # needed for NFS + systemd.mounts = [ + { + type = "nfs"; + mountConfig = { + Options = "defaults,acl,user,noauto,relatime,rw"; + }; + what = "192.168.1.2:/volume1/music"; + where = "/mnt/nas/music"; + } + ]; + + systemd.automounts = [ + { + wantedBy = [ "multi-user.target" ]; + automountConfig = { + TimeoutIdleSec = "600"; + }; + where = "/mnt/nas/music"; + } + ]; swapDevices = [ ];