From f05af2ffb98f00d269d7e81e8ef1a3e2ea67d04c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Wed, 31 Jan 2024 15:39:50 +0100
Subject: nixos: tweaks and update

---
 nixos/machine/lipwig.nix  | 2 +-
 nixos/modules/desktop.nix | 2 +-
 nixos/modules/gaming.nix  | 2 ++
 nixos/modules/generic.nix | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'nixos')

diff --git a/nixos/machine/lipwig.nix b/nixos/machine/lipwig.nix
index 5b1a369..188a097 100644
--- a/nixos/machine/lipwig.nix
+++ b/nixos/machine/lipwig.nix
@@ -147,7 +147,7 @@
         dbhost = "/run/postgresql";
         dbtableprefix = "oc_";
       };
-      extraOptions = {
+      settings = {
         #log_type = "systemd";
         default_phone_region = "CZ";
       };
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index 774353f..fbd6a75 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -315,7 +315,7 @@ in {
       earlySetup = true;
       useXkbConfig = true;
     };
-    services.xserver.xkbOptions = "grp:alt_shift_toggle,caps:escape";
+    services.xserver.xkb.options = "grp:alt_shift_toggle,caps:escape";
     services.gpm.enable = true;
 
     services.locate.enable = true;
diff --git a/nixos/modules/gaming.nix b/nixos/modules/gaming.nix
index cbf2d10..9ab5737 100644
--- a/nixos/modules/gaming.nix
+++ b/nixos/modules/gaming.nix
@@ -18,6 +18,8 @@ in {
   config = mkIf cnf {
     cynerd.desktop.enable = true;
 
+    environment.systemPackages = [pkgs.heroic];
+
     programs.steam = {
       enable = true;
       remotePlay.openFirewall = true;
diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix
index e8cc563..8ef616e 100644
--- a/nixos/modules/generic.nix
+++ b/nixos/modules/generic.nix
@@ -8,7 +8,7 @@
   isNative = config.nixpkgs.hostPlatform == config.nixpkgs.buildPlatform;
 in {
   config = {
-    system.stateVersion = "23.11";
+    system.stateVersion = "24.05";
 
     nix = {
       extraOptions = "experimental-features = nix-command flakes";
-- 
cgit v1.2.3