move more files out of configuration.nix

4 files changed, 97 insertions, 19 deletions

diff --git a/configuration.nix b/configuration.nix
index de8beeb..19f11e2 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -409,8 +409,6 @@
       fuzzel
       swaybg
 
-      mako
-
       stow
 
       lua-language-server
@@ -459,16 +457,6 @@
 
   services.pcscd.enable = true;
 
-  #  services.ollama = {
-  #    enable = true;
-  #    package = pkgs.ollama-rocm;
-  #    environmentVariables = {
-  #      HIP_VISIBLE_DEVICES = "0";
-  #      OLLAMA_CONTEXT_LENGTH = "32768";
-  #      OLLAMA_KV_CACHE_TYPE = "q8_0";
-  #    };
-  #  };
-
   programs.neovim = {
     enable = true;
     defaultEditor = true;
diff --git a/flake.lock b/flake.lock
index b467688..09384a2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,26 @@
 {
   "nodes": {
+    "discidurl": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1785026148,
+        "narHash": "sha256-Y00d8y9i1e+yDrBoDqvmIwS/w40WLzDtCYkXxdF43WU=",
+        "ref": "main",
+        "rev": "e1c7e45779d3753228c83b2152075443734185de",
+        "revCount": 5,
+        "type": "git",
+        "url": "https://git.hwebs.info/discidurl"
+      },
+      "original": {
+        "ref": "main",
+        "type": "git",
+        "url": "https://git.hwebs.info/discidurl"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1784280462,
@@ -18,6 +39,7 @@
     },
     "root": {
       "inputs": {
+        "discidurl": "discidurl",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index b024152..3a8765b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,9 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
+
+    discidurl.url = "git+https://git.hwebs.info/discidurl?ref=main";
+    discidurl.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
@@ -13,7 +16,12 @@
         modules = [
           ./configuration.nix
           ./programs.nix
-          { nixpkgs.overlays = [ (import ./overlays/haunt.nix) ]; }
+          {
+            nixpkgs.overlays = [
+              (import ./overlays/haunt.nix)
+              inputs.discidurl.overlays.default
+            ];
+          }
         ];
       };
     };
diff --git a/programs.nix b/programs.nix
index 73839a6..2872cb4 100644
--- a/programs.nix
+++ b/programs.nix
@@ -1,10 +1,33 @@
 { pkgs, ... }:
+
+let
+  # open the MusicBrainz submission URL for the disc in the drive
+  discid = pkgs.writeShellApplication {
+    name = "discid";
+    runtimeInputs = [
+      pkgs.discidurl
+      pkgs.xdg-utils
+    ];
+    text = "discidurl | xargs -r xdg-open";
+  };
+in
 {
   environment.systemPackages = with pkgs; [
-    itch
+    discidurl
+    discid
 
+    itch
     haunt
 
+    # --- wayland
+    mako
+
+    # provides notify-send
+    libnotify
+
+    # website is down :(
+    # makemkv
+
     (aspellWithDicts (
       dicts: with dicts; [
         en
@@ -12,6 +35,21 @@
         en-science
       ]
     ))
+
+    pi-coding-agent
+
+    (buildNpmPackage rec {
+      pname = "pi-acp";
+      version = "0.0.31";
+      src = fetchFromGitHub {
+        owner = "svkozak";
+        repo = "pi-acp";
+        rev = "v${version}";
+        hash = "sha256-bM3V/3fxkY2Ib+OyfT82StIIRSLXGDuYUbt1CZKpTuo=";
+      };
+      npmDepsHash = "sha256-qN+b/tMbnJLkWjotl3XrA0nfZ3KT/mT6gM+n3Qiz8Wk=";
+    })
+
   ];
 
   programs = {
@@ -24,11 +62,33 @@
     };
   };
 
-  services.emacs = {
-    enable = true;
-    package = pkgs.emacs.pkgs.withPackages (epkgs: [
-      (epkgs.treesit-grammars.with-grammars (g: [ g.tree-sitter-nix ]))
-    ]);
+  services = {
+    emacs = {
+      enable = true;
+      package =
+        let
+          emacs = pkgs.emacs-pgtk.overrideAttrs (old: {
+            postInstall = (old.postInstall or "") + ''
+              # I only want the client version
+              rm -f $out/share/applications/emacs.desktop
+            '';
+          });
+        in
+        (pkgs.emacsPackagesFor emacs).withPackages (epkgs: [
+          (epkgs.treesit-grammars.with-grammars (g: [ g.tree-sitter-nix ]))
+          epkgs.vterm
+        ]);
+    };
+
+    ollama = {
+      enable = true;
+      package = pkgs.ollama-rocm;
+      environmentVariables = {
+        HIP_VISIBLE_DEVICES = "0";
+        OLLAMA_CONTEXT_LENGTH = "32768";
+        OLLAMA_KV_CACHE_TYPE = "q8_0";
+      };
+    };
   };
 
   services.immich = {