fabianhauser/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Clean up dependencies and update inputs

Browse source
This commit is contained in:
Fabian Hauser 2024-10-19 22:28:18 +03:00
parent 6475c5fd02
commit e62fdad8b1
6 changed files with 31 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
defaults/base/unfree.nix
View file

@ -14,6 +14,7 @@
"steam" "steam"
"steam-run" "steam-run"
"steam-original" "steam-original"
"steam-unwrapped"
"hplip" "hplip"

3
defaults/desktop/desktop-environment.nix
View file

@ -14,7 +14,6 @@ in
[ [
# Utilities # Utilities
freetype freetype
feh
lxappearance lxappearance
sound-theme-freedesktop sound-theme-freedesktop
] ]
@ -22,7 +21,7 @@ in
# Various # Various
xfce.thunar xfce.thunar
xfce.thunar-archive-plugin xfce.thunar-archive-plugin
xfce.xfce4-appfinder # xfce.thunar-volman # needed? xfce.xfce4-appfinder
pinentry-rofi # Required by gnupg pinentry-rofi # Required by gnupg
qt5.qtwayland # Required for qt applications qt5.qtwayland # Required for qt applications
]; ];

2
defaults/desktop/security.nix
View file

@ -10,7 +10,7 @@
# Make pam accept both password and fingerprint # Make pam accept both password and fingerprint
security.pam.services.swaylock.rules.auth = { security.pam.services.swaylock.rules.auth = {
fprintd.order = 11600; fprintd.order = 11601;
unix.args = [ "nullok" ]; unix.args = [ "nullok" ];
}; };
} }

48
flake.lock generated
View file

@ -195,7 +195,6 @@
"flake-root": "flake-root_2", "flake-root": "flake-root_2",
"haskell-flake": "haskell-flake_2", "haskell-flake": "haskell-flake_2",
"heist-extra": "heist-extra_2", "heist-extra": "heist-extra_2",
"nix-health": "nix-health",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-unstable"
], ],
@ -204,11 +203,11 @@
"unionmount": "unionmount_2" "unionmount": "unionmount_2"
}, },
"locked": { "locked": {
"lastModified": 1727887125, "lastModified": 1729202851,
"narHash": "sha256-SBnUyYNDz3PYB9b71GDP1SAOMLPAALdbzqWgb8hdVSA=", "narHash": "sha256-Kd56DefIoCqt9MhyNkKoJJypcLXlJrSdYn4r5WNFucI=",
"owner": "srid", "owner": "srid",
"repo": "emanote", "repo": "emanote",
"rev": "94cbcba6ffdcfd9fbcae2d06ce073dd0b4ad74c7", "rev": "1953f5aac8a21ea553829a5fbcfb7bf5b792baad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -494,11 +493,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728644079, "lastModified": 1729321331,
"narHash": "sha256-TE8d5So6ur58hN+9V1o+A6tF30+3jrFvCpeZker3Pug=", "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "582830954264080aae93f751c3cdc58df600d2d1", "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -535,30 +534,13 @@
"type": "github" "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": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1728269138, "lastModified": 1729333370,
"narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -631,11 +613,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1728492678, "lastModified": 1729256560,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -647,11 +629,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1728492678, "lastModified": 1729256560,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
home/fhauser/applications/default.nix
View file

@ -58,7 +58,6 @@
] ]
++ [ ++ [
# office # office
calibre
libreoffice-fresh # TODO: Dictionaries, nixos/nixpkgs#14430 libreoffice-fresh # TODO: Dictionaries, nixos/nixpkgs#14430
tectonic tectonic
pandoc pandoc

29
home/fhauser/multimedia.nix
View file

@ -21,7 +21,6 @@
home.packages = home.packages =
with pkgs; with pkgs;
[ [
vlc
v4l-utils v4l-utils
playerctl playerctl
yt-dlp yt-dlp
@ -31,15 +30,14 @@
gnome-sound-recorder gnome-sound-recorder
enblend-enfuse enblend-enfuse
ffmpeg ffmpeg
mplayer #sox mencoder
sox # TODO: mencoder?
vorbis-tools vorbis-tools
vorbisgain vorbisgain
opusTools opusTools
flac flac
lame lame
id3lib id3lib
id3v2 # TODO: icedax? id3v2 # icedax
pasystray pasystray
pavucontrol pavucontrol
spotify spotify
@ -49,9 +47,7 @@
gimp gimp
hugin hugin
lensfun lensfun
luminanceHDR
darktable darktable
gphoto2
inkscape inkscape
ghostscript ghostscript
] ]
@ -59,16 +55,17 @@
# Codecs for Audio and Video # Codecs for Audio and Video
vobcopy vobcopy
libdv libdv
libdvbpsi # TODO: librtmp? libdvbpsi # librtmp
xvidcore xvidcore
x264 x264
gst_all_1.gstreamer ] ++ (with gst_all_1; [
gst_all_1.gst-vaapi gstreamer
gst_all_1.gst-rtsp-server gst-vaapi
gst_all_1.gst-libav gst-rtsp-server
gst_all_1.gst-plugins-base gst-libav
gst_all_1.gst-plugins-bad gst-plugins-base
gst_all_1.gst-plugins-good gst-plugins-bad
gst_all_1.gst-plugins-ugly gst-plugins-good
]; gst-plugins-ugly
]);
} }