diff --git a/configuration.nix b/configuration.nix index edccc3c..72b3963 100644 --- a/configuration.nix +++ b/configuration.nix @@ -223,6 +223,7 @@ (nfsMount "10.1.1.4:/volume1/movies" "/mnt/d/movies") (nfsMount "10.1.1.4:/volume1/music" "/mnt/d/music") (nfsMount "10.1.1.4:/volume1/public" "/mnt/d/public") + (nfsMount "10.1.1.4:/volume1/shorts" "/mnt/d/shorts") (nfsMount "10.1.1.4:/volume1/tv" "/mnt/d/tv") ]; @@ -237,6 +238,7 @@ (nfsAutomount "/mnt/d/movies") (nfsAutomount "/mnt/d/music") (nfsAutomount "/mnt/d/public") + (nfsAutomount "/mnt/d/shorts") (nfsAutomount "/mnt/d/tv") ]; diff --git a/flake.lock b/flake.lock index 1297bbd..5380741 100644 --- a/flake.lock +++ b/flake.lock @@ -164,15 +164,16 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1777009807, - "narHash": "sha256-3+PP9wOtvC6CPC1dv1//ke7I5qFsJuxhfsOUcCcLF0k=", + "lastModified": 1782767918, + "narHash": "sha256-4l0ggRH7I6dLpf+hzrHMS0ivTfp0j4OPpJhXs4hprb0=", "owner": "rothgar", "repo": "k", - "rev": "4595eaebc79110539eb9f081ff1868f1ab9d0dad", + "rev": "c06064718471abc673d87f7ea633146f13280fe6", "type": "github" }, "original": { "owner": "rothgar", + "ref": "v0.6.0", "repo": "k", "type": "github" } @@ -211,11 +212,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1780030872, - "narHash": "sha256-u6WU/yd/o8iYQrHX3RAwO1hYa3LkoSL+WNQD0rJfJZQ=", + "lastModified": 1782666739, + "narHash": "sha256-2CYuaRDT7hcYnGW+3TTTy+fNnY4jQ6/mGk6ew035XP4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9a7635a57597d9754eccebdfc7045e6c8600e6b", + "rev": "534ee3d8beb1737b5342995f8837e2b2705ce0d8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fabacc4..e3dddf3 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ amp-pkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; home-manager.url = "github:nix-community/home-manager/release-26.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - k.url = "github:rothgar/k"; + k.url = "github:rothgar/k/v0.6.0"; claude-code.url = "github:sadjow/claude-code-nix"; noctalia-shell.url = "github:noctalia-dev/noctalia-shell"; agenix.url = "github:ryantm/agenix"; diff --git a/hosts/s.nix b/hosts/s.nix index 295ce7b..30e8160 100644 --- a/hosts/s.nix +++ b/hosts/s.nix @@ -40,9 +40,16 @@ }; environment.systemPackages = with pkgs; [ - davinci-resolve-studio + (davinci-resolve-studio.override { + buildFHSEnv = args: buildFHSEnv (args // { + targetPkgs = ps: (args.targetPkgs ps) ++ [ ps.pulseaudio ]; + }); + }) + cdrtools dconf-editor lollypop ]; + users.users.jgarr.extraGroups = [ "cdrom" ]; + } diff --git a/packages.txt b/packages.txt index 551dcd7..436db12 100644 --- a/packages.txt +++ b/packages.txt @@ -72,7 +72,9 @@ ffmpeg-full ffmpegthumbnailer gifsicle mpv +sound-juicer transmission_4 +gnome-sound-recorder # GStreamer plugin sets — covers codecs that GNOME Videos/Celluloid/Totem ask for gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -150,6 +152,7 @@ bottles nh nixos-anywhere pavucontrol +pulseaudio localsend sunshine tigervnc