From f2eb547f053d243861bfdd254841986cc720e358 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 16 Aug 2023 10:17:55 +0200 Subject: ... --- accounts/gkleen@sif/default.nix | 18 +++++++++--------- flake.lock | 18 +++++++++--------- system-profiles/nfsroot.nix | 7 ++++--- 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 { home = { packages = with pkgs; [ fira fira-code powerline-fonts nerdfonts pavucontrol - wrappedKeepassxc sxiv xclip mumble pulseaudio-ctl pamixer libnotify - synergy xorg.xbacklight screen-message wrappedYTMDesktop - qt5ct playerctl evince thunderbird wrappedZulip zoom-us - steam steam-run wireshark virt-manager rclone - cached-nix-shell xournal xmonad worktime fira-code-symbols - libreoffice xournalpp wrappedChrome nixos-shell virt-viewer - freerdp gnome-icon-theme paper-icon-theme sshpassSecret - weechat wrappedElementDesktop # helvum + wrappedKeepassxc sxiv xclip mumble pulseaudio-ctl pamixer + libnotify synergy xorg.xbacklight screen-message + wrappedYTMDesktop qt5ct playerctl evince thunderbird + wrappedZulip zoom-us steam steam-run wireshark virt-manager + rclone cached-nix-shell xournal xmonad worktime + fira-code-symbols libreoffice xournalpp wrappedChrome + nixos-shell virt-viewer freerdp gnome-icon-theme + paper-icon-theme sshpassSecret weechat wrappedElementDesktop matrix-synapse-tools.synadm wrappedRocketChatDesktop flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs sieve-connect gimp inkscape udiskie glab scrot nitrokey-app - # pynitrokey + pynitrokey ]; file = { diff --git a/flake.lock b/flake.lock index c81cea13..96c2bb80 100644 --- a/flake.lock +++ b/flake.lock @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1691292840, - "narHash": "sha256-NA+o/NoOOQhzAQwB2JpeKoG+iYQ6yn/XXVxaGd5HSQI=", + "lastModified": 1691897365, + "narHash": "sha256-jvWIU4ht3YAmF8TDVM2Ps2+Gf4MtNGLL1zEWQZdTrzU=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "6c626d54d0414d34c771c0f6f9d771bc8aaaa3c4", + "rev": "f4d70d098f066a30c7087144063dca179495f7d6", "type": "github" }, "original": { @@ -503,11 +503,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1691698647, - "narHash": "sha256-MU4ZnUEczmemVGHrby6UpzcSfDdc4QCZE0gjHQhQec4=", + "lastModified": 1692169981, + "narHash": "sha256-/T4lnSxDf+8Iv1wSkEp9wq1dBZRJ2tEmDXenNOj29FE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "39d212d84007c1c4039bc9af2c043344cfb0eead", + "rev": "c9921997c951aaf4b4582a24cdf133e93abd2ffb", "type": "github" }, "original": { @@ -682,11 +682,11 @@ ] }, "locked": { - "lastModified": 1690199016, - "narHash": "sha256-yTLL72q6aqGmzHq+C3rDp3rIjno7EJZkFLof6Ika7cE=", + "lastModified": 1692127428, + "narHash": "sha256-+e9dD67mpGLBhhqdv7A7i1g/r2AT/PmqthWaYHyVZR4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c36df4fe4bf4bb87759b1891cab21e7a05219500", + "rev": "f81e73cf9a4ef4b949b9225be3daa1e586c096da", "type": "github" }, "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 { ]; }; - nix.extraOptions = '' - use-sqlite-wal = false - ''; + nix.settings = { + use-sqlite-wal = false; + use-xdg-base-directories = true; + }; boot.initrd.availableKernelModules = [ "nfs" "nfsv4" "overlay" ]; boot.initrd.supportedFilesystems = [ "nfs" "nfsv4" "overlay" ]; -- cgit v1.2.3