aboutsummaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
Diffstat (limited to 'nixos')
-rw-r--r--nixos/configurations/spt-mox2.nix7
-rw-r--r--nixos/modules/desktop.nix12
-rw-r--r--nixos/modules/develop.nix3
3 files changed, 13 insertions, 9 deletions
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