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

Compare commits

base: erwin:046b96af468e0ae30d0476f8a5c8c34d1fb7b499
Branches Tags
erwin:main
..
compare: erwin:42577691d2f9a9f6dc046d2d7c8a6cd511cca912
Branches Tags
erwin:main

5 commits
046b96af46 ... 42577691d2

Author SHA1 Message Date
Erwin Boskma
42577691d2
home: Add FreeCAD 2024-03-06 08:18:15 +01:00
Erwin Boskma
dcdc3bbb92
unbound: tweak settings 2024-03-06 08:18:14 +01:00
Erwin Boskma
767934e2d4
emacs: Switch to elixir-ts-mode and add lexical to eglot 2024-03-06 08:18:12 +01:00
Erwin Boskma
181d0624dd
keycloak: Update admin-ui and organizations plugins 2024-03-06 08:18:10 +01:00
Erwin Boskma
eb04fa3476
flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/bde7dd352c07d43bd5b8245e6c39074a391fdd46' (2024-03-01)
  → 'github:nix-community/disko/0d11aa8d6431326e10b8656420f91085c3bd0b12' (2024-03-05)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/d7155aaadc98b2c13874f78cc5e00f2dfefd7a6e' (2024-03-01)
  → 'github:nix-community/emacs-overlay/5a24cf5100cd2584313119d0f4d413417fec949c' (2024-03-05)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/068d4db604958d05d0b46c47f79b507d84dbc069' (2024-02-29)
  → 'github:NixOS/nixpkgs/79baff8812a0d68e24a836df0a364c678089e2c7' (2024-03-01)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/b253292d9c0a5ead9bc98c4e9a26c6312e27d69f' (2024-02-01)
  → 'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2' (2024-03-01)
• Updated input 'flake-parts/nixpkgs-lib':
    'github:NixOS/nixpkgs/97b17f32362e475016f942bbdfda4a4a72a8a652?dir=lib' (2024-01-29)
  → 'github:NixOS/nixpkgs/1536926ef5621b09bba54035ae2bb6d806d72ac8?dir=lib' (2024-02-29)
• Updated input 'home-manager':
    'github:nix-community/home-manager/2f3367769a93b226c467551315e9e270c3f78b15' (2024-02-29)
  → 'github:nix-community/home-manager/23ff9821bcaec12981e32049e8687f25f11e5ef3' (2024-03-04)
• Updated input 'microvm':
    'github:astro/microvm.nix/fdb3da86ef6b78a836a46af064325287cf50ba6f' (2024-02-29)
  → 'github:astro/microvm.nix/7f93206b22131aac8fa46d787696ea58460aecab' (2024-03-01)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/33a97b5814d36ddd65ad678ad07ce43b1a67f159' (2024-02-28)
  → 'github:NixOS/nixos-hardware/59e37017b9ed31dee303dbbd4531c594df95cfbc' (2024-03-02)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/1536926ef5621b09bba54035ae2bb6d806d72ac8' (2024-02-29)
  → 'github:nixos/nixpkgs/b8697e57f10292a6165a20f03d2f42920dfaf973' (2024-03-03)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/0e031ddb3f5a339dc6eda93d271ae43618b14eec' (2024-03-01)
  → 'github:oxalica/rust-overlay/e86c0fb5d3a22a5f30d7f64ecad88643fe26449d' (2024-03-05)
• Updated input 'sops':
    'github:Mic92/sops-nix/a1c8de14f60924fafe13aea66b46157f0150f4cf' (2024-02-26)
  → 'github:Mic92/sops-nix/291aad29b59ceda517a06e59809f35cb0bb17c6b' (2024-03-04)
• Updated input 'sops/nixpkgs-stable':
    'github:NixOS/nixpkgs/89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea' (2024-02-25)
  → 'github:NixOS/nixpkgs/66d65cb00b82ffa04ee03347595aa20e41fe3555' (2024-03-03)
 2024-03-05 13:06:58 +01:00
7 changed files with 80 additions and 62 deletions
Show stats Expand all files Collapse all files

72
flake.lock
View file

@ -124,11 +124,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709286488, "lastModified": 1709632354,
"narHash": "sha256-RDpTZ72zLu05djvXRzK76Ysqp9zSdh84ax/edEaJucs=", "narHash": "sha256-jxRHwqrtNze51WKFKvxlQ8Inf62UNRl5cFqEQ2V96vE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "bde7dd352c07d43bd5b8245e6c39074a391fdd46", "rev": "0d11aa8d6431326e10b8656420f91085c3bd0b12",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -148,11 +148,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1709283110, "lastModified": 1709629551,
"narHash": "sha256-V3/gFVUB6HwgPTDhcpwe3g4rVOYIe10wdLbztTGeyCU=", "narHash": "sha256-G+nZqqGVtMdDNhbaFeT9u2FhjUt7/lh28pB5Grd1WFg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "d7155aaadc98b2c13874f78cc5e00f2dfefd7a6e", "rev": "5a24cf5100cd2584313119d0f4d413417fec949c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -291,11 +291,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1706830856, "lastModified": 1709336216,
"narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,11 +414,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709204054, "lastModified": 1709578243,
"narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", "narHash": "sha256-hF96D+c2PBmAFhymMw3z8hou++lqKtZ7IzpFbYeL1/Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f3367769a93b226c467551315e9e270c3f78b15", "rev": "23ff9821bcaec12981e32049e8687f25f11e5ef3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,11 +438,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1709167566, "lastModified": 1709297667,
"narHash": "sha256-cr6E1Evcwl/vMiF0oKff6ctmQhGCOidr72Fd2GFZkWY=", "narHash": "sha256-5JUaHyRFKDPqyeTlbMFS6VixAWRkO5uCRTS8asEjiyo=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "fdb3da86ef6b78a836a46af064325287cf50ba6f", "rev": "7f93206b22131aac8fa46d787696ea58460aecab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -521,11 +521,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1709147990, "lastModified": 1709410583,
"narHash": "sha256-vpXMWoaCtMYJ7lisJedCRhQG9BSsInEyZnnG5GfY9tQ=", "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "33a97b5814d36ddd65ad678ad07ce43b1a67f159", "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -553,11 +553,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1706550542, "lastModified": 1709237383,
"narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -586,11 +586,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1709218635, "lastModified": 1709309926,
"narHash": "sha256-nytX/MkfqeTD4z7bMq4QRXcHxO9B3vRo9tM6fMtPFA8=", "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "068d4db604958d05d0b46c47f79b507d84dbc069", "rev": "79baff8812a0d68e24a836df0a364c678089e2c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -618,11 +618,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1708819810, "lastModified": 1709428628,
"narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=", "narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea", "rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -634,11 +634,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1709237383, "lastModified": 1709479366,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -762,11 +762,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709259239, "lastModified": 1709604635,
"narHash": "sha256-MbrpgqpvUND7+UnOSLazrAMj0+zle16RRiOKTtjBefw=", "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "0e031ddb3f5a339dc6eda93d271ae43618b14eec", "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -783,11 +783,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1708987867, "lastModified": 1709591996,
"narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=", "narHash": "sha256-0sQcalXSgqlO6mnxBTXkSQChBHy2GQsokB1XY8r+LpQ=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf", "rev": "291aad29b59ceda517a06e59809f35cb0bb17c6b",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

@ -1109,11 +1109,15 @@ Automatically use the =<lang>-ts-mode= when it is available
(fset #'json--log-event #'ignore) ;; Performance boost by not logging every event (fset #'json--log-event #'ignore) ;; Performance boost by not logging every event
(add-to-list 'eglot-server-programs (add-to-list 'eglot-server-programs
'((toml-mode toml-ts-mode conf-toml-mode) . ("taplo" "lsp" "stdio"))) '((toml-mode toml-ts-mode conf-toml-mode) . ("taplo" "lsp" "stdio")))
;; (add-to-list 'eglot-server-programs
;; `((elixir-mode elixir-ts-mode heex-ts-mode) .
;; ,(eglot-alternatives '(("nextls" "--stdio=true"
;; :initializationOptions (:experimental (:completions (:enable t))))
;; "elixir-ls"))))
;;
(add-to-list 'eglot-server-programs (add-to-list 'eglot-server-programs
`((elixir-mode elixir-ts-mode heex-ts-mode) . `((elixir-ts-mode heex-ts-mode) .
,(eglot-alternatives '(("nextls" "--stdio=true" ,(eglot-alternatives '("lexical" "elixir-ls"))))
:initializationOptions (:experimental (:completions (:enable t))))
"elixir-ls"))))
(add-to-list 'eglot-server-programs (add-to-list 'eglot-server-programs
'(dhall-mode . ("dhall-lsp-server"))) '(dhall-mode . ("dhall-lsp-server")))
(add-to-list 'eglot-stay-out-of 'flymake) (add-to-list 'eglot-stay-out-of 'flymake)
@ -1283,22 +1287,20 @@ Prefer local packages from =node_modules= to global ones
Add support for Elixir with [[https://github.com/elixir-editors/emacs-elixir][elixir-mode]]. The =elixir-format= hook sets up the correct formatter configuration when in a =projectile= project. Add support for Elixir with [[https://github.com/elixir-editors/emacs-elixir][elixir-mode]]. The =elixir-format= hook sets up the correct formatter configuration when in a =projectile= project.
#+begin_src emacs-lisp #+begin_src emacs-lisp :tangle no
(use-package elixir-mode (use-package elixir-mode
:after eglot :after eglot
:hook ((elixir-mode . eglot-ensure)) :hook ((elixir-mode . eglot-ensure))
;; ((elixir-format . (lambda ()
;; (if (projectile-project-p)
;; (setq elixir-format-arguments
;; (list "--dot-formatter"
;; (concat (locate-dominating-file buffer-file-name ".formatter.exs") ".formatter.exs")))
;; (setq elixir-format-arguments nil))))
;; (elixir-mode . (lambda () (add-hook 'before-save-hook 'elixir-format nil t)))
:config :config
;; (setq lsp-elixir-server-command '("elixir-ls"))
(add-to-list 'auto-mode-alist '("\\.[hl]eex\\'" . elixir-mode))) (add-to-list 'auto-mode-alist '("\\.[hl]eex\\'" . elixir-mode)))
#+end_src #+end_src
#+begin_src emacs-lisp
(use-package elixir-ts-mode
:after eglot
:hook ((elixir-ts-mode . eglot-ensure)))
#+end_src
Add a [[https://github.com/ayrat555/mix.el][mix]] minor mode to call =mix= tasks from emacs. Add a [[https://github.com/ayrat555/mix.el][mix]] minor mode to call =mix= tasks from emacs.
#+begin_src emacs-lisp #+begin_src emacs-lisp

18
machines/valkyrie/unbound/default.nix
View file

@ -18,6 +18,7 @@
hide-identity = true; hide-identity = true;
hide-version = true; hide-version = true;
identity = "Server";
# Trust glue only if it is within the server's authority # Trust glue only if it is within the server's authority
harden-glue = true; harden-glue = true;
@ -43,17 +44,30 @@
# This attempts to reduce latency by serving the outdated record before # This attempts to reduce latency by serving the outdated record before
# updating it instead of the other way around. Alternative is to increase # updating it instead of the other way around. Alternative is to increase
# cache-min-ttl to e.g. 3600. # cache-min-ttl to e.g. 3600.
cache-min-ttl = 0; cache-min-ttl = 300;
cache-max-ttl = 86400;
serve-expired = true; serve-expired = true;
# Set cache size. rrset-cache-size should be twice what msg-cache-size is
rrset-cache-size = "256m"; rrset-cache-size = "256m";
msg-cache-size = "128m"; msg-cache-size = "128m";
msg-cache-slabs = 4; msg-cache-slabs = 4;
# One thread should be sufficient, can be increased on beefy machines. In reality for most users running on small networks or on a single machine, it should be unnecessary to seek performance enhancement by increasing num-threads above 1.
# One thread should be sufficient, can be increased on beefy machines. In reality for most users running on
# small networks or on a single machine, it should be unnecessary to seek performance enhancement by increasing num-threads above 1.
num-threads = 2; num-threads = 2;
# Leave sections that are not requested out of the response message
# Reduces response message significantly and may prevent TCP fallback
# for some responses
minimal-response = true;
# Ensure kernel buffer is large enough to not lose messages in traffic spikes # Ensure kernel buffer is large enough to not lose messages in traffic spikes
so-rcvbuf = "8m"; so-rcvbuf = "8m";
so-sndbuf = "8m";
# Improve UDP performance with multithreading
so-reuseport = true;
# Ensure privacy of local IP ranges # Ensure privacy of local IP ranges
private-address = [ private-address = [

4
modules/keycloak/keycloak-admin-ui.nix
View file

@ -14,12 +14,12 @@ buildMavenPackage {
owner = "keycloak"; owner = "keycloak";
repo = "keycloak"; repo = "keycloak";
rev = version; rev = version;
hash = "sha256-SmK8xko+py5RnbwhCzDzpEDqUs52jdaVVNY7w1TXmRU="; sha256 = "XMRfFu7WQpFKv1VvRTDGrvClrdBGkKa3QNOZNvh2sKU=";
}; };
sourceRoot = "source/integration/admin-client"; sourceRoot = "source/integration/admin-client";
mvnHash = "sha256-18V+g3LRndcQGhpyq3wWKM/u8lJQRd1064tatUZhGys="; mvnHash = "sha256-wDulzZ/0mXXBb7kvjUaPA/38pS2Tw+bzOl83AR2TRtY=";
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
installPhase = '' installPhase = ''

8
modules/keycloak/keycloak-orgs.nix
View file

@ -1,6 +1,6 @@
{ buildMavenPackage, fetchFromGitHub }: { buildMavenPackage, fetchFromGitHub }:
let let
version = "0.49"; version = "0.61";
in in
buildMavenPackage { buildMavenPackage {
inherit version; inherit version;
@ -10,13 +10,13 @@ buildMavenPackage {
owner = "p2-inc"; owner = "p2-inc";
repo = "keycloak-orgs"; repo = "keycloak-orgs";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-VkXyaQdAz/UsE+qTydRy4BMAxfo3pL2FbFIdmuhTehs="; sha256 = "a+CRMv0oq826s6KWjL8EM/iw4ZaqL00+RSzAYCqLwwY=";
# hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # sha256 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
}; };
doCheck = false; doCheck = false;
mvnHash = "sha256-U+llOMa//Foybtv1j1ClHDGOTQndc2rPkoIuH4huf+I="; mvnHash = "sha256-NG3vA1+9gSVHqDqAg6wTCXD0wplvx0+ykUGLRe+MAug=";
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
mvnParameters = "--batch-mode -DskipTests -Dmaven.test.skip=true -Dmaven.buildNumber.skip=true"; mvnParameters = "--batch-mode -DskipTests -Dmaven.test.skip=true -Dmaven.buildNumber.skip=true";

5
modules/keycloak/phasetwo-admin-ui.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }: { stdenv, fetchFromGitHub }:
let let
version = "23.0.3.1703879005"; version = "23.0.7.1709589021";
jarVersion = "23.0.1"; jarVersion = "23.0.1";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -11,7 +11,8 @@ stdenv.mkDerivation {
owner = "p2-inc"; owner = "p2-inc";
repo = "phasetwo-containers"; repo = "phasetwo-containers";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-s+RuihsX2zekFqhVHKQu+0xECoJHJH4K3JQd4CDbPo0="; sha256 = "nsyFSD7uRm4X6n+4601HatnGzmV46FUIlc7ZPYXalJo=";
# sha256 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
}; };
doBuild = false; doBuild = false;

7
users/erwin/home.nix
View file

@ -196,6 +196,7 @@ in
element-desktop element-desktop
fd fd
ffmpeg_5-full ffmpeg_5-full
freecad
gnome.nautilus gnome.nautilus
helvum helvum
horizon-eda horizon-eda
@ -221,9 +222,9 @@ in
nheko nheko
nomachine-client nomachine-client
nordzy-cursor-theme nordzy-cursor-theme
(noson.overrideAttrs ( (noson.overrideAttrs (_: {
_: { qtWrapperArgs = "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.libpulseaudio ]}"; } qtWrapperArgs = "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.libpulseaudio ]}";
)) }))
pamedia pamedia
pass pass
pavucontrol pavucontrol