Skip to content

Commit 3acbc89

Browse files
flake: update nixpkgs
1 parent 80f7ed1 commit 3acbc89

File tree

4 files changed

+27
-15
lines changed

4 files changed

+27
-15
lines changed

flake.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

machines/darwin/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
"asana"
5858
"dbeaver-community"
5959
"discord"
60+
"docker"
6061
"figma"
6162
"firefox"
6263
"google-chrome"

machines/vm/shared.nix

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@
6767
programs.dconf.enable = true;
6868

6969
# Enable Docker.
70-
virtualisation.docker.enable = true;
70+
virtualisation.docker = {
71+
enable = true;
72+
package = pkgs.docker_27;
73+
};
7174
users.extraGroups.docker.members = [ args.user ];
7275

7376
# Default system packages.
@@ -76,7 +79,7 @@
7679
bat
7780
chromium
7881
camunda-modeler
79-
dbeaver
82+
dbeaver-bin
8083
direnv
8184
elasticsearch
8285
git
@@ -103,20 +106,28 @@
103106
};
104107

105108
# Default shell for /bin/sh.
106-
environment.binsh = "${pkgs.dash}/bin/dash";
109+
# environment.binsh = "${pkgs.dash}/bin/dash";
107110

108-
hardware.opengl.enable = true;
111+
hardware.graphics.enable = true;
109112

110113
services.xserver = {
111114
enable = true;
112115
excludePackages = with pkgs; [ xterm ];
113116
desktopManager.xterm.enable = false;
114117
desktopManager.wallpaper.mode = "fill";
115-
displayManager.autoLogin.user = args.user;
116118
windowManager.bspwm.enable = true;
117119
};
120+
services.displayManager.autoLogin.user = args.user;
118121

122+
# For local development
119123
services.redis.servers."".enable = true;
124+
services.postgresql = {
125+
enable = true;
126+
ensureDatabases = [ "keycloak_ext_user_db" ];
127+
authentication = pkgs.lib.mkOverride 10 ''
128+
local all all trust
129+
'';
130+
};
120131

121132
# Enable configured sets of packages.
122133
conf = {

modules/nvim/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ in
126126
gnumake
127127
gcc
128128
nixd
129-
nixfmt
129+
nixfmt-classic
130130
nixpkgs-fmt
131131
manix
132132
luajit

0 commit comments

Comments
 (0)