chore(nvim): update lazy lock

refactor(nix-hm): various improvements
refactor(nix-hm): improve bob-nvim flake
2024-02-04 22:27:26 -06:00 · 2024-02-04 22:27:21 -06:00 · 2024-02-04 22:27:10 -06:00 · 2024-02-04 22:26:19 -06:00
8 changed files with 414 additions and 115 deletions
--- a/config/default.nix
+++ b/config/default.nix
@ -71,6 +71,15 @@ in {
        typstfmt
        typst
        hurl
+        easyeffects
+        egl-wayland
+      ] ++ [
+        libsForQt5.qtstyleplugins
+        libsForQt5.qtcurve
+        qt6Packages.qt6gtk2
+        gtk-engine-murrine
+        gnome.gnome-themes-extra
+        gtk_engines
      ] ++ [ ansible ansible-lint ] ++ [
        # gnumake
        # cmake
@ -101,6 +110,7 @@ in {
    sessionVariables = {
      GTK_THEME = "Kanagawa-Borderless";
      QT_QPA_PLATFORMTHEME = "${gtkStyle}";
+      GTK_PATH = "${config.home.homeDirectory}/.nix-profile/lib/gtk-2.0";
      # LD_LIBRARY_PATH = "${config.home.homeDirectory}/.nix-profile/lib";
      # PKG_CONFIG_PATH = "${config.home.homeDirectory}/.nix-profile/lib/pkgconfig";
    };
@ -133,6 +143,11 @@ in {
    };
  };

+  qt = {
+    enable = true;
+    platformTheme = "gtk";
+  };
+
  gtk = let
    extraGtkConfig = {
      gtk-application-prefer-dark-theme = true;
@ -162,34 +177,16 @@ in {
    gtk4.extraConfig = extraGtkConfig;
  };

-  services = { cliphist = { enable = true; }; };
+  services = {
+    cliphist.enable = true;
+    easyeffects.enable = true;
+    opensnitch-ui.enable = true;
+  };

  systemd.user = {
-    targets.compositor = {
-      Unit = {
-        Description = "Compositor target for WM";
-        After = [ "graphical-session.target" ];
-        PartOf = [ "graphical-session.target" ];
-      };
-    };
    services = {
-      opensnitch-ui = {
-        Unit = {
-          Description = "Opensnitch ui";
-          PartOf = [ "compositor.target" ];
-          After = [ "compositor.target" ];
-          ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
-        };
-
-        Service = { ExecStart = "${pkgs.opensnitch-ui}/bin/opensnitch-ui"; };
-
-        environment = {
-          QT_QPA_PLATFORMTHEME = "${gtkStyle}";
-          PATH = "${config.home.profileDirectory}/bin";
-        };
-
-        Install = { WantedBy = [ "compositor.target" ]; };
-      };
+      opensnitch-ui.Unit.ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
+      easyeffects.Unit.ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
    };
  };
 }
--- a/dots/.config/nvim/lazy-lock.json
+++ b/dots/.config/nvim/lazy-lock.json
@ -1,7 +1,7 @@
 {
  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
  "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" },
-  "actions-preview.nvim": { "branch": "master", "commit": "dd63df1a4ed0ffe1458945ee50ecb1dd02b605ab" },
+  "actions-preview.nvim": { "branch": "master", "commit": "9e86d014a72a4121ee27f3d8952e1ea868c3c8c4" },
  "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" },
  "bufdelete.nvim": { "branch": "master", "commit": "0b9c0f182b09c51170bb9f252f15de7695e4d507" },
  "ccc.nvim": { "branch": "main", "commit": "ec6e23fd2c0bf4ffcf71c1271acdcee6e2c6f49c" },
@ -19,7 +19,7 @@
  "cmp-rg": { "branch": "master", "commit": "677a7874ee8f1afc648c2e7d63a97bc21a7663c5" },
  "cmp-zsh": { "branch": "main", "commit": "c24db8e58fac9006ec23d93f236749288d00dec9" },
  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "crates.nvim": { "branch": "main", "commit": "2bd990871f0aef159933bd5fe6da421690a832b9" },
+  "crates.nvim": { "branch": "main", "commit": "ec2b04a380c9f3a8e6ca38c230e4990d71978143" },
  "csharpls-extended-lsp.nvim": { "branch": "master", "commit": "bde4aebe0dc74952188c2130c6831a1d8e4ce5c6" },
  "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
  "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" },
@ -29,13 +29,13 @@
  "fuzzy.nvim": { "branch": "master", "commit": "67a42ad2fa6d5ff41f0ef3cf69bb247410da5d7a" },
  "gitlinker.nvim": { "branch": "master", "commit": "f6705d4f38cc2727c34f196a49700d0d7c6f7464" },
  "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
-  "gx.nvim": { "branch": "main", "commit": "eba0eef8143060428c9baf9b14bda6f76b5547b3" },
+  "gx.nvim": { "branch": "main", "commit": "78070bbd8e7e15a1623cdd6832a9529d2ee63e0c" },
  "headlines.nvim": { "branch": "master", "commit": "e3d7bfdf40e41a020d966d35f8b48d75b90367d2" },
  "heirline.nvim": { "branch": "master", "commit": "1b6f12e011f225a26aa162905cbf68804479e7e6" },
  "highlight-undo.nvim": { "branch": "main", "commit": "50a6884a8476be04ecce8f1c4ed692c5000ef0a1" },
  "hlargs.nvim": { "branch": "main", "commit": "e881f3a424139cc70c83121ec548732efdd67682" },
  "hop.nvim": { "branch": "master", "commit": "6d853addd6e11df8338b26e869a29b36f2c3e893" },
-  "hurl.nvim": { "branch": "main", "commit": "ab43ee76f9b4796320821dec531ccb023d6e1781" },
+  "hurl.nvim": { "branch": "main", "commit": "fe043c1b67714a78a77e22c8d4e652bc0451453c" },
  "hydra.nvim": { "branch": "master", "commit": "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0" },
  "image.nvim": { "branch": "master", "commit": "21f2073505d8c475008512db59bbd82ccc9ec5d5" },
  "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" },
@ -47,20 +47,20 @@
  "lsp_lines.nvim": { "branch": "main", "commit": "cf2306dd332e34a3e91075b40bdd4f6db824b2ee" },
  "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "2b3d247fce06f53934174f5dfe0362c42d65c00c" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" },
  "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
-  "mini.nvim": { "branch": "main", "commit": "d1413e1cacaacd29e420b9482754e762076e64ac" },
+  "mini.nvim": { "branch": "main", "commit": "9adc2eeec07f3ee65d54f7ceb791ad8fead49c92" },
  "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
  "nabla.nvim": { "branch": "master", "commit": "27a6ea9ed7452bb9e0b19eb0942b5bcf7d051b2f" },
  "neo-tree.nvim": { "branch": "main", "commit": "c2a9e81699021f4ccaac7c574cc42ca4211a499a" },
-  "neodev.nvim": { "branch": "main", "commit": "2793ba3127c2c93ee486b9072a3ef129eeb950cc" },
-  "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" },
+  "neodev.nvim": { "branch": "main", "commit": "0ee95ecefc8ea45898a0383364f736e098c8703f" },
+  "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" },
  "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" },
-  "neogit": { "branch": "master", "commit": "89a485c4cf39275676fe77d9cc004e4c53119114" },
-  "neoscroll.nvim": { "branch": "master", "commit": "be4ebf855a52f71ca4338694a5696675d807eff9" },
+  "neogit": { "branch": "master", "commit": "a3f23af6f1b12938745092c4b427c732c79effe7" },
+  "neoscroll.nvim": { "branch": "master", "commit": "6e3546751076890304428150e53bd59198a4505d" },
  "netman.nvim": { "branch": "main", "commit": "6f1e2687d6e534e588d8281b987f33c3f0870e8a" },
  "nibbler": { "branch": "main", "commit": "8bbdb43f1d5c35b71ca0e9df57e3a77462c8abbf" },
-  "no-neck-pain.nvim": { "branch": "main", "commit": "fc3cc9012d9720aca3203702447caa59bd93f1a6" },
+  "no-neck-pain.nvim": { "branch": "main", "commit": "910f3d111cbdaed950aee4abedafd54abaeba51b" },
  "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
  "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" },
  "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" },
@ -75,19 +75,19 @@
  "nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
  "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" },
  "nvim-lint": { "branch": "master", "commit": "76af3422e3c82ea40adf9ade1ccf1dc1eb361789" },
-  "nvim-lspconfig": { "branch": "master", "commit": "9a6279953c82d01b58825a46ede032ab246a5983" },
+  "nvim-lspconfig": { "branch": "master", "commit": "d12140c5687a1186b95b3f42dbc6cc769df0cf0d" },
  "nvim-neoclip.lua": { "branch": "main", "commit": "798cd0592a81c185465db3a091a0ff8a21af60fd" },
  "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" },
  "nvim-surround": { "branch": "main", "commit": "f81bbef3da28bd2a7d5a736575c71f3f953d49f9" },
-  "nvim-treesitter": { "branch": "master", "commit": "1cda98132abfde758c1778096960f9b2c0bd78c1" },
+  "nvim-treesitter": { "branch": "master", "commit": "4fbf150a1621d52f17b099506e1a32f107079210" },
  "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" },
  "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" },
  "nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" },
  "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" },
  "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
  "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" },
-  "nvim-various-textobjs": { "branch": "main", "commit": "ca9e6f290c25f6a3168c5dd64b9ef0a8000263d9" },
-  "nvim-web-devicons": { "branch": "master", "commit": "aaec87dbdaa776bfa0a13c8694bec9bcb7454719" },
+  "nvim-various-textobjs": { "branch": "main", "commit": "035243ea3c4bf005b24d8068666c7d571c708503" },
+  "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" },
  "octo.nvim": { "branch": "master", "commit": "f8db415529f0a28f62484e49e3518b48e2b76644" },
  "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "4be2e8689067494ed7e5a4f1221adc31d1a07783" },
  "org-bullets.nvim": { "branch": "main", "commit": "6e0d60e901bb939eb526139cb1f8d59065132fd9" },
@ -97,8 +97,8 @@
  "rainbow-delimiters.nvim": { "branch": "master", "commit": "ca8d5ee2b4ee1eec491040a7601d366ddc8a2e02" },
  "rest.nvim": { "branch": "main", "commit": "2d7bd3d398940ce2692941e6cd052c072207b9f9" },
  "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
-  "rustaceanvim": { "branch": "master", "commit": "4d7cc0cbc0e7bd86ec8fa4214eb67bbf4c81e51d" },
-  "schemastore.nvim": { "branch": "main", "commit": "be4d1084397c9b9d3d5a41bda871e6b20415bf48" },
+  "rustaceanvim": { "branch": "master", "commit": "18b5442a418e38b8527d2c43892e266963a8778e" },
+  "schemastore.nvim": { "branch": "main", "commit": "17de2914bad410d391f184bb14f2a7327777ca38" },
  "sqlite.lua": { "branch": "master", "commit": "b7e28c8463254c46a8e61c52d27d6a2040492fc3" },
  "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" },
  "telescope-frecency.nvim": { "branch": "master", "commit": "a61ede8740643f09e1a7706fbb49b152e8f25d42" },
@ -106,7 +106,7 @@
  "telescope-smart-history.nvim": { "branch": "master", "commit": "81a4cceaa54d65d5f7c7c26178ee63b634d3e26d" },
  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
  "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
-  "telescope.nvim": { "branch": "master", "commit": "7b5c5f56a21e82fdcfe5b250278b8dfc4b1cbab4" },
+  "telescope.nvim": { "branch": "master", "commit": "236083884cfe6c874e03e6cb4e7cb08809c1333c" },
  "telescope_find_directories": { "branch": "main", "commit": "30a29238eca7be1d2eeae7c814f6c0f20bc21931" },
  "tint.nvim": { "branch": "master", "commit": "862835626941d263466754b9c8e2ce2cb004f5ac" },
  "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
--- a/flake.lock
+++ b/flake.lock
@ -10,7 +10,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-dRRtI4CfEMyPwPv8zwKkSfOZaGGsXVoUg2Lgp0yIj2M=",
+        "narHash": "sha256-6cl1q7lxmZDhRtjfRpPCFS4PfSV/o+QSPdmf0Wqdrg4=",
        "path": "./pkgs/bob-nvim",
        "type": "path"
      },
@ -35,18 +35,54 @@
        "type": "github"
      }
    },
+    "deepfilternet": {
+      "inputs": {
+        "deepfilternet-src": "deepfilternet-src",
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1,
+        "narHash": "sha256-abU7HokEfv6JC76SPSMQZsoflzDfL58rfgaiPy4fX9E=",
+        "path": "./pkgs/deepfilternet",
+        "type": "path"
+      },
+      "original": {
+        "path": "./pkgs/deepfilternet",
+        "type": "path"
+      }
+    },
+    "deepfilternet-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1693481377,
+        "narHash": "sha256-5bYbfO1kmduNm9YV5niaaPvRIDRmPt4QOX7eKpK+sWY=",
+        "owner": "Rikorose",
+        "repo": "DeepFilterNet",
+        "rev": "978576aa8400552a4ce9730838c635aa30db5e61",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Rikorose",
+        "repo": "DeepFilterNet",
+        "rev": "978576aa8400552a4ce9730838c635aa30db5e61",
+        "type": "github"
+      }
+    },
    "emacs-overlay": {
      "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
        "nixpkgs": "nixpkgs",
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1706807251,
-        "narHash": "sha256-FIQFLSw/5s6Urs9RtZP7FzXCyyBCrmFEc2N0iwmgYe8=",
+        "lastModified": 1707099004,
+        "narHash": "sha256-O5LZdwF6QL6Vt8RVnmtiYIt0ZD/vhwnHf2k4sHG8xog=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "ad0b983479cb072cb0e97c9609c11d9e5aeced34",
+        "rev": "b7c67b5f71db89ec27e1aa4413fbbcdf5bbfa451",
        "type": "github"
      },
      "original": {
@ -153,6 +189,24 @@
      "inputs": {
        "systems": "systems_3"
      },
+      "locked": {
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
+      "inputs": {
+        "systems": "systems_4"
+      },
      "locked": {
        "lastModified": 1701680307,
        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
@ -167,9 +221,9 @@
        "type": "github"
      }
    },
-    "flake-utils_4": {
+    "flake-utils_5": {
      "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_5"
      },
      "locked": {
        "lastModified": 1705309234,
@ -248,11 +302,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1706798041,
-        "narHash": "sha256-BbvuF4CsVRBGRP8P+R+JUilojk0M60D7hzqE0bEvJBQ=",
+        "lastModified": 1707088232,
+        "narHash": "sha256-nxPBAZ//BwKkBcjwLE5g9zTq29g7gccTnH5+CeMTxpA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "4d53427bce7bf3d17e699252fd84dc7468afc46e",
+        "rev": "4740f2ccda184e9cc509d7a82b26d7271e0c79d9",
        "type": "github"
      },
      "original": {
@ -280,7 +334,7 @@
    },
    "neovim-flake": {
      "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
        "nixpkgs": [
          "neovim-nightly-overlay",
          "nixpkgs"
@ -326,11 +380,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1706550542,
-        "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
+        "lastModified": 1706913249,
+        "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
+        "rev": "e92b6015881907e698782c77641aa49298330223",
        "type": "github"
      },
      "original": {
@ -342,11 +396,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1706515015,
-        "narHash": "sha256-eFfY5A7wlYy3jD/75lx6IJRueg4noE+jowl0a8lIlVo=",
+        "lastModified": 1706826059,
+        "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4",
+        "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d",
        "type": "github"
      },
      "original": {
@ -374,11 +428,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1706683685,
-        "narHash": "sha256-FtPPshEpxH/ewBOsdKBNhlsL2MLEFv1hEnQ19f/bFsQ=",
+        "lastModified": 1706925685,
+        "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5ad9903c16126a7d949101687af0aa589b1d7d3d",
+        "rev": "79a13f1437e149dc7be2d1290c74d378dad60814",
        "type": "github"
      },
      "original": {
@ -391,6 +445,7 @@
    "root": {
      "inputs": {
        "bob": "bob",
+        "deepfilternet": "deepfilternet",
        "emacs-overlay": "emacs-overlay",
        "home-manager": "home-manager",
        "neovim-nightly-overlay": "neovim-nightly-overlay",
@ -483,9 +538,24 @@
        "type": "github"
      }
    },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "wezterm": {
      "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_5",
        "freetype2": "freetype2",
        "harfbuzz": "harfbuzz",
        "libpng": "libpng",
@ -497,11 +567,11 @@
      },
      "locked": {
        "dir": "nix",
-        "lastModified": 1706833122,
-        "narHash": "sha256-IcOZrCP7uSapBRuAYoXeXE8G9TdaSWgRM9pJkf0rkTw=",
+        "lastModified": 1707064947,
+        "narHash": "sha256-m76FLPey25grg+KmL2u9S0TEyDBQxvALYkKnqGQHO7k=",
        "owner": "wez",
        "repo": "wezterm",
-        "rev": "17dadbeb1e170dc76c97afcdeae4ed27a50e99e5",
+        "rev": "bed5141d6e07f2e82ad68cb73feb7b7949460aad",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -7,6 +7,10 @@
      url = "path:./pkgs/bob-nvim";
      inputs.nixpkgs.follows = "nixpkgs";
    };
+    deepfilternet = {
+      url = "path:./pkgs/deepfilternet";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
    home-manager = {
      url = "github:nix-community/home-manager";
      inputs.nixpkgs.follows = "nixpkgs";
@ -19,48 +23,48 @@
    };
  };

-  outputs = inputs @ { home-manager, nixpkgs, ... }:
+  outputs = inputs@{ home-manager, nixpkgs, ... }:
    let
      system = "x86_64-linux";
      username = "sam";
-    in
-    {
+      lib = nixpkgs.lib;
+    in {
      defaultPackage.x86_64-linux = home-manager.defaultPackage.x86_64-linux;
      targets.genericLinux.enable = true;
-      homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration rec {
-        pkgs = nixpkgs.legacyPackages.${system};
-        extraSpecialArgs = {
-          inherit inputs;
-        };
-        modules = [
-          ({
-            nixpkgs.overlays = [
-              inputs.neovim-nightly-overlay.overlay
-              inputs.emacs-overlay.overlays.emacs
-              (self: super: {
-                kanagawa-gtk-theme = super.callPackage ./pkgs/kanagawa-gtk { };
-                lxappearance = super.lxappearance.overrideAttrs (oldAttrs: {
-                  postInstall = ''
-                    wrapProgram $out/bin/lxappearance --prefix GDK_BACKEND : x11
-                  '';
-                });
-                bob-nvim = inputs.bob.overlays.${system}.default;
-                opensnitch-ui = super.opensnitch-ui.overrideAttrs
-                  (oldAttrs: rec {
-                    propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [
-                      super.python311Packages.qt-material
-                    ];
+      homeConfigurations.${username} =
+        home-manager.lib.homeManagerConfiguration rec {
+          pkgs = nixpkgs.legacyPackages.${system};
+          extraSpecialArgs = { inherit inputs; };
+          modules = [
+            ({
+              nixpkgs.overlays = [
+                inputs.neovim-nightly-overlay.overlay
+                inputs.emacs-overlay.overlays.emacs
+                inputs.bob.overlays.default
+                inputs.deepfilternet.overlays.default
+                (final: prev:
+                {
+                  kanagawa-gtk-theme = prev.callPackage ./pkgs/kanagawa-gtk { };
+                  lxappearance = prev.lxappearance.overrideAttrs (oldAttrs: {
+                    postInstall = ''
+                      wrapProgram $out/bin/lxappearance --prefix GDK_BACKEND : x11
+                    '';
                  });
-              })
-            ];
-            home = {
-              username = "${username}";
-              homeDirectory = "/home/${username}";
-              stateVersion = "24.05";
-            };
-          })
-          ./config
-        ];
-      };
+                  opensnitch-ui = prev.opensnitch-ui.overrideAttrs
+                    (oldAttrs: rec {
+                      propagatedBuildInputs = oldAttrs.propagatedBuildInputs
+                        ++ [ prev.python311Packages.qt-material ];
+                    });
+                })
+              ];
+              home = {
+                username = "${username}";
+                homeDirectory = "/home/${username}";
+                stateVersion = "24.05";
+              };
+            })
+            ./config
+          ];
+        };
    };
 }
--- a/pkgs/bob-nvim/flake.lock
+++ b/pkgs/bob-nvim/flake.lock
@ -0,0 +1,78 @@
+{
+  "nodes": {
+    "bob": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1706612487,
+        "narHash": "sha256-OTmsb1tnautQTdO/oeqbwd5MmyHbG946/kPCGSluIrM=",
+        "owner": "MordechaiHadad",
+        "repo": "bob",
+        "rev": "e521723d2c084f4b610c27d79f870f83e964fe95",
+        "type": "github"
+      },
+      "original": {
+        "owner": "MordechaiHadad",
+        "repo": "bob",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1706925685,
+        "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "79a13f1437e149dc7be2d1290c74d378dad60814",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "bob": "bob",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
--- a/pkgs/bob-nvim/flake.nix
+++ b/pkgs/bob-nvim/flake.nix
@ -16,16 +16,9 @@
        pkgs = nixpkgs.legacyPackages.${system};
        rust-toolchain = pkgs.symlinkJoin {
          name = "rust-toolchain";
-          paths = with pkgs; [
-            rustc
-            cargo
-            cargo-watch
-            rust-analyzer
-            rustfmt
-          ];
+          paths = with pkgs; [ rustc cargo cargo-watch rust-analyzer rustfmt ];
        };
-      in
-      rec {
+      in rec {
        # This builds the blog binary then runs it and collects the output. Once done it throws away the binary and
        # shoves the newly created static site into the result.
        packages.default = pkgs.rustPlatform.buildRustPackage {
@ -35,7 +28,6 @@
          cargoLock.lockFile = "${bob}/Cargo.lock";
        };

-        overlays.default = packages.default;
        # Rust dev environment
        devShells.default = pkgs.mkShell {
          shellHook = ''
@ -44,5 +36,7 @@
          '';
          nativeBuildInputs = [ rust-toolchain ];
        };
-      });
+      }) // {
+        overlays.default = final: prev: { bob-nvim = self.packages.${final.system}.default; };
+      };
 }
--- a/pkgs/deepfilternet/flake.lock
+++ b/pkgs/deepfilternet/flake.lock
@ -0,0 +1,79 @@
+{
+  "nodes": {
+    "deepfilternet-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1693481377,
+        "narHash": "sha256-5bYbfO1kmduNm9YV5niaaPvRIDRmPt4QOX7eKpK+sWY=",
+        "owner": "Rikorose",
+        "repo": "DeepFilterNet",
+        "rev": "978576aa8400552a4ce9730838c635aa30db5e61",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Rikorose",
+        "repo": "DeepFilterNet",
+        "rev": "978576aa8400552a4ce9730838c635aa30db5e61",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1706925685,
+        "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "79a13f1437e149dc7be2d1290c74d378dad60814",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "deepfilternet-src": "deepfilternet-src",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
--- a/pkgs/deepfilternet/flake.nix
+++ b/pkgs/deepfilternet/flake.nix
@ -0,0 +1,77 @@
+{
+  description = "Flake for deepfilternet, a noise supression algorithm.";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    deepfilternet-src = {
+      flake = false;
+      url =
+        "github:Rikorose/DeepFilterNet?rev=978576aa8400552a4ce9730838c635aa30db5e61";
+    };
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils, deepfilternet-src }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        lib = nixpkgs.lib;
+        pkgs = nixpkgs.legacyPackages.${system};
+        rust-toolchain = pkgs.symlinkJoin {
+          name = "rust-toolchain";
+          paths = with pkgs; [ rustc cargo ];
+        };
+      in rec {
+        packages.default = pkgs.rustPlatform.buildRustPackage rec {
+          pname = "deepfilternet";
+          version = "0.5.6";
+          src = "${deepfilternet-src}";
+          cargoLock = {
+            lockFile = "${deepfilternet-src}/Cargo.lock";
+            allowBuiltinFetchGit = true;
+          };
+          buildInputs = with pkgs; [ ladspaH ];
+          buildAndTestSubdir = "ladspa";
+          postInstall = ''
+            mkdir $out/lib/ladspa
+            mv $out/lib/libdeep_filter_ladspa.so $out/lib/ladspa/libdeep_filter_ladspa.so
+          '';
+          meta = {
+            description = "Noise supression using deep filtering";
+            homepage = "https://github.com/Rikorose/DeepFilterNet";
+            license = with lib.licenses; [ mit asl20 ];
+            changelog =
+              "https://github.com/Rikorose/DeepFilterNet/releases/tag/${src.rev}";
+          };
+        };
+      }) // {
+        overlays.default = final: prev: {
+          deepfilternet = self.packages.${final.system}.default;
+          easyeffects = let
+            pkgs = final.pkgs;
+            lib = pkgs.lib;
+          in prev.easyeffects.overrideAttrs (oldAttrs: {
+            buildInputs = with pkgs; [ deepfilternet ] ++ oldAttrs.buildInputs;
+            preFixup = let
+              lv2Plugins = with pkgs; [
+                calf # compressor exciter, bass enhancer and others
+                lsp-plugins # delay, limiter, multiband compressor
+                mda_lv2 # loudness
+                zam-plugins # maximizer
+              ];
+              ladspaPlugins = with pkgs; [
+                deepfilternet
+                rubberband # pitch shifting
+              ];
+            in ''
+              gappsWrapperArgs+=(
+                --set LV2_PATH "${lib.makeSearchPath "lib/lv2" lv2Plugins}"
+                --set LADSPA_PATH "${
+                  lib.makeSearchPath "lib/ladspa" ladspaPlugins
+                }"
+              )
+            '';
+          });
+        };
+
+      };
+}
Author	SHA1	Message	Date
Price Hiller	1b1ca47848	chore(nvim): update lazy lock	2024-02-04 22:27:26 -06:00
Price Hiller	3e2f78d8bf	refactor(nix-hm): various improvements	2024-02-04 22:27:21 -06:00
Price Hiller	a0c05a91ca	refactor(nix-hm): improve bob-nvim flake	2024-02-04 22:27:10 -06:00
Price Hiller	92e41d2010	feat(nix-hm): add flake for deepfilternet	2024-02-04 22:26:19 -06:00