diff --git a/flake.lock b/flake.lock index 0e4adeb..1f6a770 100644 --- a/flake.lock +++ b/flake.lock @@ -276,11 +276,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1700390070, + "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", "type": "github" }, "original": { diff --git a/modules/home-manager/firefox.nix b/modules/home-manager/firefox.nix index 33e8273..c03f0a8 100644 --- a/modules/home-manager/firefox.nix +++ b/modules/home-manager/firefox.nix @@ -5,7 +5,7 @@ enable = true; # TODO: uses nixpkgs.pass so pass otp doesn't work - package = pkgs.firefox.override {extraNativeMessagingHosts = [pkgs.passff-host];}; + package = pkgs.firefox.override {nativeMessagingHosts = [pkgs.passff-host];}; # extensions = with pkgs.nur.repos.rycee.firefox-addons; [ # ublock-origin diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix index cded0c7..4df75a9 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/home-manager/hyprland.nix @@ -27,6 +27,10 @@ "desc:Dell Inc. DELL U2720Q D3TM623,3840x2160@60,3840x0,1.5,transform,3" ]; + xwayland = { + force_zero_scaling = true; + }; + exec-once = [ "hyprpaper" "mako" diff --git a/modules/nixos/postgres.nix b/modules/nixos/postgres.nix index 507160a..5a471de 100644 --- a/modules/nixos/postgres.nix +++ b/modules/nixos/postgres.nix @@ -6,9 +6,7 @@ ensureUsers = [ { name = "daniel"; - ensurePermissions = { - "DATABASE daniel" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ]; enableTCPIP = true; diff --git a/nixos/beefcake/default.nix b/nixos/beefcake/default.nix index 3ab070b..dab8a57 100644 --- a/nixos/beefcake/default.nix +++ b/nixos/beefcake/default.nix @@ -119,12 +119,6 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 owner = config.systemd.services.plausible.serviceConfig.User; group = config.systemd.services.plausible.serviceConfig.Group; }; - plausible-erlang-cookie = { - path = "/var/lib/plausible/plausible-erlang-cookie"; - mode = "0440"; - owner = config.systemd.services.plausible.serviceConfig.User; - group = config.systemd.services.plausible.serviceConfig.Group; - }; plausible-secret-key-base = { path = "/var/lib/plausible/plausible-secret-key-base"; mode = "0440"; @@ -415,7 +409,6 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 services.plausible = { # TODO: enable enable = false; - releaseCookiePath = config.sops.secrets.plausible-erlang-cookie.path; database = { clickhouse.setup = true; postgres = { @@ -442,21 +435,15 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 ensureUsers = [ { name = "daniel"; - ensurePermissions = { - "DATABASE daniel" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } { name = "plausible"; - ensurePermissions = { - "DATABASE plausible" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } { name = "nextcloud"; - ensurePermissions = { - "DATABASE nextcloud" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ]; dataDir = "/storage/postgres"; diff --git a/nixos/foxtrot/default.nix b/nixos/foxtrot/default.nix index a355864..e1eacda 100644 --- a/nixos/foxtrot/default.nix +++ b/nixos/foxtrot/default.nix @@ -40,7 +40,7 @@ extraConfig = '' HandlePowerKey=suspend-then-hibernate IdleAction=suspend-then-hibernate - IdleActionSec=1m + IdleActionSec=10m ''; }; systemd.sleep.extraConfig = "HibernateDelaySec=30m"; @@ -49,7 +49,7 @@ services.fwupd.extraRemotes = ["lvfs-testing"]; hardware.opengl.extraPackages = [ - pkgs.rocmPackages.clr.icd + # pkgs.rocmPackages.clr.icd pkgs.amdvlk # encoding/decoding acceleration pkgs.libvdpau-va-gl @@ -63,7 +63,7 @@ efi.canTouchEfiVariables = true; systemd-boot.enable = true; }; - kernelPackages = pkgs.linuxPackages_6_5; + kernelPackages = pkgs.linuxPackages_latest; # sudo filefrag -v /swap/swapfile | awk '$1=="0:" {print substr($4, 1, length($4)-2)}' # the above won't work for btrfs, instead you need # btrfs inspect-internal map-swapfile -r /swap/swapfile diff --git a/nixos/thinker/default.nix b/nixos/thinker/default.nix index 8acf751..42d8229 100644 --- a/nixos/thinker/default.nix +++ b/nixos/thinker/default.nix @@ -25,7 +25,7 @@ extraConfig = '' HandlePowerKey=suspend-then-hibernate IdleAction=suspend-then-hibernate - IdleActionSec=1m + IdleActionSec=10m ''; }; systemd.sleep.extraConfig = "HibernateDelaySec=30m";