diff --git a/flake.nix b/flake.nix index 55ae63b..887d1cc 100644 --- a/flake.nix +++ b/flake.nix @@ -21,21 +21,15 @@ outputs = { self, hm, nixpkgs, agenix, ... }@inputs: { inherit self inputs; - nixpkgs.config.allowUnfree = true; #Predicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [ "dropbox" ]; - nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ - ({ - nixpkgs = { - config.allowUnfree = true; - }; - }) + ({ nixpkgs = { config.allowUnfree = true; }; }) inputs.snm.nixosModule - ./modules/security.nix - ./hosts/thrall + ./modules/security.nix + ./hosts/thrall agenix.nixosModules.age - hm.nixosModules.home-manager + hm.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/home/cli.nix b/home/cli.nix index e594ec4..0ce3184 100644 --- a/home/cli.nix +++ b/home/cli.nix @@ -13,6 +13,7 @@ username = "alex"; homeDirectory = "/home/alex"; stateVersion = "21.05"; + sessionPath = [ "$HOME/.local/bin" ]; }; home.packages = with pkgs; [ @@ -40,7 +41,7 @@ smos # editors - emacs-nox + emacs # c/c++ clang_12 @@ -73,6 +74,9 @@ }; programs = { + # better cat + bat.enable = true; + direnv = { enable = true; nix-direnv = { @@ -123,6 +127,4 @@ recursive = true; source = ./local; }; - - home.sessionPath = [ "$HOME/.local/bin" ]; } diff --git a/home/modules/nvim.nix b/home/modules/nvim.nix index 2143515..b13c376 100644 --- a/home/modules/nvim.nix +++ b/home/modules/nvim.nix @@ -1,5 +1,4 @@ -pkgs: -{ +pkgs: { enable = true; vimAlias = true; diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix index 8aa45ba..380f4a4 100644 --- a/hosts/thrall/default.nix +++ b/hosts/thrall/default.nix @@ -130,6 +130,9 @@ git #agenix.defaultPackage.x86_64-linux + + restic # fast and secure backup + rclone ]; # Some programs need SUID wrappers, can be configured further or are @@ -159,6 +162,10 @@ interface=wg0 ''; }; + + # configure backup via restic to gdrive + services.restic.backups = { }; + services.nginx.enable = true; services.nginx = { recommendedTlsSettings = true;