From 8b97298b16a6c20f061615916016695cd2e758b8 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 6 Mar 2023 14:31:44 -0500 Subject: [PATCH] update kitchen configuration --- machines/kitchen/configuration.nix | 10 +++++----- machines/kitchen/hardware-configuration.nix | 2 +- modules/gnome.nix | 2 +- modules/nix.nix | 2 +- user/environments/nixos/home.nix | 3 ++- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/machines/kitchen/configuration.nix b/machines/kitchen/configuration.nix index ae6c92f..fd1c06e 100644 --- a/machines/kitchen/configuration.nix +++ b/machines/kitchen/configuration.nix @@ -28,13 +28,13 @@ micro firefox chromium - pkgs.gnome.gnome-tweaks + gnome.gnome-tweaks ]; home-manager = { - users.michael = import ../../user/environments/nixos/home.nix pkgs; - useGlobalPkgs = true; - }; + users.michael = import ../../user/environments/nixos/home.nix pkgs; + useGlobalPkgs = true; + }; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. @@ -73,6 +73,6 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "20.03"; # Did you read the comment? + system.stateVersion = "22.05"; # Did you read the comment? } \ No newline at end of file diff --git a/machines/kitchen/hardware-configuration.nix b/machines/kitchen/hardware-configuration.nix index 32d81e5..fc9774a 100644 --- a/machines/kitchen/hardware-configuration.nix +++ b/machines/kitchen/hardware-configuration.nix @@ -31,7 +31,7 @@ } ]; - nix.maxJobs = lib.mkDefault 12; + nix.settings.maxJobs = lib.mkDefault 12; # High-DPI console console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz"; } \ No newline at end of file diff --git a/modules/gnome.nix b/modules/gnome.nix index 3d50616..04ef6e2 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -3,6 +3,6 @@ services.xserver.enable = true; services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; - services.gnome.chrome-gnome-shell.enable = true; + services.gnome.gnome-browser-connector.enable = true; programs.dconf.enable = true; } \ No newline at end of file diff --git a/modules/nix.nix b/modules/nix.nix index aeba478..8c2ad22 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -7,7 +7,7 @@ # this is required until nix 2.4 is released package = pkgs.nixFlakes; - autoOptimiseStore = true; + settings.autoOptimiseStore = true; gc = { automatic = true; dates = "weekly"; diff --git a/user/environments/nixos/home.nix b/user/environments/nixos/home.nix index 4ccf46c..8d7204c 100644 --- a/user/environments/nixos/home.nix +++ b/user/environments/nixos/home.nix @@ -13,7 +13,8 @@ home.packages = with pkgs; [ firefox - foxitreader + # foxitreader ]; + home.stateVersion = "21.05"; }