revive ezpcusr

home-manager/common.nix

@@ -39,6 +39,9 @@ inputs: {
       profile = lib.mkDefault "gpu-hq";
       ytdl-format = lib.mkDefault "bestvideo+bestaudio";
     };
+    scripts = with pkgs.mpvScripts; [
+      mpris
+    ];
   };
 
   home.packages = with pkgs; [

home-manager/modules/ezpcusr.nix

@@ -111,11 +111,6 @@ in {
       type = types.attrsOf (types.attrsOf types.str);
     };
 
-    waybarConfig = mkOption {
-      description = "Waybar config";
-      default = {};
-    };
-
     screensaver = mkOption {
       description = "ezpcusr screensaver";
       default = {};
@@ -195,7 +190,7 @@ in {
       '';
 
       config = {
-        terminal = lib.mkDefault "${pkgs.kitty}/bin/kitty";
+        terminal = lib.mkDefault "${pkgs.kermit-terminal}/bin/kermit";
 
         modifier = lib.mkDefault "Mod4";
 
@@ -264,6 +259,8 @@ in {
                 volumeUp = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%";
                 volumeDown = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%";
               in {
+                "${modifier}+q" = "kill";
+
                 "Print" = "exec ${scrsaveclip}";
                 "Shift+Print" =
                   if cfg.uploadScript != null
@@ -396,12 +393,13 @@ in {
       _JAVA_AWT_WM_NONREPARENTING = "1";
     };
 
+    programs.firefox.enable = true;
+
     programs.waybar = {
       enable = lib.mkDefault true;
       systemd.enable = lib.mkDefault true;
 
-      settings = [
+      settings.mainbar = {
-        ({
         position = "left";
         height = null;
 
@@ -409,7 +407,6 @@ in {
         modules-center = ["clock#1" "clock#2" "custom/spacer" "custom/media" "custom/spacer" "clock#3" "custom/spacer" "clock#4"];
         modules-right = ["pulseaudio" "custom/spacer" "memory" "custom/spacer" "cpu"] ++ lib.optionals cfg.battery ["custom/spacer" "battery"] ++ ["custom/spacer" "tray"];
 
-            modules = {
         "custom/spacer" = {
           format = "〰";
           rotate = 90;
@@ -501,9 +498,6 @@ in {
           spacing = 5;
         };
       };
-          }
-          // cfg.waybarConfig)
-      ];
 
       style = ''
         window#waybar {
@@ -603,8 +597,6 @@ in {
     ezcolors.enable = lib.mkDefault true;
     ezfonts.enable = lib.mkDefault true;
 
-    programs.chromium.enable = lib.mkDefault true;
-
     services.blueman-applet.enable = lib.mkDefault cfg.bluetooth;
 
     services.mpris-proxy.enable = lib.mkDefault true;
@@ -615,16 +607,12 @@ in {
         mopidy-mpris
         mopidy-youtube
         mopidy-local
-        (mopidy-mpd.overrideAttrs (old: {
+        mopidy-mpd
-          src = builtins.fetchGit {
-            url = "git+ssh://git@github.com/mopidy/mopidy-mpd.git";
-            rev = "a8c4debc139020fbb17066b66a746644a915296c";
-          };
-        }))
       ];
       settings = {
         youtube = {
           enabled = lib.mkDefault true;
+          allow_cache = lib.mkDefault true;
         };
 
         file = {
@@ -638,8 +626,8 @@ in {
 
         mpd = {
           enabled = lib.mkDefault true;
-          hostname = lib.mkDefault "::";
+          # hostname = lib.mkDefault "::";
-          command_blacklist = lib.mkDefault "";
+          # command_blacklist = lib.mkDefault "";
         };
       };
     };
@@ -659,42 +647,36 @@ in {
       platformTheme = lib.mkDefault "gtk";
     };
 
-    programs.kitty = {
+    programs.kermit = {
       enable = lib.mkDefault true;
       settings = {
-        background_opacity = lib.mkDefault "0.90";
+        opacity = lib.mkDefault "0.90";
-        dynamic_background_opacity = lib.mkDefault true;
+        key = lib.mkDefault "shift";
       };
     };
 
-    xdg.configFile."neofetch/config.conf".text = let
-      image = builtins.path {
-        name = "nixos_circlejerk.png";
-        path = ../data/nixos_circlejerk.png;
-      };
-    in ''
-      image_source="${image}"
-      image_backend="kitty"
-    '';
-
     xdg.enable = true;
     xdg.userDirs.enable = true;
 
-    xdg.mimeApps = {
+    xdg.configFile."mimeapps.list".force = true;
-      enable = true;
+    xdg.mimeApps = let
-      defaultApplications = {
+      applications = {
         "inode/directory" = "pcmanfm-qt.desktop";
 
-        "text/html" = "chromium-browser.desktop";
+        "text/html" = "librewolf.desktop";
-        "x-scheme-handler/http" = "chromium-browser.desktop";
+        "x-scheme-handler/http" = "librewolf.desktop";
-        "x-scheme-handler/https" = "chromium-browser.desktop";
+        "x-scheme-handler/https" = "librewolf.desktop";
-        "x-scheme-handler/about" = "chromium-browser.desktop";
+        "x-scheme-handler/about" = "librewolf.desktop";
 
         "application/zip" = "ark.desktop";
         "application/rar" = "ark.desktop";
         "application/7z" = "ark.desktop";
         "application/*tar" = "ark.desktop";
       };
+    in {
+      enable = true;
+      associations.added = applications;
+      defaultApplications = applications;
     };
 
     programs.mpv.enable = lib.mkDefault true;
@@ -726,7 +708,7 @@ in {
 
     programs.rofi = {
       enable = lib.mkDefault true;
-      terminal = lib.mkDefault "${pkgs.kitty}/bin/kitty";
+      terminal = lib.mkDefault "${pkgs.kermit-terminal}/bin/kermit";
     };
   };
 }