From 43feeb4b66ae702f47d6d3aee0c70d5c04ecd6f7 Mon Sep 17 00:00:00 2001 From: Tasia Iso Date: Fri, 7 Jun 2024 14:57:57 +0200 Subject: [PATCH] stuff --- README.md | 4 +-- common/components/enry.nix | 2 ++ flake.lock | 8 +++--- hosts/enry/configuration.nix | 5 +--- hosts/stuff/configuration.nix | 3 +++ pkgs/default.nix | 3 ++- pkgs/mkdocs-rss-plugin/default.nix | 26 ------------------- pkgs/vedirect-reader-nixos-config/default.nix | 23 ++++++++++++++++ 8 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 pkgs/mkdocs-rss-plugin/default.nix create mode 100644 pkgs/vedirect-reader-nixos-config/default.nix diff --git a/README.md b/README.md index d8b90dd..9f965ee 100644 --- a/README.md +++ b/README.md @@ -25,9 +25,9 @@ this is outdated Update channels: `nix flake update` -Build a configuration: `sudo ixos-rebuild switch --flake .#$(cat /etc/hostname)` +Build a configuration: `sudo nixos-rebuild switch --flake .#$(cat /etc/hostname)` -Build enry and upload a generation: TODO +Build enry and upload a generation: `nixos-rebuild switch --use-remote-sudo --flake .#enry --target-host tasia@enry -L` ### To do on a new machine diff --git a/common/components/enry.nix b/common/components/enry.nix index 5523815..01382d8 100644 --- a/common/components/enry.nix +++ b/common/components/enry.nix @@ -41,4 +41,6 @@ } ]; }; + + services.vedirect-reader.enable = true; } diff --git a/flake.lock b/flake.lock index dc03573..b08a169 100644 --- a/flake.lock +++ b/flake.lock @@ -203,11 +203,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1717256270, - "narHash": "sha256-e87CNsNZb0yhkZIeZ0SEVVLH1Lp5cvUD5Cj7fbdf3mM=", + "lastModified": 1717688985, + "narHash": "sha256-6VHDjEs8Bu/pT31A5y/lDppGyAdB7SawrBbNPJQlgpw=", "ref": "refs/heads/master", - "rev": "7b886fae6ac22a664ea8e92ee153a333d79172fb", - "revCount": 64, + "rev": "dbe88e262e4a3b913ed68b94d0d862d1f65e9d36", + "revCount": 73, "type": "git", "url": "https://gitea.com/tasiaiso/vedirect-reader" }, diff --git a/hosts/enry/configuration.nix b/hosts/enry/configuration.nix index b8958df..56597df 100644 --- a/hosts/enry/configuration.nix +++ b/hosts/enry/configuration.nix @@ -44,12 +44,9 @@ in { environment.systemPackages = with pkgs; [ nodejs - # vedirect-reader + inputs.vedirect-reader.packages.aarch64-linux.default ]; - services.prometheus.enable = true; - services.vedirect-reader.enable = true; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "23.11"; } diff --git a/hosts/stuff/configuration.nix b/hosts/stuff/configuration.nix index d09af63..7bed7dd 100644 --- a/hosts/stuff/configuration.nix +++ b/hosts/stuff/configuration.nix @@ -41,6 +41,9 @@ in { # Additional system packages here ]; + services.displayManager.autoLogin.user = "user"; + services.displayManager.autoLogin.enable = true; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "23.11"; } diff --git a/pkgs/default.nix b/pkgs/default.nix index b5c7d83..147c24c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,5 +5,6 @@ # lib, ... }: { - # mkdocs-rss-plugin = pkgs.callPackage ./mkdocs-rss-plugin/default.nix {}; + vedirect-reader-nixos-config = pkgs.callPackage ./vedirect-reader-nixos-config {}; + default = pkgs.callPackage ./vedirect-reader-nixos-config {}; } diff --git a/pkgs/mkdocs-rss-plugin/default.nix b/pkgs/mkdocs-rss-plugin/default.nix deleted file mode 100644 index 62e1811..0000000 --- a/pkgs/mkdocs-rss-plugin/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - lib, - buildPythonApplication, - fetchPypi, - setuptools, - wheel, -}: -buildPythonApplication rec { - pname = "toolz"; - version = "0.10.0"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; - }; - - # do not run tests - doCheck = false; - - # specific to buildPythonPackage, see its reference - pyproject = true; - build-system = [ - setuptools - wheel - ]; -} diff --git a/pkgs/vedirect-reader-nixos-config/default.nix b/pkgs/vedirect-reader-nixos-config/default.nix new file mode 100644 index 0000000..58fb593 --- /dev/null +++ b/pkgs/vedirect-reader-nixos-config/default.nix @@ -0,0 +1,23 @@ +{ + pkgs ? import {}, + lib ? import , +}: +pkgs.buildNpmPackage rec { + pname = "vedirect-reader-nixos-config"; + version = "0.0.0"; + + src = pkgs.fetchFromGitea { + domain = "gitea.com"; + owner = "tasiaiso"; + repo = "vedirect-reader"; + rev = "fb4244eb5b35fa7011e7611eba8b95a4adf49787"; + hash = "sha256-5rwiEI0+WCtxpvm9vMQTpzV7FHZjUi5kNi11PnrJ+a8="; + }; + + npmDepsHash = "sha256-FzZwdsqr0al6FwGdin7LMmqFSA5u4OPaNVOdT5ZS8zw="; + # dontNpmBuild = true; + + # nativeBuildInputs = with pkgs; [ + # nodejs + # ]; +}