erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:ccba4f566d8f95273d0c7ace42220ec1b728a619
Branches Tags
erwin:main
...
compare: erwin:0a6d96be5d6113e5fc639954b47fdd86cadfeea2
Branches Tags
erwin:main

4 commits
ccba4f566d ... 0a6d96be5d

Author SHA1 Message Date
Erwin Boskma
0a6d96be5d
emacs: Cleanup 2024-09-19 22:14:20 +02:00
Erwin Boskma
c048ea5eae
loki: Remove NFS server 2024-09-19 22:12:30 +02:00
Erwin Boskma
99a5b87917
emacs: Update ollama model name 2024-09-19 22:12:09 +02:00
Erwin Boskma
747a9df2d0
flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/22ee467a54a3ab7fa9d637ccad5330c6c087e9dc?narHash=sha256-xkPPPvfHhHK7BNX5ZrQ9N6AIEixCmFzRZHduDf0zv30%3D' (2024-09-16)
  → 'github:nix-community/disko/d32d1504c77d7f6ba7e033357dcf638baceab9b7?narHash=sha256-5bxY85siOIqOcQ8TOMAWLkMUZvLUADS2i5TsZhzUIZY%3D' (2024-09-17)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/9d338902d478ffba6a7dd0d9c2fb6151cb4b970a?narHash=sha256-kwjD%2BF08vvRVXCepQ5TD%2BHLCBkwvBF9gfM9ftFX%2Bb0U%3D' (2024-09-17)
  → 'github:nix-community/emacs-overlay/e303aa1dc000c07ee38a865bccb6e216fb5c1018?narHash=sha256-c7FAyWe5XB4J78Ee0QFuCPs0MIowJMDG1FkTqVnw6gs%3D' (2024-09-18)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/8f7492cce28977fbf8bd12c72af08b1f6c7c3e49?narHash=sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw%3D' (2024-09-14)
  → 'github:NixOS/nixpkgs/086b448a5d54fd117f4dc2dee55c9f0ff461bdc1?narHash=sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ%3D' (2024-09-16)
• Updated input 'flake-utils':
    'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a?narHash=sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ%3D' (2024-03-11)
  → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a?narHash=sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ%3D' (2024-09-17)
• Updated input 'home-manager':
    'github:nix-community/home-manager/a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff?narHash=sha256-ChhIrjtdu5d83W%2BYDRH%2BEc5g1MmM0xk6hJnkz15Ot7M%3D' (2024-09-15)
  → 'github:nix-community/home-manager/d2493de5cd1da06b6a4c3e97f4e7d5dd791df457?narHash=sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w%3D' (2024-09-17)
• Updated input 'nil':
    'github:oxalica/nil/555d517d46f0901988d752c7bbebccbf66b74f91?narHash=sha256-qEYEgj5Lj8VrrJKW2VSKXWJuHMXgoBmOkA96yt%2BDNXM%3D' (2024-09-16)
  → 'github:oxalica/nil/c8e8ce72442a164d89d3fdeaae0bcc405f8c015a?narHash=sha256-mIuOP4I51eFLquRaxMKx67pHmhatZrcVPjfHL98v/M8%3D' (2024-09-19)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/dc8b0296f68f72f3fe77469c549a6f098555c2e9?narHash=sha256-JBHtN%2Bn1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo%3D' (2024-09-16)
  → 'github:NixOS/nixos-hardware/10d5e0ecc32984c1bf1a9a46586be3451c42fd94?narHash=sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8%3D' (2024-09-19)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/20c8461785d8f5af32d8d4d5c128589e23d7f033?narHash=sha256-u1tAteb4qkH2gGjDY3mN/4Qxa6y798t4G0jNKDyTwv8%3D' (2024-09-17)
  → 'github:oxalica/rust-overlay/6283b1d6ca31fa320ecee82806123e773b2ff993?narHash=sha256-Ob7DNyHKtOQpWetmNj/V%2BOgMkGXh6Ep1dNa6AN/4sSI%3D' (2024-09-19)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/77dd46bf0ec7febbc0022bb6e4449cdc49af95d7?narHash=sha256-3zr63B6CDZ8FnzrRUvNZlsxLmFjaNyis6R91GjUCIhU%3D' (2024-09-17)
  → 'github:numtide/treefmt-nix/829338a3df3dfd492c61abbd090ec1405329c943?narHash=sha256-byl6ywTyQTUGiuwvBsDtQwUioQ5Kklxirj6YdiWTLdY%3D' (2024-09-19)
 2024-09-19 08:18:49 +02:00
3 changed files with 38 additions and 79 deletions
Show stats Expand all files Collapse all files

54
flake.lock
View file

@ -193,11 +193,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726524467, "lastModified": 1726590912,
"narHash": "sha256-xkPPPvfHhHK7BNX5ZrQ9N6AIEixCmFzRZHduDf0zv30=", "narHash": "sha256-5bxY85siOIqOcQ8TOMAWLkMUZvLUADS2i5TsZhzUIZY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "22ee467a54a3ab7fa9d637ccad5330c6c087e9dc", "rev": "d32d1504c77d7f6ba7e033357dcf638baceab9b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,11 +217,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1726537900, "lastModified": 1726679581,
"narHash": "sha256-kwjD+F08vvRVXCepQ5TD+HLCBkwvBF9gfM9ftFX+b0U=", "narHash": "sha256-c7FAyWe5XB4J78Ee0QFuCPs0MIowJMDG1FkTqVnw6gs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "9d338902d478ffba6a7dd0d9c2fb6151cb4b970a", "rev": "e303aa1dc000c07ee38a865bccb6e216fb5c1018",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -430,11 +430,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1726560853,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -551,11 +551,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726440980, "lastModified": 1726611255,
"narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", "narHash": "sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", "rev": "d2493de5cd1da06b6a4c3e97f4e7d5dd791df457",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -621,11 +621,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726525821, "lastModified": 1726716330,
"narHash": "sha256-qEYEgj5Lj8VrrJKW2VSKXWJuHMXgoBmOkA96yt+DNXM=", "narHash": "sha256-mIuOP4I51eFLquRaxMKx67pHmhatZrcVPjfHL98v/M8=",
"owner": "oxalica", "owner": "oxalica",
"repo": "nil", "repo": "nil",
"rev": "555d517d46f0901988d752c7bbebccbf66b74f91", "rev": "c8e8ce72442a164d89d3fdeaae0bcc405f8c015a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -658,11 +658,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1726489388, "lastModified": 1726724509,
"narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=", "narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9", "rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -717,11 +717,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1726320982, "lastModified": 1726447378,
"narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -864,11 +864,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726539203, "lastModified": 1726712837,
"narHash": "sha256-u1tAteb4qkH2gGjDY3mN/4Qxa6y798t4G0jNKDyTwv8=", "narHash": "sha256-Ob7DNyHKtOQpWetmNj/V+OgMkGXh6Ep1dNa6AN/4sSI=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "20c8461785d8f5af32d8d4d5c128589e23d7f033", "rev": "6283b1d6ca31fa320ecee82806123e773b2ff993",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -982,11 +982,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726560002, "lastModified": 1726705685,
"narHash": "sha256-3zr63B6CDZ8FnzrRUvNZlsxLmFjaNyis6R91GjUCIhU=", "narHash": "sha256-byl6ywTyQTUGiuwvBsDtQwUioQ5Kklxirj6YdiWTLdY=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "77dd46bf0ec7febbc0022bb6e4449cdc49af95d7", "rev": "829338a3df3dfd492c61abbd090ec1405329c943",
"type": "github" "type": "github"
}, },
"original": { "original": {

54
home-manager/modules/emacs/config.org
View file

@ -875,17 +875,17 @@ Set some connection properties
Let's evaluate this puppy. Let's evaluate this puppy.
#+begin_src emacs-lisp #+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")))) :models '("mistral-nemo"))))
#+end_src #+end_src
** Git ** Git
@ -1456,13 +1456,6 @@ Common Lisp does not use =lsp-mode=, but has it's own environment: [[https://git
sly-default-lisp 'sbcl)) sly-default-lisp 'sbcl))
#+end_src #+end_src
*** Clojure
Similar to =lisp=, there is [[https://github.com/clojure-emacs/cider][CIDER]] (Clojure Interactive Development Environment that Rocks) for Clojure(Script)
#+begin_src emacs-lisp
(use-package cider)
#+end_src
*** Terraform *** Terraform
[[https://github.com/emacsorphanage/terraform-mode][terraform-mode]] is a major mode for Terraform files [[https://github.com/emacsorphanage/terraform-mode][terraform-mode]] is a major mode for Terraform files
@ -1526,16 +1519,6 @@ Let =ruby-mode= handle Ruby files
:hook (ruby-mode . eglot-ensure)) :hook (ruby-mode . eglot-ensure))
#+end_src #+end_src
*** MapServer
Add highlighting for MapServer .map files
#+begin_src emacs-lisp :tangle no
(use-package mapserver-mode
:straight (:type git :host github :repo "AxxL/mapserver-emacs-mode")
:mode ("\\.map\\'" . mapserver-mode))
#+end_src
*** Go *** Go
It's better than nothing. It's better than nothing.
@ -1642,21 +1625,6 @@ Register =nushell= LSP with eglot
(use-package lua-mode) (use-package lua-mode)
#+end_src #+end_src
*** Svelte
#+begin_src emacs-lisp
(use-package svelte-mode)
#+end_src
Use =svelteserver= as LSP
#+begin_src emacs-lisp
(with-eval-after-load 'eglot
(add-to-list 'eglot-server-programs
'(svelte-mode . ("svelteserver" "--stdio"))))
#+end_src
*** Device Tree *** Device Tree
Highlighting for device tree configuration. Highlighting for device tree configuration.

9
machines/loki/configuration.nix
View file

@ -388,15 +388,6 @@
# user = "erwin"; # user = "erwin";
openFirewall = true; openFirewall = true;
}; };
nfs.server = {
enable = true;
exports = ''
/home/erwin/proxmox-backup 10.0.0.0/24(rw,sync,no_subtree_check,anonuid=1000,anongid=100,all_squash)
'';
lockdPort = 4101;
mountdPort = 4102;
statdPort = 4100;
};
}; };
programs = { programs = {