From e62fdad8b1c29bde7434f781d17ef36709d20899 Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Sat, 19 Oct 2024 22:28:18 +0300 Subject: [PATCH] Clean up dependencies and update inputs --- defaults/base/unfree.nix | 1 + defaults/desktop/desktop-environment.nix | 3 +- defaults/desktop/security.nix | 2 +- flake.lock | 48 ++++++++---------------- home/fhauser/applications/default.nix | 1 - home/fhauser/multimedia.nix | 29 +++++++------- 6 files changed, 31 insertions(+), 53 deletions(-) diff --git a/defaults/base/unfree.nix b/defaults/base/unfree.nix index 0e86022..14980cb 100644 --- a/defaults/base/unfree.nix +++ b/defaults/base/unfree.nix @@ -14,6 +14,7 @@ "steam" "steam-run" "steam-original" + "steam-unwrapped" "hplip" diff --git a/defaults/desktop/desktop-environment.nix b/defaults/desktop/desktop-environment.nix index f282f82..abee0a4 100644 --- a/defaults/desktop/desktop-environment.nix +++ b/defaults/desktop/desktop-environment.nix @@ -14,7 +14,6 @@ in [ # Utilities freetype - feh lxappearance sound-theme-freedesktop ] @@ -22,7 +21,7 @@ in # Various xfce.thunar xfce.thunar-archive-plugin - xfce.xfce4-appfinder # xfce.thunar-volman # needed? + xfce.xfce4-appfinder pinentry-rofi # Required by gnupg qt5.qtwayland # Required for qt applications ]; diff --git a/defaults/desktop/security.nix b/defaults/desktop/security.nix index a37dbed..6052932 100644 --- a/defaults/desktop/security.nix +++ b/defaults/desktop/security.nix @@ -10,7 +10,7 @@ # Make pam accept both password and fingerprint security.pam.services.swaylock.rules.auth = { - fprintd.order = 11600; + fprintd.order = 11601; unix.args = [ "nullok" ]; }; } diff --git a/flake.lock b/flake.lock index 307a328..836a9d5 100644 --- a/flake.lock +++ b/flake.lock @@ -195,7 +195,6 @@ "flake-root": "flake-root_2", "haskell-flake": "haskell-flake_2", "heist-extra": "heist-extra_2", - "nix-health": "nix-health", "nixpkgs": [ "nixpkgs-unstable" ], @@ -204,11 +203,11 @@ "unionmount": "unionmount_2" }, "locked": { - "lastModified": 1727887125, - "narHash": "sha256-SBnUyYNDz3PYB9b71GDP1SAOMLPAALdbzqWgb8hdVSA=", + "lastModified": 1729202851, + "narHash": "sha256-Kd56DefIoCqt9MhyNkKoJJypcLXlJrSdYn4r5WNFucI=", "owner": "srid", "repo": "emanote", - "rev": "94cbcba6ffdcfd9fbcae2d06ce073dd0b4ad74c7", + "rev": "1953f5aac8a21ea553829a5fbcfb7bf5b792baad", "type": "github" }, "original": { @@ -494,11 +493,11 @@ ] }, "locked": { - "lastModified": 1728644079, - "narHash": "sha256-TE8d5So6ur58hN+9V1o+A6tF30+3jrFvCpeZker3Pug=", + "lastModified": 1729321331, + "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", "owner": "nix-community", "repo": "home-manager", - "rev": "582830954264080aae93f751c3cdc58df600d2d1", + "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", "type": "github" }, "original": { @@ -535,30 +534,13 @@ "type": "github" } }, - "nix-health": { - "locked": { - "dir": "module", - "lastModified": 1716931776, - "narHash": "sha256-M4YqLtNAkj8pqG6dp7wHKz9EOecB3bWHp7WHyXIlMMc=", - "owner": "juspay", - "repo": "nix-health", - "rev": "2f8d8dc30121923192c78a8f5152c5c89fdf1809", - "type": "github" - }, - "original": { - "dir": "module", - "owner": "juspay", - "repo": "nix-health", - "type": "github" - } - }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1729333370, + "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb", "type": "github" }, "original": { @@ -631,11 +613,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -647,11 +629,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { diff --git a/home/fhauser/applications/default.nix b/home/fhauser/applications/default.nix index e95a095..f74c409 100644 --- a/home/fhauser/applications/default.nix +++ b/home/fhauser/applications/default.nix @@ -58,7 +58,6 @@ ] ++ [ # office - calibre libreoffice-fresh # TODO: Dictionaries, nixos/nixpkgs#14430 tectonic pandoc diff --git a/home/fhauser/multimedia.nix b/home/fhauser/multimedia.nix index 717b7d9..74917f4 100644 --- a/home/fhauser/multimedia.nix +++ b/home/fhauser/multimedia.nix @@ -21,7 +21,6 @@ home.packages = with pkgs; [ - vlc v4l-utils playerctl yt-dlp @@ -31,15 +30,14 @@ gnome-sound-recorder enblend-enfuse ffmpeg - mplayer - sox # TODO: mencoder? + #sox mencoder vorbis-tools vorbisgain opusTools flac lame id3lib - id3v2 # TODO: icedax? + id3v2 # icedax pasystray pavucontrol spotify @@ -49,9 +47,7 @@ gimp hugin lensfun - luminanceHDR darktable - gphoto2 inkscape ghostscript ] @@ -59,16 +55,17 @@ # Codecs for Audio and Video vobcopy libdv - libdvbpsi # TODO: librtmp? + libdvbpsi # librtmp xvidcore x264 - gst_all_1.gstreamer - gst_all_1.gst-vaapi - gst_all_1.gst-rtsp-server - gst_all_1.gst-libav - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-ugly - ]; + ] ++ (with gst_all_1; [ + gstreamer + gst-vaapi + gst-rtsp-server + gst-libav + gst-plugins-base + gst-plugins-bad + gst-plugins-good + gst-plugins-ugly + ]); }