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

Compare commits

base: erwin:d4e72e1acc08e9fc6602aef7b9b41d6c9ebd9678
Branches Tags
erwin:main
...
compare: erwin:394a9fc2d1f6a115ec5f8bd7db71baad28039bcb
Branches Tags
erwin:main

6 commits
d4e72e1acc ... 394a9fc2d1

Author SHA1 Message Date
Erwin Boskma
394a9fc2d1
keycloak: Update plugins 2024-08-26 09:31:49 +02:00
Erwin Boskma
ed4049c96f
server: Disable nushell, bandwhich 2024-08-22 20:45:01 +02:00
Erwin Boskma
2e6157e0c7
hassbridge: cleanup 2024-08-22 20:26:13 +02:00
Erwin Boskma
d586c5a71a
loki: Use new implementation of switch-to-configuration 2024-08-22 20:25:54 +02:00
Erwin Boskma
6c706e8dfe
gitea: Use latest version of forgejo 2024-08-22 20:25:39 +02:00
Erwin Boskma
44649923a6
flake.lock: Update 
Flake lock file updates:

• Updated input 'attic':
    'github:zhaofengli/attic/acf3c351f8de47c6857f31948ab253f9c7ce2a6f?narHash=sha256-jcY81r8PdMQ9dCGhT0YLZzxPj3kQJXyWCmvQLXbR1EI%3D' (2024-08-19)
  → 'github:zhaofengli/attic/6d9aeaef0a067d664cb11bb7704f7ec373d47fb2?narHash=sha256-cltFh4su2vcFidxKp7LuEgX3ZGLfPy0DCdrQZ/QTe68%3D' (2024-08-21)
• Updated input 'disko':
    'github:nix-community/disko/4e719b38fa7c85f4f65d0308ca7084c91e7bdd6d?narHash=sha256-o1HdAf%2B7IGv9M13R3c%2Bzc/sJ0QgeEnhsvHBcodI4UpM%3D' (2024-08-19)
  → 'github:nix-community/disko/4b866c9942d0f771ae934f04ca9859936f9bfbcf?narHash=sha256-dtL4vielmrko/0XpZ3Wfd7czVvv3NC5oiwh8PKJN9hw%3D' (2024-08-22)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/d153d9f118d71fa8f4d3204639b4fd32d793ab57?narHash=sha256-kZm8GJfEt8Na5JyNfjXCIUKiMOAbWDNsCejh2OeF7r8%3D' (2024-08-19)
  → 'github:nix-community/emacs-overlay/f97fc32d98cd25d40830543e95dc7cd66ef9ac63?narHash=sha256-ZoV3H/kFChy3wwPLHz%2B87cc6vve0sGufuyni27Z4lBU%3D' (2024-08-22)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/c42fcfbdfeae23e68fc520f9182dde9f38ad1890?narHash=sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI%3D' (2024-08-17)
  → 'github:NixOS/nixpkgs/f1bad50880bae73ff2d82fafc22010b4fc097a9c?narHash=sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE%3D' (2024-08-19)
• Updated input 'eww':
    'github:elkowar/eww/4d55e9ad63d1fae887726dffcd25a32def23d34f?narHash=sha256-LTSFlW/46hl1u9SzqnvbtNxswCW05bhwOY6CzVEJC5o%3D' (2024-07-05)
  → 'github:elkowar/eww/696135a6bba3d083d326eda1f81471c636987afb?narHash=sha256-w02TAMaUM0jpIWhZ8mMC7QmYn5ZaPoW7m%2B3voijJQ30%3D' (2024-08-21)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/8a3354191c0d7144db9756a74755672387b702ba?narHash=sha256-Grh5PF0%2BgootJfOJFenTTxDTYPidA3V28dqJ/WV7iis%3D' (2024-08-18)
  → 'github:nixos/nixpkgs/c374d94f1536013ca8e92341b540eba4c22f9c62?narHash=sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh%2BaRKoCdaAv5fiO0%3D' (2024-08-21)
• Updated input 'pre-commit-hooks':
    'github:cachix/git-hooks.nix/bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba?narHash=sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc%3D' (2024-08-16)
  → 'github:cachix/git-hooks.nix/6cedaa7c1b4f82a266e5d30f212273e60d62cb0d?narHash=sha256-TuSaYdhOxeaaE9885mFO1lZHHax33GD5A9dczJrGUjw%3D' (2024-08-21)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/c7d36e0947826e0751a5214ffe82533fbc909bc0?narHash=sha256-b1g7w0sw%2BMDAhUAeCoX1vlTghsqcDZkxr%2Bk9OZmxPa8%3D' (2024-08-19)
  → 'github:oxalica/rust-overlay/6dc6d34a3a217457d7044dcce32b6d537480a6a1?narHash=sha256-x/XhOAszT/ejditCHUtGOjQcVg2AQhrC/QVew3i7kTI%3D' (2024-08-22)
 2024-08-22 14:50:06 +02:00
8 changed files with 43 additions and 37 deletions
Show stats Expand all files Collapse all files

48
flake.lock
View file

@ -31,11 +31,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1724086414, "lastModified": 1724226964,
"narHash": "sha256-jcY81r8PdMQ9dCGhT0YLZzxPj3kQJXyWCmvQLXbR1EI=", "narHash": "sha256-cltFh4su2vcFidxKp7LuEgX3ZGLfPy0DCdrQZ/QTe68=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "attic", "repo": "attic",
"rev": "acf3c351f8de47c6857f31948ab253f9c7ce2a6f", "rev": "6d9aeaef0a067d664cb11bb7704f7ec373d47fb2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -193,11 +193,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724031427, "lastModified": 1724290508,
"narHash": "sha256-o1HdAf+7IGv9M13R3c+zc/sJ0QgeEnhsvHBcodI4UpM=", "narHash": "sha256-dtL4vielmrko/0XpZ3Wfd7czVvv3NC5oiwh8PKJN9hw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "4e719b38fa7c85f4f65d0308ca7084c91e7bdd6d", "rev": "4b866c9942d0f771ae934f04ca9859936f9bfbcf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,11 +217,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1724086605, "lastModified": 1724318074,
"narHash": "sha256-kZm8GJfEt8Na5JyNfjXCIUKiMOAbWDNsCejh2OeF7r8=", "narHash": "sha256-ZoV3H/kFChy3wwPLHz+87cc6vve0sGufuyni27Z4lBU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "d153d9f118d71fa8f4d3204639b4fd32d793ab57", "rev": "f97fc32d98cd25d40830543e95dc7cd66ef9ac63",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -241,11 +241,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720177068, "lastModified": 1724258011,
"narHash": "sha256-LTSFlW/46hl1u9SzqnvbtNxswCW05bhwOY6CzVEJC5o=", "narHash": "sha256-w02TAMaUM0jpIWhZ8mMC7QmYn5ZaPoW7m+3voijJQ30=",
"owner": "elkowar", "owner": "elkowar",
"repo": "eww", "repo": "eww",
"rev": "4d55e9ad63d1fae887726dffcd25a32def23d34f", "rev": "696135a6bba3d083d326eda1f81471c636987afb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -737,11 +737,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1723938990, "lastModified": 1724098845,
"narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", "narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", "rev": "f1bad50880bae73ff2d82fafc22010b4fc097a9c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -785,11 +785,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1723991338, "lastModified": 1724224976,
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8a3354191c0d7144db9756a74755672387b702ba", "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -837,11 +837,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1723803910, "lastModified": 1724227338,
"narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=", "narHash": "sha256-TuSaYdhOxeaaE9885mFO1lZHHax33GD5A9dczJrGUjw=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba", "rev": "6cedaa7c1b4f82a266e5d30f212273e60d62cb0d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -901,11 +901,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724034091, "lastModified": 1724293269,
"narHash": "sha256-b1g7w0sw+MDAhUAeCoX1vlTghsqcDZkxr+k9OZmxPa8=", "narHash": "sha256-x/XhOAszT/ejditCHUtGOjQcVg2AQhrC/QVew3i7kTI=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "c7d36e0947826e0751a5214ffe82533fbc909bc0", "rev": "6dc6d34a3a217457d7044dcce32b6d537480a6a1",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
machines/gitea/forgejo/default.nix
View file

@ -11,6 +11,8 @@ in
{ {
services.forgejo = { services.forgejo = {
enable = true; enable = true;
package = pkgs.forgejo;
user = "git"; user = "git";
lfs = { lfs = {
enable = true; enable = true;

8
machines/loki/configuration.nix
View file

@ -92,6 +92,14 @@
}; };
}; };
# Enable new implementation of switch-to-configuration built in Rust
system = {
switch = {
enable = false;
enableNg = true;
};
};
swapDevices = [ { device = "/dev/disk/by-uuid/d93788f7-1b94-4687-8313-055d17f42b7e"; } ]; swapDevices = [ { device = "/dev/disk/by-uuid/d93788f7-1b94-4687-8313-055d17f42b7e"; } ];
# high-resolution display # high-resolution display

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-7YJjOChUC5HScNdU5XXp3gDparRCKtj1s2FQwyp6RPI="; hash = "sha256-Tm7ZmbcKnj3KunJNiUzhkYa0M0G0Lh23/yhqDibcw8M=";
}; };
sourceRoot = "source/integration/admin-client"; sourceRoot = "source/integration/admin-client";
mvnHash = "sha256-7TRNmQMo/KtM/XWF+KF7ALgr5J/7H6ejTtzsD2oIKZ0="; mvnHash = "sha256-U2deqVLSy4r66jM83zP9Rt65oXDu0pixTdpQYLwLZio=";
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
installPhase = '' installPhase = ''

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

@ -1,6 +1,6 @@
{ buildMavenPackage, fetchFromGitHub }: { buildMavenPackage, fetchFromGitHub }:
let let
version = "0.77"; version = "0.78";
in in
buildMavenPackage { buildMavenPackage {
inherit version; inherit version;
@ -10,7 +10,7 @@ buildMavenPackage {
owner = "p2-inc"; owner = "p2-inc";
repo = "keycloak-orgs"; repo = "keycloak-orgs";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Gz/Hspd8EHGzWIKOp+DRZ8TACfdPuIx0NjJqC6adEaA="; hash = "sha256-pxdaRQtAM+4cn/AyH7wYzg/LSwgoWEnGcaX+dA+ccQw=";
# hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
}; };

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }: { stdenv, fetchFromGitHub }:
let let
version = "25.0.2.1721752809"; version = "25.0.4.1724354480";
jarVersion = "25.0.2"; jarVersion = "25.0.2";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -11,7 +11,7 @@ stdenv.mkDerivation {
owner = "p2-inc"; owner = "p2-inc";
repo = "phasetwo-containers"; repo = "phasetwo-containers";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-U2gO5i3Uwy8ggHmyTkdrPnVzJHhLCB5voZqCh0JIJps="; hash = "sha256-BuQdJKl8Hglku7JnvXbWjP68m2wRstRyFx3IDyDPjNs=";
# hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
}; };

3
pkgs/hassbridge/default.nix
View file

@ -4,7 +4,7 @@
fetchFromGitHub, fetchFromGitHub,
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication {
pname = "hassbridge"; pname = "hassbridge";
version = "unstable-2024-08-10"; version = "unstable-2024-08-10";
pyproject = true; pyproject = true;
@ -33,7 +33,6 @@ python3.pkgs.buildPythonApplication rec {
description = "Control your Home Assistant media players from your desktop using MPRIS"; description = "Control your Home Assistant media players from your desktop using MPRIS";
homepage = "https://github.com/rytilahti/homeassistant-mpris-bridge"; homepage = "https://github.com/rytilahti/homeassistant-mpris-bridge";
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = with maintainers; [ ];
mainProgram = "hassbridge"; mainProgram = "hassbridge";
}; };
} }

7
users/erwin/server.nix
View file

@ -14,8 +14,6 @@ in
home-manager.users.erwin = { home-manager.users.erwin = {
_module.args.flake-inputs = inputs; _module.args.flake-inputs = inputs;
nixpkgs.config.allowUnfree = true;
eboskma = { eboskma = {
programs = { programs = {
atuin.enable = true; atuin.enable = true;
@ -27,7 +25,7 @@ in
email = "erwin@datarift.nl"; email = "erwin@datarift.nl";
}; };
neovim.enable = true; neovim.enable = true;
nushell.enable = true; nushell.enable = false;
ssh.enable = true; ssh.enable = true;
starship.enable = true; starship.enable = true;
}; };
@ -50,9 +48,9 @@ in
btop btop
fd fd
iotop iotop
nmap
procs procs
ripgrep ripgrep
units
]; ];
}; };
@ -69,6 +67,5 @@ in
builtins.attrNames (builtins.readDir ../../home-manager/modules) builtins.attrNames (builtins.readDir ../../home-manager/modules)
)); ));
}; };
programs.bandwhich.enable = true;
}; };
} }