Merge pull request #330 from ifd3f/update/2024-10-17

it's good enough but still errors
ifd3f · Oct 20, 2024 · 8b212da · 8b212da
2 parents ccad698 + 08f298e
commit 8b212da
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 35 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/machines/gfdesk/configuration.nix b/machines/gfdesk/configuration.nix
@@ -48,7 +48,7 @@ with lib; {
     ensureDatabases = [ "akkoma" ];
     ensureUsers = [{
       name = "akkoma";
-      ensurePermissions = { "DATABASE \"akkoma\"" = "ALL PRIVILEGES"; };
+      ensureDBOwnership = true;
     }];
 
     settings = {

diff --git a/machines/shai-hulud/configuration.nix b/machines/shai-hulud/configuration.nix
@@ -12,8 +12,8 @@ with lib; {
       ./fs.nix
     ];
 
-  microsoft-surface.kernelVersion = "6.8";
-  microsoft-surface.ipts = {
+  microsoft-surface.kernelVersion = "6.10";
+  services.iptsd = {
     enable = true;
     config = {
       Config = {

diff --git a/nix/home-manager/astral/cli/.gitattributes b/nix/home-manager/astral/cli/.gitattributes
@@ -1 +1 @@
-.p10k.zsh linguist-vendored
+p10k.zsh linguist-vendored
diff --git a/nix/home-manager/astral/cli/default.nix b/nix/home-manager/astral/cli/default.nix
@@ -1,6 +1,6 @@
 # CLI-only home manager settings
 { config, lib, pkgs, ... }:
-let commonProfile = builtins.readFile ./.profile;
+let commonProfile = builtins.readFile ./profile.sh;
 in with lib; {
   imports = [ ./conda-hooks.nix ];
 
@@ -107,7 +107,7 @@ in with lib; {
 
         initExtraBeforeCompInit = ''
           # Powerlevel10k configuration
-          source ${./.p10k.zsh}
+          source ${./p10k.zsh}
 
           # kubectl completion
           type kubectl > /dev/null && source <(kubectl completion zsh)

diff --git a/nix/home-manager/astral/cli/.p10k.zsh → nix/home-manager/astral/cli/p10k.zsh b/nix/home-manager/astral/cli/.p10k.zsh → nix/home-manager/astral/cli/p10k.zsh
diff --git a/nix/home-manager/astral/cli/.profile → nix/home-manager/astral/cli/profile.sh b/nix/home-manager/astral/cli/.profile → nix/home-manager/astral/cli/profile.sh
diff --git a/nix/nixos-modules/roles/nextcloud.nix b/nix/nixos-modules/roles/nextcloud.nix
@@ -117,7 +117,7 @@ in {
     ensureDatabases = [ "nextcloud" ];
     ensureUsers = [{
       name = "nextcloud";
-      ensurePermissions = { "DATABASE \"nextcloud\"" = "ALL PRIVILEGES"; };
+      ensureDBOwnership = true;
     }];
   };
 }
diff --git a/nix/shells.nix b/nix/shells.nix
@@ -27,7 +27,6 @@ let
       tcpdump
       terraform
       terraform-ls
-      tftp-hpa
       tmux
       vault
       wget
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		.p10k.zsh linguist-vendored
		p10k.zsh linguist-vendored
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,6 @@ let @@
           tcpdump
           terraform
           terraform-ls
-          tftp-hpa
           tmux
           vault
           wget
@@ Expand Down @@