From b88cc0499637c91f763242b080b484b686ae5857 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Tue, 10 Jan 2023 17:35:47 +0100 Subject: [PATCH] Enabled remote deploy and removed ZFS from the kernel supported filesystems --- flake.nix | 2 ++ freya/configuration.nix | 49 +++++++++-------------------------------- 2 files changed, 12 insertions(+), 39 deletions(-) diff --git a/flake.nix b/flake.nix index 0df1d83..1351c03 100644 --- a/flake.nix +++ b/flake.nix @@ -216,6 +216,7 @@ ./nixos_modules/bertof_user.nix ./nixos_modules/distributed.nix + ./nixos_modules/remote-deploy.nix ./nixos_modules/extended_registry.nix ./nixos_modules/zerotier.nix ./nixos_modules/installer.nix @@ -290,6 +291,7 @@ # ({nixosModules,...}: "${nixosModules}/installer/sd-card/sd-image-aarch64.nix") ./freya/configuration.nix { home-manager.users.bertof = import ./freya/hm.nix; } + ({ lib, ... }: { boot.supportedFilesystems = lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ]; }) ]; }; }; diff --git a/freya/configuration.nix b/freya/configuration.nix index 64080a4..6de1d5f 100644 --- a/freya/configuration.nix +++ b/freya/configuration.nix @@ -1,35 +1,19 @@ -{ pkgs, lib, ... }: -with lib; { +{ pkgs, ... }: { boot = { # kernelPackages = pkgs.linuxPackages_latest; - loader = { - systemd-boot.enable = true; - efi.canTouchEfiVariables = true; - }; + loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; }; }; - console = { - font = "Lat2-Terminus16"; - keyMap = "it"; - }; + console = { font = "Lat2-Terminus16"; keyMap = "it"; }; - environment = { - pathsToLink = [ "/share/zsh" ]; - systemPackages = builtins.attrValues { inherit (pkgs) helix tmux vim; }; - }; + environment = { pathsToLink = [ "/share/zsh" ]; systemPackages = builtins.attrValues { inherit (pkgs) helix tmux vim; }; }; i18n.defaultLocale = "it_IT.UTF-8"; programs = { dconf.enable = true; - gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - zsh = { - enable = true; - syntaxHighlighting.enable = true; - }; + gnupg.agent = { enable = true; enableSSHSupport = true; }; + zsh = { enable = true; syntaxHighlighting.enable = true; }; }; networking = { @@ -53,21 +37,14 @@ with lib; { userServices = true; workstation = true; }; - extraServiceFiles = { - ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service"; - }; + extraServiceFiles.ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service"; + }; # bazarr = { enable = true; openFirewall = true; group = "users"; }; # blueman.enable = true; dbus.packages = [ pkgs.dconf ]; gnome.gnome-keyring.enable = true; - - openssh = { - enable = true; - openFirewall = true; - permitRootLogin = "no"; - passwordAuthentication = false; - }; + openssh = { enable = true; openFirewall = true; }; }; users.users = { @@ -97,11 +74,5 @@ with lib; { Defaults pwfeedback ''; - system.autoUpgrade = { - enable = true; - allowReboot = true; - flags = [ "--flake gitlab:bertof/nix-dotfiles" ]; - }; - - system.stateVersion = "22.05"; + system.stateVersion = "22.11"; }