diff options
| -rw-r--r-- | flake.lock | 20 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | modules/common.nix | 4 | ||||
| -rw-r--r-- | modules/users.nix | 3 |
4 files changed, 15 insertions, 14 deletions
@@ -23,11 +23,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1637564544, - "narHash": "sha256-wwdjkfdQEbFn+Gr1iBiA5DGgl+Q7PASL83Swo/Wqwy0=", + "lastModified": 1638440530, + "narHash": "sha256-kmoNW+RmSka988iWvSrkiAxO8g6D76O0gW2cIIhL6U8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "08cda8e3a5a4e685af525e5a589dfeb74267d505", + "rev": "4c9f07277bd4bc29a051ff2a0ca58c6403e3881a", "type": "github" }, "original": { @@ -39,27 +39,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1637448181, - "narHash": "sha256-ujcXli4esmtIHUBjE1BjmMuBWrcNvlHZrVXx56i5B1M=", + "lastModified": 1638887115, + "narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d5b65f812cd4f5a8fa74b406075b59a46f1cfd98", + "rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-21.05", + "ref": "nixos-21.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1637155076, - "narHash": "sha256-26ZPNiuzlsnXpt55Q44+yzXvp385aNAfevzVEKbrU5Q=", + "lastModified": 1638986258, + "narHash": "sha256-OceRdctKZRSgqQxVRvvNB0MaEnFMzQqjUffecoDE9eI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "715f63411952c86c8f57ab9e3e3cb866a015b5f2", + "rev": "581d2d6c9cd5c289002203581d8aa0861963a933", "type": "github" }, "original": { @@ -1,5 +1,5 @@ { - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.05"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11"; inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master"; inputs.pms7003.url = "github:orbekk/pms7003/master"; diff --git a/modules/common.nix b/modules/common.nix index 84f7b83..9d649c1 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -86,8 +86,8 @@ gc.automatic = lib.mkDefault true; trustedBinaryCaches = [ "https://cache.nixos.org" ]; binaryCaches = trustedBinaryCaches; - daemonNiceLevel = 10; - daemonIONiceLevel = 10; + daemonCPUSchedPolicy = "idle"; + daemonIOSchedPriority = 10; package = pkgs.nixFlakes; extraOptions = '' experimental-features = nix-command flakes diff --git a/modules/users.nix b/modules/users.nix index ff4e7e2..7729e7c 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -61,8 +61,8 @@ in { }; minecraft = { name = "minecraft"; - uid = config.ids.uids.minecraft; extraGroups = [ "readonly" ]; + group = "minecraft"; isSystemUser = true; }; stats = { @@ -155,6 +155,7 @@ in { pjournal = { gid = 507; }; pjournal_test = { gid = 508; }; hledger = lib.mkIf config.orbekk.hledger-web.enable { }; + minecraft = {}; }; }; } |