From 129fd1f6dc5135b6bc77e8287c1dcb6a0d82e492 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 6 Feb 2022 14:15:52 +0100 Subject: [PATCH 01/12] extra/media: add mat2 --- extra/media.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/extra/media.nix b/extra/media.nix index 37a5b88..f9eac9f 100644 --- a/extra/media.nix +++ b/extra/media.nix @@ -1,5 +1,6 @@ { config, lib, pkgs, ... }: let + unstable = import { config = { allowUnfree = true; }; }; yt-dlp = pkgs.yt-dlp.override { withAlias = true; }; @@ -12,16 +13,17 @@ in gallery-dl graphviz handbrake - imagemagick image_optim + imagemagick inkscape - puddletag # audio tagging + unstable.mat2 # metadata-cleaning + mediaelch mp3splt # splitting mp3 files mp3val - mediaelch pdfsam-basic # pdf editing picard projectm + puddletag # audio tagging shotwell soundkonverter yt-dlp From 822afe8a1197537851c8440527d98e4ff91eefed Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 6 Feb 2022 14:16:22 +0100 Subject: [PATCH 02/12] extra/docker: enable auto-prune --- extra/docker.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/extra/docker.nix b/extra/docker.nix index 295d22e..4a90663 100644 --- a/extra/docker.nix +++ b/extra/docker.nix @@ -1,8 +1,13 @@ { config, pkgs, ... }: { - virtualisation.docker.enable = true; environment.systemPackages = with pkgs; [ + docker docker_compose ]; + + virtualisation.docker = { + enable = true; + autoPrune.enable = true; + }; } From d7a5727602c0126770df77a0f57c3d948982bc47 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 6 Feb 2022 14:17:34 +0100 Subject: [PATCH 03/12] extra/nautilus: make a separate file for all configurations --- extra/default.nix | 11 ++--------- extra/nautilus.nix | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 extra/nautilus.nix diff --git a/extra/default.nix b/extra/default.nix index 8917cb5..5b73f9e 100644 --- a/extra/default.nix +++ b/extra/default.nix @@ -3,9 +3,9 @@ let unstable = import { config = { allowUnfree = true; }; }; in { - imports = [ ./fonts.nix + ./nautilus.nix ]; programs.gnome-disks.enable = true; @@ -19,12 +19,7 @@ in # gnome services services.dbus.packages = [ pkgs.gnome.dconf ]; services.udev.packages = [ pkgs.gnome.gnome-settings-daemon ]; - services.gnome = { - gnome-keyring.enable = true; - glib-networking.enable = true; # network-mount - }; - # enable trash & network-mount - services.gvfs.enable = true; + services.gnome.gnome-keyring.enable = true; environment.systemPackages = with pkgs; [ adwaita-qt @@ -43,7 +38,6 @@ in gnome.file-roller gnome.gnome-calendar gnome.gnome-system-monitor - gnome.nautilus gnome.simple-scan keepassxc keychain @@ -59,7 +53,6 @@ in qgnomeplatform rhythmbox simple-scan - #spotify socat sshuttle tdesktop diff --git a/extra/nautilus.nix b/extra/nautilus.nix new file mode 100644 index 0000000..c07b62d --- /dev/null +++ b/extra/nautilus.nix @@ -0,0 +1,22 @@ +{ config, lib, pkgs, ... }: +let + unstable = import { config = { allowUnfree = true; }; }; +in +{ + # enable trash & network-mount + services.gvfs.enable = true; + + environment.sessionVariables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0"; + environment.pathsToLink = [ + "/share/nautilus-python/extensions" + ]; + + services.gnome.glib-networking.enable = true; # network-mount + + environment.systemPackages = with pkgs; [ + gnome.nautilus + gnome.nautilus-python + shared-mime-info + unstable.nautilus-open-any-terminal + ]; +} From 211371889104684af59435051c093555379f2673 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 7 Feb 2022 12:02:17 +0100 Subject: [PATCH 04/12] extra/clean: add findimagedupes --- extra/clean.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/extra/clean.nix b/extra/clean.nix index ad868a2..e00be02 100644 --- a/extra/clean.nix +++ b/extra/clean.nix @@ -1,9 +1,12 @@ { config, lib, pkgs, ... }: - +let + unstable = import { config = { allowUnfree = true; }; }; +in { environment.systemPackages = with pkgs; [ baobab - #dupeguru + dupeguru + unstable.findimagedupes jdupes kondo ]; From 6fde591af63c7cf0a6071a650fc74e7acc8c5ce4 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 9 Feb 2022 17:38:37 +0100 Subject: [PATCH 05/12] backup: replace ping to google with systemd-network-online.target --- backup.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/backup.nix b/backup.nix index fe31f20..a398253 100644 --- a/backup.nix +++ b/backup.nix @@ -17,17 +17,16 @@ let } // flip mapAttrs' config.services.borgbackup.jobs (name: value: nameValuePair "borgbackup-job-${name}" { unitConfig.OnFailure = "notify-problems@%i.service"; - preStart = lib.mkBefore '' - # waiting for internet after resume-from-suspend - until /run/wrappers/bin/ping google.com -c1 -q >/dev/null; do :; done - ''; } ); - # forces backup after boot in case server was powered off during scheduled event config.systemd.timers = flip mapAttrs' config.services.borgbackup.jobs (name: value: nameValuePair "borgbackup-job-${name}" { + # forces backup after boot in case server was powered off during scheduled event timerConfig.Persistent = true; + # only if network is available + wantedBy = [ "timers.target" ]; + after = [ "network-online.target" ]; } ); }; From da27bd663fa1b6a3f1757d1e68223c610c05a7d0 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 9 Feb 2022 17:39:12 +0100 Subject: [PATCH 06/12] backup: exclude sys/run/proc --- backup.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backup.nix b/backup.nix index a398253..d5d344d 100644 --- a/backup.nix +++ b/backup.nix @@ -44,6 +44,9 @@ in ]; exclude = [ "/nix" + "/sys" + "/run" + "/proc" "/root/.cache/" "**/.Trash" "/tmp/*" From a420ea82dd7c1203251e456afbcf54e02312900f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 23:14:45 +0100 Subject: [PATCH 07/12] sway: fix line-indentation --- sway.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sway.nix b/sway.nix index 856bee8..6be57d3 100644 --- a/sway.nix +++ b/sway.nix @@ -34,9 +34,7 @@ wshowkeys ]; - - extraSessionCommands = - '' + extraSessionCommands = '' export XDG_SESSION_TYPE=wayland export XDG_CURRENT_DESKTOP=sway export SDL_VIDEODRIVER=wayland From a9088a0c671dfd322a1c1903b39bbfc7efd6861f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 1 Mar 2022 16:24:49 +0100 Subject: [PATCH 08/12] extra/media: add mp3gain --- extra/media.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/extra/media.nix b/extra/media.nix index f9eac9f..9f28ac2 100644 --- a/extra/media.nix +++ b/extra/media.nix @@ -18,13 +18,14 @@ in inkscape unstable.mat2 # metadata-cleaning mediaelch + mp3gain mp3splt # splitting mp3 files mp3val pdfsam-basic # pdf editing - picard - projectm + picard # music tagging + projectm # visualization of music puddletag # audio tagging - shotwell + shotwell # photo management soundkonverter yt-dlp ]; From 7f4791e304e3b21cd4343e5d8b7bc1d0edbdf8d6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Mar 2022 12:53:59 +0100 Subject: [PATCH 09/12] extra/development: add python.wheel --- extra/development.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/extra/development.nix b/extra/development.nix index b05e221..7e6271b 100644 --- a/extra/development.nix +++ b/extra/development.nix @@ -34,6 +34,7 @@ in scikitlearn scipy tqdm # progressbar in pandas + wheel # python development ])) ripgrep shellcheck From 904d8c4357a910d511d52ab349f2d6dde5bc5ee0 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Mar 2022 12:54:25 +0100 Subject: [PATCH 10/12] extra/nix: replace nix-prefetch-* with nix-prefetch --- extra/nix.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extra/nix.nix b/extra/nix.nix index 2bf59bf..0454775 100644 --- a/extra/nix.nix +++ b/extra/nix.nix @@ -1,8 +1,7 @@ { config, lib, pkgs, ... }: { environment.systemPackages = with pkgs; [ - nix-prefetch-git - nix-prefetch-github + nix-prefetch nix-update nixpkgs-fmt nixpkgs-lint From a48c2321c9a24f4b1c5f8bdc6d2ee2ee8e33c708 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 2 Apr 2022 15:30:18 +0200 Subject: [PATCH 11/12] extra/nautilus: enable video thumbnails --- extra/nautilus.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/extra/nautilus.nix b/extra/nautilus.nix index c07b62d..36ae45b 100644 --- a/extra/nautilus.nix +++ b/extra/nautilus.nix @@ -14,9 +14,16 @@ in services.gnome.glib-networking.enable = true; # network-mount environment.systemPackages = with pkgs; [ + # thumbnails + ffmpegthumbnailer gnome.nautilus + # enable plugins gnome.nautilus-python + # thumbnails + gst_all_1.gst-libav + # default-programms shared-mime-info + # terminal-context-entry unstable.nautilus-open-any-terminal ]; } From 4a48ae92f2f25711e8128cc819ff85f676d6b7bf Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 2 Apr 2022 15:30:45 +0200 Subject: [PATCH 12/12] extra/default: add plugins to mpv --- extra/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/extra/default.nix b/extra/default.nix index 5b73f9e..6b11320 100644 --- a/extra/default.nix +++ b/extra/default.nix @@ -30,7 +30,11 @@ in firefox-wayland #geary ghostwriter - (gimp-with-plugins.override { plugins = with gimpPlugins; [ resynthesizer ]; }) + (gimp-with-plugins.override { + plugins = with gimpPlugins; [ + resynthesizer + ]; + }) glib gnome.adwaita-icon-theme gnome.dconf-editor @@ -59,7 +63,15 @@ in thunderbird virtmanager vlc - mpv-with-scripts + (mpv-with-scripts.override { + scripts = with mpvScripts; [ + convert + mpris + simple-mpv-webui + sponsorblock + thumbnail + ]; + }) wayvnc xdg-utils zathura