Merge remote-tracking branch 'origin/nixos' into nixos-work

modules/profiles/base.nix

@@ -14,6 +14,18 @@ let
     '';
   };
   nom-system-command = command: "${nom-system}/bin/nom-system && ${command}";
+
+  f = pkgs.writeFishApplication {
+    name = "f";
+    runtimeInputs = with pkgs; [ fzf bat ];
+    text = ''
+      #!/usr/bin/env fish
+      fzf --query "$argv" --multi --bind "enter:become($EDITOR {+})" --preview "bat --color=always --style=header,grid --line-range :500 {+}"
+    '';
+    completions = ''
+      complete -c f
+    '';
+  };
 in
 {
   users.users.moritz = {
@@ -58,7 +70,6 @@ in
       fish.enable = true;
       git.enable = true;
       gpg.enable = true;
-      navi.enable = true;
       nix = {
         gc.enable = true;
         optimise.enable = true;
@@ -116,6 +127,7 @@ in
     viu
     wget
     vim
+    f
   ];
 
   fonts.fonts = with pkgs; [
@@ -152,6 +164,7 @@ in
         enable = true;
         defaultOptions = [
           "--height 50%"
+          "--bind alt-j:preview-down,alt-k:preview-up"
         ];
       };
       zoxide.enable = true;

modules/profiles/desktop.nix

@@ -36,7 +36,25 @@ in
         nix-edit.enable = mkDefault true;
         nvim.enable = mkDefault true;
         python.versions."311".enable = mkDefault true;
-        spotify.enable = mkDefault true;
+        spotify-player = {
+          enable = mkDefault true;
+          package = pkgs.spotify-player.overrideAttrs (old: {
+            buildFeatures = lib.lists.remove "notify" (old.buildFeatures or [ ]);
+          });
+          config = {
+            client_id = "3172dbeaf64949728920c58b823bc24b";
+            copy_command = {
+              command = "wl-copy";
+              args = [ ];
+            };
+            enable_cover_image_cache = true;
+            default_device = "spotify-player-daemon";
+            enable_streaming = false;
+            playback_window_position = "Bottom";
+            cover_img_length = 20;
+            cover_img_width = 10;
+          };
+        };
         ssh.enable = mkDefault true;
         thunar.enable = mkDefault true;
         wallpaper.enable = mkDefault true;
@@ -47,6 +65,19 @@ in
         gammastep.enable = true;
         kdeconnect.enable = mkDefault true;
         printing.enable = true;
+        spotify-player = {
+          enable = mkDefault true;
+          config = {
+            client_id = "3172dbeaf64949728920c58b823bc24b";
+            device = {
+              name = "spotify-player-daemon";
+              device_type = "computer";
+              volume = 70;
+              bitrate = 320;
+              audio_cache = true;
+            };
+          };
+        };
         wireguard.enable = true;
       };
     };
@@ -75,6 +106,7 @@ in
     };
     services = {
       illum.enable = true;
+      resolved.enable = true;
       gnome.gnome-keyring.enable = true;
       pipewire = {
         enable = true;

modules/profiles/work.nix

@@ -13,7 +13,6 @@ in
   config = mkIf cfg.enable {
     my = {
       programs = {
-        code.enable = mkDefault true;
         ssh.enable = mkForce false;
         git.identity.email = mkDefault "moritz.boehme@l.de";
         hyprland = {
@@ -21,7 +20,7 @@ in
         };
         miracast.enable = mkDefault true;
         python.versions = {
-          "38".enable = mkDefault true;
+          # "38".enable = mkDefault true;
           "310".enable = mkDefault true;
           "311".enable = mkDefault true;
         };