From e7f9f353a64b137d5dcedc86bbb63fde5913cb83 Mon Sep 17 00:00:00 2001 From: Anish L Date: Thu, 21 Apr 2022 14:26:38 +1000 Subject: [PATCH] deploy cube --- flake.lock | 79 ++++++++++++++++++++++++++++++++++-- flake.nix | 36 ++++++++-------- hosts/cube/configuration.nix | 9 ++-- hosts/cube/default.nix | 8 ++-- 4 files changed, 105 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 5e5381e8..10a42fc7 100644 --- a/flake.lock +++ b/flake.lock @@ -20,6 +20,29 @@ "type": "github" } }, + "basant": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixos" + ], + "poonam": "poonam" + }, + "locked": { + "lastModified": 1650354421, + "narHash": "sha256-Jr6OvDFQ6gUugH4qWeoitkVtNqsE/HZECDAjqhCRnjc=", + "ref": "main", + "rev": "8ae61a25c1debb788204afe1964ec429f8defc83", + "revCount": 60, + "type": "git", + "url": "ssh://gitea@git.sealight.xyz/aynish/basant" + }, + "original": { + "ref": "main", + "type": "git", + "url": "ssh://gitea@git.sealight.xyz/aynish/basant" + } + }, "blank": { "locked": { "lastModified": 1625557891, @@ -155,7 +178,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils" + "flake-utils": "flake-utils_2" }, "locked": { "lastModified": 1639385028, @@ -186,6 +209,21 @@ "type": "github" } }, + "flake-utils_3": { + "locked": { + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home": { "inputs": { "nixpkgs": [ @@ -293,7 +331,7 @@ "nixos-generators": { "inputs": { "nixlib": "nixlib", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1637655461, @@ -325,6 +363,21 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1649667661, + "narHash": "sha256-9cbstidkXdAC3ZzokV6clgCoeLSbbs2tis9KFsqCzTM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a48aeae76ad50bb15ad9bda2cf51d7ae5c621853", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1644972330, "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", @@ -356,7 +409,7 @@ "nvfetcher": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixos" ] @@ -375,9 +428,29 @@ "type": "github" } }, + "poonam": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1650036007, + "narHash": "sha256-ybTF+wYqdjZcmidtTXPmyBpGsjdOGApDNw7ri5E6Uac=", + "ref": "main", + "rev": "4864d9de300f3dc3e70becc36442b1494da6a3b2", + "revCount": 325, + "type": "git", + "url": "ssh://gitea@git.sealight.xyz/aynish/kitaab" + }, + "original": { + "ref": "main", + "type": "git", + "url": "ssh://gitea@git.sealight.xyz/aynish/kitaab" + } + }, "root": { "inputs": { "agenix": "agenix", + "basant": "basant", "deploy": "deploy", "digga": "digga", "home": "home", diff --git a/flake.nix b/flake.nix index b8a4a847..f14b580c 100644 --- a/flake.nix +++ b/flake.nix @@ -7,31 +7,31 @@ inputs = { + # Nix nixos.url = "github:nixos/nixpkgs/release-21.11"; latest.url = "github:nixos/nixpkgs/nixos-unstable"; - + # Community + home.url = "github:nix-community/home-manager/release-21.11"; + home.inputs.nixpkgs.follows = "nixos"; + nixos-hardware.url = "github:nixos/nixos-hardware"; + # Lib digga.url = "github:divnix/digga"; digga.inputs.nixpkgs.follows = "nixos"; digga.inputs.nixlib.follows = "nixos"; digga.inputs.home-manager.follows = "home"; digga.inputs.deploy.follows = "deploy"; - - home.url = "github:nix-community/home-manager/release-21.11"; - home.inputs.nixpkgs.follows = "nixos"; - - deploy.url = "github:serokell/deploy-rs"; - deploy.inputs.nixpkgs.follows = "nixos"; - - agenix.url = "github:ryantm/agenix"; - agenix.inputs.nixpkgs.follows = "nixos"; - nvfetcher.url = "github:berberman/nvfetcher"; nvfetcher.inputs.nixpkgs.follows = "nixos"; - naersk.url = "github:nmattia/naersk"; naersk.inputs.nixpkgs.follows = "nixos"; - - nixos-hardware.url = "github:nixos/nixos-hardware"; + # Tools + agenix.url = "github:ryantm/agenix"; + agenix.inputs.nixpkgs.follows = "nixos"; + deploy.url = "github:serokell/deploy-rs"; + deploy.inputs.nixpkgs.follows = "nixos"; + # Packages + basant.url = "git+ssh://gitea@git.sealight.xyz/aynish/basant?ref=main"; + basant.inputs.nixpkgs.follows = "nixos"; }; outputs = @@ -44,6 +44,7 @@ , agenix , nvfetcher , deploy + , basant , ... } @ inputs: digga.lib.mkFlake @@ -101,7 +102,9 @@ #modules = [ ]; # nixos-hardware.nixosModules.lenovo-thinkpad # Yubikey }; - cube = { }; + cube = { + modules = [ basant.nixosModule ]; + }; # box = { }; # hypercube = { }; # work = { }; @@ -114,8 +117,7 @@ base = [ core users.root users.anish ]; # TODO make anish non gui sealight = [ base ]; # matrix rsshub backup wireguard website mossnet = [ base ]; # shaarli wallabag nextcloud taskwarrior headphones - cube = [ base ]; - # home-manager = [ users.profiles.firefox users.profiles.desktop users.profiles.nvim ]; + cube = [ base ]; # site graphical = [ base bluetooth music sync wireguard wifi desktop ]; curve = [ graphical secrets ]; work = [ base ]; diff --git a/hosts/cube/configuration.nix b/hosts/cube/configuration.nix index 984273ba..5e8709dc 100644 --- a/hosts/cube/configuration.nix +++ b/hosts/cube/configuration.nix @@ -25,6 +25,11 @@ ''; }; + # Install site + services."anish.lakhwara.com".enable = true; + security.acme.email = "anish+acme@lakhwara.com"; + security.acme.acceptTerms = true; + # The global useDHCP flag is deprecated, therefore explicitly set to false here. # Per-interface useDHCP will be mandatory in the future, so this generated config # replicates the default behaviour. @@ -38,10 +43,8 @@ openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDM0Zvei46x/yZl/IeBCq6+IYQQ0avulzVyBysF9cPigZMCybWRV7IEU+E3k9t6JrbdbdGfJkcZIWmsWDdKS8W8mBnZpVoT0ffLynu8JQ/TKdGm4Qv6bgUeKNrGsNv0ZPs2CDaGSLj0oJfRF7Ko10tcLP0vW+yujrh+y6TH/vVzJioaV4TGvtCUpn+wEQah9ROwPQLUUofsSWdnRsDJ/gp37zXWs4l5wyjSKtP3O9RZUP7kBekbSqEgSXiTk0oUQSVqIWl9NDiP6onk/gSOjXsR/JPqsSN/XI/c/yj6gyY0f51Ru2D7iBxuMJIJcWV+rU6coIj+ULcQWLzt/7TI8jq5AOOzI/ll4zbL24Eo84Rz+TP9tvMMhDZ0VaMN22AJ8qQEjc5P09tWKsX7Jg39XelyV1jHXncE4yvIE9F4RSCHzWCeKeXakizQNuzSaxTxIExRFYHjNW5bR6+3MTGwVrEIXU+qML+0yFTR86MT+tdY5AreAJQLwbog79O1NupeXJE= anish@curve" ]; }; - # List packages installed in system profile. To search, run: - # $ nix search wget environment.systemPackages = with pkgs; [ - vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + gitAndTools.gitFull ]; services.openssh.enable = true; diff --git a/hosts/cube/default.nix b/hosts/cube/default.nix index d93a24f2..61ea5af7 100644 --- a/hosts/cube/default.nix +++ b/hosts/cube/default.nix @@ -2,9 +2,9 @@ { imports = [ ./configuration.nix - ]; # ++ [suites.cube]; + ] ++ suites.cube; - #home-manager.users.anish = { self, suites, ... }: { - # imports = [ ] ++ suites.hmBase; - #}; + home-manager.users.anish = { self, suites, ... }: { + imports = [ ] ++ suites.hmBase; + }; }