From 8ac10c646a6e3ca4e9dd4eaf1ed8225b71cabd06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 4 Jul 2024 17:09:32 +0200
Subject: Tweak the packages with system update

---
 nixos/configurations/spt-mox2.nix |  7 ++++++-
 nixos/modules/desktop.nix         | 12 ++++++------
 nixos/modules/develop.nix         |  3 +--
 3 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'nixos')

diff --git a/nixos/configurations/spt-mox2.nix b/nixos/configurations/spt-mox2.nix
index 085bb5f..d596369 100644
--- a/nixos/configurations/spt-mox2.nix
+++ b/nixos/configurations/spt-mox2.nix
@@ -1,4 +1,8 @@
-{config, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   turris.board = "mox";
   deploy = {
     enable = true;
@@ -22,6 +26,7 @@
     };
   };
 
+  boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_1_turris_mox;
   services.journald.extraConfig = ''
     SystemMaxUse=512M
   '';
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index 2b19b93..bdf32f5 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -24,9 +24,9 @@ in {
 
   config = mkIf cnf.enable {
     hardware = {
-      opengl = {
-        driSupport = true;
-        driSupport32Bit = true;
+      graphics = {
+        enable = true;
+        enable32Bit = true;
       };
       bluetooth.enable = mkIf cnf.laptop true;
     };
@@ -37,7 +37,7 @@ in {
         wrapperFeatures.gtk = true;
         extraPackages = with pkgs;
           [
-            gnome.dconf-editor
+            dconf-editor
             glib
             gsettings-desktop-schemas
             sysstat
@@ -49,7 +49,7 @@ in {
             myswaylock
 
             alacritty
-            gnome.nautilus
+            nautilus
 
             kanshi
             wdisplays
@@ -110,7 +110,7 @@ in {
             nordic
             nordzy-cursor-theme
             nordzy-icon-theme
-            gnome.adwaita-icon-theme
+            adwaita-icon-theme
             vanilla-dmz
             sound-theme-freedesktop
             gnome.gnome-characters
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index 2a20527..971d219 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -41,7 +41,6 @@ in {
       dev
       cachix
       nurl
-      nix-universal-prefetch
       nil
       alejandra
       statix
@@ -54,7 +53,7 @@ in {
       bats
       shellcheck
       shfmt
-      nodePackages.bash-language-server
+      bash-language-server
       jq
       yq
       fq
-- 
cgit v1.2.3