feat: stuff

home/packages/default.nix

@@ -20,7 +20,7 @@
     # youtube-music.override {electron = pkgs.electron_28;})
     mpv
     makemkv
-    handbrake
+    # handbrake
     metadata-cleaner
     bitwarden
 
@@ -35,7 +35,7 @@
     apostrophe # markdown editor
 
     # creative
-    gimp-with-plugins
+    gimp
     inkscape-with-extensions
     scribus
     audacity
@@ -71,7 +71,6 @@
     gh
     git-filter-repo
     neofetch
-    pinentry-gnome
     ranger
     filezilla
     lazydocker

home/programs/affinity-photo.nix

@@ -1,32 +0,0 @@
-{
-  stdenv,
-  fetchurl,
-  pkgs,
-  p7zip,
-  wineWowPackages,
-  winetricks,
-}:
-stdenv.mkDerivation rec {
-  name = "affinity-photo";
-  version = "1.10.6";
-
-  src = ./affinity-photo-${version}.exe;
-  dontUnpack = true;
-
-  buildInputs = [wineWowPackages.stable winetricks];
-
-  installPhase = ''
-    mkdir -p $out/share/$name
-    cd $out/share/$name
-    ${p7zip}/bin/7z x $src
-
-    mkdir -p $out/bin
-    cd $out/bin
-    echo "#!${stdenv.shell}" >> $name
-    echo "export WINEARCH=win64" >> $name
-    echo "export WINEPREFIX=~/.config/$name" >> $name
-    echo "${winetricks}/bin/winetricks -q corefonts dotnet472" >> $name
-    echo "${wineWowPackages.stable}/bin/wine $out/share/$name/App.exe" >> $name
-    chmod +x $name
-  '';
-}

home/programs/bitwarden.nix

@@ -1,8 +0,0 @@
-{
-  enable = true;
-  settings = {
-    base_url = "pw.theaninova.de";
-    email = "pw@theaninova.de";
-    pinentry = "gnome3";
-  };
-}

home/programs/default.nix

@@ -1,7 +1,18 @@
-{pkgs, config, ...}: {
+{
+  pkgs,
+  config,
+  ...
+}: {
   programs = {
     home-manager.enable = true;
-    rbw = import ./bitwarden.nix;
+    rbw = {
+      enable = true;
+      settings = {
+        base_url = "pw.theaninova.de";
+        email = "pw@theaninova.de";
+        pinentry = pkgs.pinentry-gnome3;
+      };
+    };
     git = import ./git.nix;
     lazygit.enable = true;
     nixvim = import ./nixvim {inherit pkgs;};
@@ -16,7 +27,7 @@
     zsh = {
       enable = true;
       enableCompletion = true;
-      enableAutosuggestions = true;
+      autosuggestion.enable = true;
       syntaxHighlighting.enable = true;
       defaultKeymap = "viins";
     };

home/programs/nixvim/default.nix

@@ -229,7 +229,7 @@ in {
 
     trouble = {
       enable = true;
-      useDiagnosticSigns = true;
+      settings.use_diagnostic_signs = true;
     };
 
     treesitter = {
@@ -377,34 +377,36 @@ in {
         Copilot = "";
       };
     };
-    nvim-cmp = {
+    cmp = {
       enable = true;
-      mapping = {
-        "<C-n>" = "cmp.mapping.select_next_item({behavior = cmp.SelectBehavior.Select})";
-        "<C-p>" = "cmp.mapping.select_prev_item({behavior = cmp.SelectBehavior.Select})";
-        "<C-Space>" = "cmp.mapping.confirm({select = true})";
-        "<C-Enter>" = "cmp.mapping.complete()";
+      settings = {
+        mapping = {
+          "<C-n>" = "cmp.mapping.select_next_item({behavior = cmp.SelectBehavior.Select})";
+          "<C-p>" = "cmp.mapping.select_prev_item({behavior = cmp.SelectBehavior.Select})";
+          "<C-Space>" = "cmp.mapping.confirm({select = true})";
+          "<C-Enter>" = "cmp.mapping.complete()";
+        };
+        sources = [
+          {name = "copilot";}
+          {name = "path";}
+          {name = "luasnip";}
+          {
+            name = "npm";
+            keywordLength = 4;
+            priority = 10;
+          }
+          {name = "nvim_lsp";}
+          {name = "nvim_lsp_signature_help";}
+          {name = "nvim_lsp_document_symbol";}
+        ];
+        formatting.fields = ["abbr" "kind"];
+        snippet.expand = "luasnip";
+        window = {
+          completion.border = "rounded";
+          documentation.border = "rounded";
+        };
+        experimental.ghost_text = true;
       };
-      sources = [
-        {name = "copilot";}
-        {name = "path";}
-        {name = "luasnip";}
-        {
-          name = "npm";
-          keywordLength = 4;
-          priority = 10;
-        }
-        {name = "nvim_lsp";}
-        {name = "nvim_lsp_signature_help";}
-        {name = "nvim_lsp_document_symbol";}
-      ];
-      formatting.fields = ["abbr" "kind"];
-      snippet.expand = "luasnip";
-      window = {
-        completion.border = "rounded";
-        documentation.border = "rounded";
-      };
-      experimental.ghost_text = true;
     };
 
     which-key = {

home/services/default.nix

@@ -7,7 +7,7 @@
     gpg-agent = {
       enable = true;
       enableSshSupport = true;
-      pinentryFlavor = "gnome3";
+      pinentryPackage = pkgs.pinentry-gnome3;
     };
     # fix pinentry on non-gnome with this in
     # the system config: services.dbus.packages = with pkgs; [ gcr ];