From 556591b9d9ff78522cfd08729109c909d936d40a Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Thu, 5 Jan 2023 23:15:56 +0100 Subject: [PATCH] Try setup freya configuration --- flake.nix | 30 +++++---- freya/configuration.nix | 146 +--------------------------------------- freya/hm.nix | 55 ++++----------- 3 files changed, 31 insertions(+), 200 deletions(-) diff --git a/flake.nix b/flake.nix index e6e0d08..0df1d83 100644 --- a/flake.nix +++ b/flake.nix @@ -279,19 +279,21 @@ }; }; - # freyaConfig = { - # nixosConfigurations = rec { - # freya = nixpkgs.lib.nixosSystem rec { - # system = "aarch64-linux"; - # modules = commonModules ++ [ - # nixos-hardware.nixosModules.raspberry-pi-4 - # ./freya/hardware-configuration.nix - # ./freya/configuration.nix - # { home-manager.users.bertof = import ./freya/hm.nix; } - # ]; - # }; - # }; - # }; + freyaConfig = { + nixosConfigurations = { + freya = nixpkgs.lib.nixosSystem { + system = "aarch64-linux"; + modules = commonModules ++ [ + nixos-hardware.nixosModules.raspberry-pi-4 + # ./freya/hardware-configuration.nix + "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" + # ({nixosModules,...}: "${nixosModules}/installer/sd-card/sd-image-aarch64.nix") + ./freya/configuration.nix + { home-manager.users.bertof = import ./freya/hm.nix; } + ]; + }; + }; + }; baldurConfig = { nixosConfigurations = { @@ -403,7 +405,7 @@ basic thorConfig odinConfig - # freyaConfig + freyaConfig baldurConfig lokiConfig deployments diff --git a/freya/configuration.nix b/freya/configuration.nix index cd97163..64080a4 100644 --- a/freya/configuration.nix +++ b/freya/configuration.nix @@ -15,7 +15,7 @@ with lib; { environment = { pathsToLink = [ "/share/zsh" ]; - systemPackages = builtins.attrValues { inherit (pkgs) kakoune tmux vim; }; + systemPackages = builtins.attrValues { inherit (pkgs) helix tmux vim; }; }; i18n.defaultLocale = "it_IT.UTF-8"; @@ -60,122 +60,14 @@ with lib; { # bazarr = { enable = true; openFirewall = true; group = "users"; }; # blueman.enable = true; dbus.packages = [ pkgs.dconf ]; - # fail2ban = { enable = true; bantime-increment.enable = true; }; gnome.gnome-keyring.enable = true; - # gvfs = { enable = true; package = mkForce pkgs.gnome3.gvfs; }; - # jackett = { enable = true; openFirewall = true; group = "users"; }; - # jellyfin = { enable = true; openFirewall = true; group = "users"; }; - # logind.lidSwitch = "ignore"; - # node-red = { enable = true; openFirewall = true; withNpmAndGcc = true; }; + openssh = { enable = true; openFirewall = true; permitRootLogin = "no"; passwordAuthentication = false; }; - # plex = { enable = true; openFirewall = true; group = "users"; }; - # power-profiles-daemon.enable = true; - # radarr = { enable = true; openFirewall = true; group = "users"; }; - # samba-wsdd = { enable = true; discovery = true; }; - # samba = { - # enable = true; - # enableNmbd = true; - # enableWinbindd = true; - # nsswins = true; - # extraConfig = '' - # workgroup = WORKGROUP - # load printers = no - # smb encrypt = required - # ''; - # shares = - # let - # common = { - # "public" = "no"; - # "writeable" = "yes"; - # "create mask" = "0700"; - # "directory mask" = "2700"; - # "browseable" = "yes"; - # "guest ok" = "no"; - # "read only" = "no"; - # "force group" = "users"; - # }; - # in - # { - # bertof = recursiveUpdate common { - # path = "/mnt/raid0/bertof"; - # comment = "Bertof samba share"; - # "force user" = "bertof"; - # "valid users" = "bertof"; - # }; - # tiziano = recursiveUpdate common { - # path = "/mnt/raid0/tiziano"; - # comment = "Tiziano samba share"; - # "force user" = "tiziano"; - # "valid users" = "tiziano"; - # }; - # condiviso = recursiveUpdate common { - # path = "/mnt/raid0/condiviso"; - # comment = "Samba share condiviso"; - # "valid users" = "bertof tiziano"; - # "create mask" = "0770"; - # "directory mask" = "2770"; - # "force create mode" = "0660"; - # "force directory mode" = "2770"; - # }; - # bertof_safe = recursiveUpdate common { - # path = "/mnt/raid1/bertof"; - # comment = "Bertof samba share"; - # "force user" = "bertof"; - # "valid users" = "bertof"; - # }; - # tiziano_safe = recursiveUpdate common { - # path = "/mnt/raid1/tiziano"; - # comment = "Tiziano samba share"; - # "force user" = "tiziano"; - # "valid users" = "tiziano"; - # }; - # condiviso_safe = recursiveUpdate common { - # path = "/mnt/raid1/condiviso"; - # comment = "Samba share condiviso"; - # "valid users" = "bertof tiziano"; - # "create mask" = "0770"; - # "directory mask" = "2770"; - # "force create mode" = "0660"; - # "force directory mode" = "2770"; - # }; - # }; - # }; - # sonarr = { enable = true; openFirewall = true; group = "users"; }; - thermald.enable = true; - # transmission = { - # enable = true; - # openFirewall = true; - # group = "users"; - # settings = { - # download-dir = "/mnt/raid0/condiviso/Scaricati/Torrent"; - # incomplete-dir = "/mnt/raid0/condiviso/Scaricati/Torrent/.incomplete"; - # }; - # }; - # xserver = { - # # enable = true; - # videoDrivers = [ "nvidia" ]; - # # layout = "it"; - # # xkbOptions = "eurosign:e;"; - # # libinput.enable = true; - # }; - - # zoneminder = { - # enable = true; - # openFirewall = true; - # cameras = 3; - # hostname = "0.0.0.0"; - # database = { username = "zoneminder"; createLocally = true; }; - # }; - - # mysql = { - # # enable = true; - # ensureUsers = [{ name = "bertof"; ensurePermissions = { "*.*" = "ALL PRIVILEGES"; }; }]; - # }; }; users.users = { @@ -201,40 +93,6 @@ with lib; { # jellyfin.extraGroups = [ "video" ]; }; - # services.snapper = { - # configs = - # let - # commonExtraConfig = '' - # ALLOW_USERS="bertof" - # TIMELINE_CREATE=yes - # TIMELINE_CLEANUP=yes - # ''; - # in - # { - # bertof_raid0 = { - # subvolume = "/mnt/raid0/bertof"; - # extraConfig = '' - # ALLOW_USERS="bertof" - # ${commonExtraConfig} - # ''; - # }; - # tiziano_raid0 = { - # subvolume = "/mnt/raid0/tiziano"; - # extraConfig = '' - # ALLOW_USERS="tiziano" - # ${commonExtraConfig} - # ''; - # }; - # condiviso_raid0 = { - # subvolume = "/mnt/raid0/condiviso"; - # extraConfig = '' - # ALLOW_USERS="bertof tiziano" - # ${commonExtraConfig} - # ''; - # }; - # }; - # }; - security.sudo.extraConfig = '' Defaults pwfeedback ''; diff --git a/freya/hm.nix b/freya/hm.nix index 6de1636..d27224d 100644 --- a/freya/hm.nix +++ b/freya/hm.nix @@ -1,23 +1,4 @@ { pkgs, ... }: { - nixpkgs.overlays = [ - (_: _: { - devEnvironment = (import ./environment.nix) { - # enableCpp = true; - enableData = true; - # enableGo = true; - # enableHtml = true; - # enableJavascript = true; - # enableJava = true; - # enableLatex = true; - enableNix = true; - # enableOffice = true; - # enablePython = true; - # enableRust = true; - enableShell = true; - # enableSpelling = true; - }; - }) - ]; home = { language.base = "it_IT.UTF-8"; keyboard = { @@ -32,31 +13,21 @@ imports = [ ../hm_modules/__basic.nix - ../hm_modules/configurations.nix + # ../hm_modules/development/cpp.nix + # ../hm_modules/development/data.nix + # ../hm_modules/development/go.nix + # ../hm_modules/development/javascript.nix + # ../hm_modules/development/latex.nix + # ../hm_modules/development/python.nix + # ../hm_modules/development/rust.nix + # ../hm_modules/fonts.nix - ../hm_modules/bash.nix - ../hm_modules/bat.nix - ../hm_modules/bottom.nix - ../hm_modules/broot.nix - ../hm_modules/dircolors.nix - ../hm_modules/direnv.nix - ../hm_modules/git.nix - ../hm_modules/gpg.nix ../hm_modules/helix.nix - ../hm_modules/info.nix - ../hm_modules/jq.nix - # ../hm_modules/kakoune.nix - ../hm_modules/keychain.nix # ../hm_modules/kitty.nix - ../hm_modules/lf.nix - ../hm_modules/man.nix - ../hm_modules/megasync.nix - ../hm_modules/noti.nix - ../hm_modules/ssh.nix - ../hm_modules/starship.nix - ../hm_modules/tmux.nix - ../hm_modules/zoxide.nix - ../hm_modules/zsh.nix - ../hm_modules/shell_aliases.nix + # ../hm_modules/lf.nix + # ../hm_modules/megasync.nix + # ../hm_modules/noti.nix ]; + + home.stateVersion = "22.11"; }