summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2022-02-12 20:09:09 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2022-02-12 20:09:09 +0100
commitf5fc458891cecffe22e4d77d75f1ad26a6417298 (patch)
tree575baa92a785fad0b19cd0ddfe05f5cdc7e43b30
parent714dd0655d2d9a94e4c1703b6f68e831dd10faa2 (diff)
downloadnixos-f5fc458891cecffe22e4d77d75f1ad26a6417298.tar
nixos-f5fc458891cecffe22e4d77d75f1ad26a6417298.tar.gz
nixos-f5fc458891cecffe22e4d77d75f1ad26a6417298.tar.bz2
nixos-f5fc458891cecffe22e4d77d75f1ad26a6417298.tar.xz
nixos-f5fc458891cecffe22e4d77d75f1ad26a6417298.zip
bump
-rw-r--r--accounts/gkleen@sif/default.nix9
-rw-r--r--flake.lock36
-rw-r--r--hosts/sif/default.nix2
-rw-r--r--hosts/sif/hw.nix2
-rw-r--r--system-profiles/build-server/default.nix2
-rw-r--r--system-profiles/core.nix8
6 files changed, 31 insertions, 28 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 15351b0d..e8352f53 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -65,6 +65,10 @@ in {
65 ]; 65 ];
66 66
67 home-manager.users.${userName} = { 67 home-manager.users.${userName} = {
68 nixpkgs.config = {
69 zathura.useMupdf = false;
70 };
71
68 programs = { 72 programs = {
69 ssh = { 73 ssh = {
70 matchBlocks = import ./ssh-hosts.nix { inherit pkgs; }; # customUtils.nixImport { dir = ./ssh-hosts; }; 74 matchBlocks = import ./ssh-hosts.nix { inherit pkgs; }; # customUtils.nixImport { dir = ./ssh-hosts; };
@@ -120,10 +124,7 @@ in {
120 settings = import ./alacritty.nix; 124 settings = import ./alacritty.nix;
121 }; 125 };
122 126
123 zathura = { 127 zathura.enable = true;
124 enable = true;
125 package = pkgs.zathura.override { useMupdf = false; };
126 };
127 128
128 mpv.config = { 129 mpv.config = {
129 demuxer-max-bytes = 1073741824; 130 demuxer-max-bytes = 1073741824;
diff --git a/flake.lock b/flake.lock
index 32a4a9ab..f1aee748 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
9 "utils": "utils" 9 "utils": "utils"
10 }, 10 },
11 "locked": { 11 "locked": {
12 "lastModified": 1642113498, 12 "lastModified": 1643787431,
13 "narHash": "sha256-4tNIt2EGDppYQI06gsid0QKW5dtBEOAiNKfMYC8wxv8=", 13 "narHash": "sha256-8IwuVgXulRE3ZWq6z8mytarawC32pKPKR20EyDtSH+w=",
14 "owner": "serokell", 14 "owner": "serokell",
15 "repo": "deploy-rs", 15 "repo": "deploy-rs",
16 "rev": "0ac333cdc03407538b5b19d60a8e7c64588490fb", 16 "rev": "4154ba1aaaf7333a916384c348d867d03b6f1409",
17 "type": "github" 17 "type": "github"
18 }, 18 },
19 "original": { 19 "original": {
@@ -26,11 +26,11 @@
26 "flake-compat": { 26 "flake-compat": {
27 "flake": false, 27 "flake": false,
28 "locked": { 28 "locked": {
29 "lastModified": 1627913399, 29 "lastModified": 1641205782,
30 "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", 30 "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
31 "owner": "edolstra", 31 "owner": "edolstra",
32 "repo": "flake-compat", 32 "repo": "flake-compat",
33 "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", 33 "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
34 "type": "github" 34 "type": "github"
35 }, 35 },
36 "original": { 36 "original": {
@@ -46,11 +46,11 @@
46 ] 46 ]
47 }, 47 },
48 "locked": { 48 "locked": {
49 "lastModified": 1642882610, 49 "lastModified": 1644534280,
50 "narHash": "sha256-pmdgeJ9v6y+T0UfNQ/Z+Hdv5tPshFFra5JLF/byUA/Y=", 50 "narHash": "sha256-Gzf/Jq/F1vvTp6XkzPU+pBCj3OSAFLiR7f0ptwRseiI=",
51 "owner": "nix-community", 51 "owner": "nix-community",
52 "repo": "home-manager", 52 "repo": "home-manager",
53 "rev": "c47c350f6518ed39c2a16e4fadf9137b6c559ddc", 53 "rev": "6d9d9294d09b5e88df65f8c6651efb8a4d7d2476",
54 "type": "github" 54 "type": "github"
55 }, 55 },
56 "original": { 56 "original": {
@@ -62,11 +62,11 @@
62 }, 62 },
63 "nixpkgs": { 63 "nixpkgs": {
64 "locked": { 64 "locked": {
65 "lastModified": 1642952869, 65 "lastModified": 1644687442,
66 "narHash": "sha256-hPl1Z2RY/nn8xMY79xN+2VZc5i1Y1ScblfRz661e1OI=", 66 "narHash": "sha256-s9zQQ4MSY7LGrtcDK+ZPC6h2POuRiZdpneCZZsKbpHU=",
67 "owner": "NixOS", 67 "owner": "NixOS",
68 "repo": "nixpkgs", 68 "repo": "nixpkgs",
69 "rev": "10a547c8f5dc1b4aec6f74225ec3081f70dfb586", 69 "rev": "b74e0ecf6d4b2b18afc8c919f45470210a411afa",
70 "type": "github" 70 "type": "github"
71 }, 71 },
72 "original": { 72 "original": {
@@ -91,11 +91,11 @@
91 ] 91 ]
92 }, 92 },
93 "locked": { 93 "locked": {
94 "lastModified": 1641374494, 94 "lastModified": 1644599065,
95 "narHash": "sha256-a56G6Um43+0+n+yNYhRCh/mSvDdRVzQHSKcFaDEB9/8=", 95 "narHash": "sha256-oFLRb9p954wiUGn8iU5wOCY/7yBrT4Xvg7Ew07MvSKs=",
96 "owner": "Mic92", 96 "owner": "Mic92",
97 "repo": "sops-nix", 97 "repo": "sops-nix",
98 "rev": "7edb4b080023ef12f39262a3aa7aab31015a7a0e", 98 "rev": "fc22eff3205e9742c1b0fd229c267bf237f0c43e",
99 "type": "github" 99 "type": "github"
100 }, 100 },
101 "original": { 101 "original": {
@@ -107,11 +107,11 @@
107 }, 107 },
108 "utils": { 108 "utils": {
109 "locked": { 109 "locked": {
110 "lastModified": 1631561581, 110 "lastModified": 1642700792,
111 "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", 111 "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
112 "owner": "numtide", 112 "owner": "numtide",
113 "repo": "flake-utils", 113 "repo": "flake-utils",
114 "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", 114 "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
115 "type": "github" 115 "type": "github"
116 }, 116 },
117 "original": { 117 "original": {
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 9516ceba..1460ad2a 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -369,7 +369,7 @@ in {
369 sound.enable = true; 369 sound.enable = true;
370 370
371 nix = { 371 nix = {
372 autoOptimiseStore = true; 372 settings.auto-optimise-store = true;
373 daemonCPUSchedPolicy = "idle"; 373 daemonCPUSchedPolicy = "idle";
374 daemonIOSchedClass = "idle"; 374 daemonIOSchedClass = "idle";
375 375
diff --git a/hosts/sif/hw.nix b/hosts/sif/hw.nix
index 92afb7c9..b7c17a9b 100644
--- a/hosts/sif/hw.nix
+++ b/hosts/sif/hw.nix
@@ -25,7 +25,7 @@
25 [ { device = "/dev/disk/by-uuid/50f3f856-cc17-4614-846a-34a14d5006ec"; } 25 [ { device = "/dev/disk/by-uuid/50f3f856-cc17-4614-846a-34a14d5006ec"; }
26 ]; 26 ];
27 27
28 nix.maxJobs = 12; 28 nix.settings.max-jobs = 12;
29 # High-DPI console 29 # High-DPI console
30 console.font = "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz"; 30 console.font = "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
31 31
diff --git a/system-profiles/build-server/default.nix b/system-profiles/build-server/default.nix
index 9cb9e142..20b23a31 100644
--- a/system-profiles/build-server/default.nix
+++ b/system-profiles/build-server/default.nix
@@ -12,7 +12,7 @@
12 group = "nix-ssh-builder"; 12 group = "nix-ssh-builder";
13 extraGroups = [ "ssh" ]; 13 extraGroups = [ "ssh" ];
14 }; 14 };
15 nix.trustedUsers = [ "nix-ssh-builder" ]; 15 nix.settings.trusted-users = [ "nix-ssh-builder" ];
16 16
17 services.openssh = { 17 services.openssh = {
18 enable = true; 18 enable = true;
diff --git a/system-profiles/core.nix b/system-profiles/core.nix
index c243f857..0b20d944 100644
--- a/system-profiles/core.nix
+++ b/system-profiles/core.nix
@@ -43,9 +43,11 @@ in {
43 43
44 nix = { 44 nix = {
45 package = pkgs.nixUnstable; 45 package = pkgs.nixUnstable;
46 useSandbox = true; 46 settings = {
47 allowedUsers = [ "*" ]; 47 sandbox = true;
48 trustedUsers = [ "root" "@wheel" ]; 48 allowed-users = [ "*" ];
49 trusted-users = [ "root" "@wheel" ];
50 };
49 extraOptions = '' 51 extraOptions = ''
50 experimental-features = nix-command flakes 52 experimental-features = nix-command flakes
51 ''; 53 '';