flake.lock

@@ -656,21 +656,6 @@
         "type": "github"
       }
     },
-    "nixos-facter-modules": {
-      "locked": {
-        "lastModified": 1726644499,
-        "narHash": "sha256-A8w2L9vRCKnj2UAmfSYewiD+yNgEhbEY6ITVgj8DIHs=",
-        "owner": "numtide",
-        "repo": "nixos-facter-modules",
-        "rev": "cc817a8491bbb6eea30533e0c6f89d101a52b72e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "nixos-facter-modules",
-        "type": "github"
-      }
-    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1726724509,
@@ -863,7 +848,6 @@
         "naersk": "naersk",
         "nil": "nil",
         "nix-ld-rs": "nix-ld-rs",
-        "nixos-facter-modules": "nixos-facter-modules",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
         "pamedia": "pamedia",

flake.nix

@@ -102,7 +102,13 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
+    # atuin = {
+    #   url = "github:atuinsh/atuin";
+    #   inputs = {
+    #     nixpkgs.follows = "nixpkgs";
+    #     flake-utils.follows = "flake-utils";
+    #   };
+    # };
 
     caddy-with-plugins = {
       url = "github:eboskma/caddy-with-plugins";

home-manager/modules/emacs/config.org

@@ -875,58 +875,17 @@ Set some connection properties
 Let's evaluate this puppy.
 
 #+begin_src emacs-lisp
-      (use-package gptel
+  (use-package gptel
-        :general
+    :general
-        (:prefix my/leader
+    (:prefix my/leader
-                 "m" 'gptel-menu
+             "m" 'gptel-menu
-                 "C-m" 'gptel-send)
+             "C-m" 'gptel-send)
-        :config
+    :config
-        (setq gptel-model "mistral-nemo"
+    (setq gptel-model "mistral-nemo"
-              gptel-backend (gptel-make-ollama "Ollama"
+          gptel-backend (gptel-make-ollama "Ollama"
-                              :host "100.119.162.110:11434"
+                          :host "100.119.162.110:11434"
-                              :stream t
+                          :stream t
-                              :models '("mistral" "mistral-nemo")))
+                          :models '("mistral-nemo"))))
-        (add-to-list 'gptel-directives '(commit . "You are an expert programmer summarizing a git diff.
-  Reminders about the git diff format:
-  For every file, there are a few metadata lines, like (for example):
-  ```
-  diff --git a/lib/index.js b/lib/index.js
-  index aadf691..bfef603 100644
-  --- a/lib/index.js
-  +++ b/lib/index.js
-  ```
-  This means that `lib/index.js` was modified in this commit. Note that this is only an example.
-  Then there is a specifier of the lines that were modified.
-  A line starting with `+` means it was added.
-  A line that starting with `-` means that line was deleted.
-  A line that starts with neither `+` nor `-` is code given for context and better understanding.
-  It is not part of the diff.
-  After the git diff of the first file, there will be an empty line, and then the git diff of the next file.
-
-  Do not include the file name as another part of the comment.
-  Do not use the characters `[` or `]` in the summary.
-  Write every summary comment in a new line.
-  Comments should be in a bullet point list, each line starting with a `-`.
-  The summary should not include comments copied from the code.
-  The output should be easily readable. When in doubt, write fewer comments and not more. Do not output comments that
-  simply repeat the contents of the file.
-  Readability is top priority. Write only the most important comments about the diff.
-
-  EXAMPLE SUMMARY COMMENTS:
-  ```
-  - Raise the amount of returned recordings from `10` to `100`
-  - Fix a typo in the github action name
-  - Move the `octokit` initialization to a separate file
-  - Add an OpenAI API for completions
-  - Lower numeric tolerance for test files
-  - Add 2 tests for the inclusive string split function
-  ```
-  Most commits will have less comments than this examples list.
-  The last comment does not include the file names,
-  because there were more than two relevant files in the hypothetical commit.
-  Do not include parts of the example in your summary.
-  It is given only as an example of appropriate comments.
-  ")))
   #+end_src
   
 ** Git

home-manager/modules/git/default.nix

@@ -8,12 +8,6 @@
 with lib;
 let
   cfg = config.eboskma.programs.git;
-
-  editor =
-    if config.eboskma.programs.emacs.enable then
-      "${config.eboskma.programs.emacs.package}/bin/emacsclient"
-    else
-      "${pkgs.neovim}/bin/nvim";
 in
 {
   options.eboskma.programs.git = {
@@ -122,7 +116,7 @@ in
           defaultBranch = "main";
         };
         core = {
-          editor = "${editor}";
+          editor = "${config.eboskma.programs.emacs.package}/bin/emacsclient";
           pager = "${pkgs.bat}/bin/bat";
           untrackedCache = true;
           # fsmonitor =