Merge branch 'master' of https://github.com/Stunkymonkey/nixos

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" ];
       }
     );
   };
@@ -45,6 +44,9 @@ in
     ];
     exclude = [
       "/nix"
+      "/sys"
+      "/run"
+      "/proc"
       "/root/.cache/"
       "**/.Trash"
       "/tmp/*"

extra/clean.nix

@@ -1,9 +1,12 @@
 { config, lib, pkgs, ... }:
-
+let
+  unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
+in
 {
   environment.systemPackages = with pkgs; [
     baobab
-    #dupeguru
+    dupeguru
+    unstable.findimagedupes
     jdupes
     kondo
   ];

extra/default.nix

@@ -3,9 +3,9 @@ let
   unstable = import <nixos-unstable> { 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 = {
+  services.gnome.gnome-keyring.enable = true;
-    gnome-keyring.enable = true;
-    glib-networking.enable = true; # network-mount
-  };
-  # enable trash & network-mount
-  services.gvfs.enable = true;
 
   environment.systemPackages = with pkgs; [
     adwaita-qt
@@ -35,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
@@ -43,7 +42,6 @@ in
     gnome.file-roller
     gnome.gnome-calendar
     gnome.gnome-system-monitor
-    gnome.nautilus
     gnome.simple-scan
     keepassxc
     keychain
@@ -59,14 +57,21 @@ in
     qgnomeplatform
     rhythmbox
     simple-scan
-    #spotify
     socat
     sshuttle
     tdesktop
     thunderbird
     virtmanager
     vlc
-    mpv-with-scripts
+    (mpv-with-scripts.override {
+      scripts = with mpvScripts; [
+        convert
+        mpris
+        simple-mpv-webui
+        sponsorblock
+        thumbnail
+      ];
+    })
     wayvnc
     xdg-utils
     zathura

extra/development.nix

@@ -34,6 +34,7 @@ in
       scikitlearn
       scipy
       tqdm # progressbar in pandas
+      wheel # python development
     ]))
     ripgrep
     shellcheck

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;
+  };
 }

extra/media.nix

@@ -1,5 +1,6 @@
 { config, lib, pkgs, ... }:
 let
+  unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
   yt-dlp = pkgs.yt-dlp.override {
     withAlias = true;
   };
@@ -12,17 +13,19 @@ in
     gallery-dl
     graphviz
     handbrake
-    imagemagick
     image_optim
+    imagemagick
     inkscape
-    puddletag # audio tagging
+    unstable.mat2 # metadata-cleaning
+    mediaelch
+    mp3gain
     mp3splt # splitting mp3 files
     mp3val
-    mediaelch
     pdfsam-basic # pdf editing
-    picard
+    picard # music tagging
-    projectm
+    projectm # visualization of music
-    shotwell
+    puddletag # audio tagging
+    shotwell # photo management
     soundkonverter
     yt-dlp
   ];

extra/nautilus.nix

@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }:
+let
+  unstable = import <nixos-unstable> { 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; [
+    # 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
+  ];
+}

extra/nix.nix

@@ -1,8 +1,7 @@
 { config, lib, pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
-    nix-prefetch-git
+    nix-prefetch
-    nix-prefetch-github
     nix-update
     nixpkgs-fmt
     nixpkgs-lint

sway.nix

@@ -34,9 +34,7 @@
       wshowkeys
     ];
 
-
+    extraSessionCommands = ''
-    extraSessionCommands =
-      ''  
       export XDG_SESSION_TYPE=wayland
       export XDG_CURRENT_DESKTOP=sway
       export SDL_VIDEODRIVER=wayland