summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2023-08-16 10:17:55 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2023-08-16 10:17:55 +0200
commitf2eb547f053d243861bfdd254841986cc720e358 (patch)
tree2e80ceaa1183973e711ef4b957b2fd1b5e9b9f4f
parentd780beb2679886b5378eb5e50f4acea0e2e357d6 (diff)
downloadnixos-f2eb547f053d243861bfdd254841986cc720e358.tar
nixos-f2eb547f053d243861bfdd254841986cc720e358.tar.gz
nixos-f2eb547f053d243861bfdd254841986cc720e358.tar.bz2
nixos-f2eb547f053d243861bfdd254841986cc720e358.tar.xz
nixos-f2eb547f053d243861bfdd254841986cc720e358.zip
...
-rw-r--r--accounts/gkleen@sif/default.nix18
-rw-r--r--flake.lock18
-rw-r--r--system-profiles/nfsroot.nix7
3 files changed, 22 insertions, 21 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 89a6fc4c..db82df29 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -389,18 +389,18 @@ in {
389 home = { 389 home = {
390 packages = with pkgs; [ 390 packages = with pkgs; [
391 fira fira-code powerline-fonts nerdfonts pavucontrol 391 fira fira-code powerline-fonts nerdfonts pavucontrol
392 wrappedKeepassxc sxiv xclip mumble pulseaudio-ctl pamixer libnotify 392 wrappedKeepassxc sxiv xclip mumble pulseaudio-ctl pamixer
393 synergy xorg.xbacklight screen-message wrappedYTMDesktop 393 libnotify synergy xorg.xbacklight screen-message
394 qt5ct playerctl evince thunderbird wrappedZulip zoom-us 394 wrappedYTMDesktop qt5ct playerctl evince thunderbird
395 steam steam-run wireshark virt-manager rclone 395 wrappedZulip zoom-us steam steam-run wireshark virt-manager
396 cached-nix-shell xournal xmonad worktime fira-code-symbols 396 rclone cached-nix-shell xournal xmonad worktime
397 libreoffice xournalpp wrappedChrome nixos-shell virt-viewer 397 fira-code-symbols libreoffice xournalpp wrappedChrome
398 freerdp gnome-icon-theme paper-icon-theme sshpassSecret 398 nixos-shell virt-viewer freerdp gnome-icon-theme
399 weechat wrappedElementDesktop # helvum 399 paper-icon-theme sshpassSecret weechat wrappedElementDesktop
400 matrix-synapse-tools.synadm wrappedRocketChatDesktop 400 matrix-synapse-tools.synadm wrappedRocketChatDesktop
401 flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs 401 flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs
402 sieve-connect gimp inkscape udiskie glab scrot nitrokey-app 402 sieve-connect gimp inkscape udiskie glab scrot nitrokey-app
403 # pynitrokey 403 pynitrokey
404 ]; 404 ];
405 405
406 file = { 406 file = {
diff --git a/flake.lock b/flake.lock
index c81cea13..96c2bb80 100644
--- a/flake.lock
+++ b/flake.lock
@@ -369,11 +369,11 @@
369 ] 369 ]
370 }, 370 },
371 "locked": { 371 "locked": {
372 "lastModified": 1691292840, 372 "lastModified": 1691897365,
373 "narHash": "sha256-NA+o/NoOOQhzAQwB2JpeKoG+iYQ6yn/XXVxaGd5HSQI=", 373 "narHash": "sha256-jvWIU4ht3YAmF8TDVM2Ps2+Gf4MtNGLL1zEWQZdTrzU=",
374 "owner": "Mic92", 374 "owner": "Mic92",
375 "repo": "nix-index-database", 375 "repo": "nix-index-database",
376 "rev": "6c626d54d0414d34c771c0f6f9d771bc8aaaa3c4", 376 "rev": "f4d70d098f066a30c7087144063dca179495f7d6",
377 "type": "github" 377 "type": "github"
378 }, 378 },
379 "original": { 379 "original": {
@@ -503,11 +503,11 @@
503 }, 503 },
504 "nixpkgs_2": { 504 "nixpkgs_2": {
505 "locked": { 505 "locked": {
506 "lastModified": 1691698647, 506 "lastModified": 1692169981,
507 "narHash": "sha256-MU4ZnUEczmemVGHrby6UpzcSfDdc4QCZE0gjHQhQec4=", 507 "narHash": "sha256-/T4lnSxDf+8Iv1wSkEp9wq1dBZRJ2tEmDXenNOj29FE=",
508 "owner": "NixOS", 508 "owner": "NixOS",
509 "repo": "nixpkgs", 509 "repo": "nixpkgs",
510 "rev": "39d212d84007c1c4039bc9af2c043344cfb0eead", 510 "rev": "c9921997c951aaf4b4582a24cdf133e93abd2ffb",
511 "type": "github" 511 "type": "github"
512 }, 512 },
513 "original": { 513 "original": {
@@ -682,11 +682,11 @@
682 ] 682 ]
683 }, 683 },
684 "locked": { 684 "locked": {
685 "lastModified": 1690199016, 685 "lastModified": 1692127428,
686 "narHash": "sha256-yTLL72q6aqGmzHq+C3rDp3rIjno7EJZkFLof6Ika7cE=", 686 "narHash": "sha256-+e9dD67mpGLBhhqdv7A7i1g/r2AT/PmqthWaYHyVZR4=",
687 "owner": "Mic92", 687 "owner": "Mic92",
688 "repo": "sops-nix", 688 "repo": "sops-nix",
689 "rev": "c36df4fe4bf4bb87759b1891cab21e7a05219500", 689 "rev": "f81e73cf9a4ef4b949b9225be3daa1e586c096da",
690 "type": "github" 690 "type": "github"
691 }, 691 },
692 "original": { 692 "original": {
diff --git a/system-profiles/nfsroot.nix b/system-profiles/nfsroot.nix
index a5dce5f2..519f127c 100644
--- a/system-profiles/nfsroot.nix
+++ b/system-profiles/nfsroot.nix
@@ -69,9 +69,10 @@ in {
69 ]; 69 ];
70 }; 70 };
71 71
72 nix.extraOptions = '' 72 nix.settings = {
73 use-sqlite-wal = false 73 use-sqlite-wal = false;
74 ''; 74 use-xdg-base-directories = true;
75 };
75 76
76 boot.initrd.availableKernelModules = [ "nfs" "nfsv4" "overlay" ]; 77 boot.initrd.availableKernelModules = [ "nfs" "nfsv4" "overlay" ];
77 boot.initrd.supportedFilesystems = [ "nfs" "nfsv4" "overlay" ]; 78 boot.initrd.supportedFilesystems = [ "nfs" "nfsv4" "overlay" ];