john/loki-nix
1
0
Fork 0
generated from john/nix-docker
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reorg

Browse Source
This commit is contained in:
John Lancaster
2024-12-07 14:41:23 -06:00
parent f303b9ec57
commit 679f8bfca0
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
flake.nix
View File

@@ -36,7 +36,7 @@
specialArgs = {inherit inputs outputs;}; specialArgs = {inherit inputs outputs;};
# pkgs = import nixpkgs { system = "x86_64-linux"; }; # pkgs = import nixpkgs { system = "x86_64-linux"; };
modules = [ modules = [
./configuration.nix # > Our main nixos configuration file < ./nixos/configuration.nix # > Our main nixos configuration file <
"${nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix" "${nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix"
({ ... }: { ({ ... }: {
nixpkgs.hostPlatform = "${system}"; nixpkgs.hostPlatform = "${system}";
@@ -45,7 +45,7 @@
}) })
vscode-server.nixosModules.default vscode-server.nixosModules.default
({ config, pkgs, ... }: {services.vscode-server.enable = true;}) ({ config, pkgs, ... }: {services.vscode-server.enable = true;})
(import ./loki.nix { (import ./nixos/loki.nix {
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
inherit lokiPort; inherit lokiPort;
inherit lokiUser; inherit lokiUser;
@@ -61,7 +61,7 @@
"root@${hostname}" = home-manager.lib.homeManagerConfiguration { "root@${hostname}" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
extraSpecialArgs = {inherit inputs outputs;}; extraSpecialArgs = {inherit inputs outputs;};
modules = [(import ./git.nix { repoPath = "${lokiPath}"; })]; modules = [(import ./home-manager/git.nix { repoPath = "${lokiPath}"; })];
}; };
# FIXME replace with your username@hostname # FIXME replace with your username@hostname
@@ -70,8 +70,8 @@
extraSpecialArgs = {inherit inputs outputs;}; extraSpecialArgs = {inherit inputs outputs;};
# > Our main home-manager configuration file < # > Our main home-manager configuration file <
modules = [ modules = [
(import ./home.nix { user = "${lokiUser}"; repoPath = "${lokiPath}"; }) (import ./home-manager/home.nix { user = "${lokiUser}"; repoPath = "${lokiPath}"; })
(import ./git.nix { repoPath = "${lokiPath}"; }) (import ./home-manager/git.nix { repoPath = "${lokiPath}"; })
]; ];
}; };
}; };

0
git.nix → home-manager/git.nix
View File

0
home.nix → home-manager/home.nix
View File

0
configuration.nix → nixos/configuration.nix
View File

4
loki.nix → nixos/loki.nix
View File

@@ -3,8 +3,8 @@
networking.firewall.allowedTCPPorts = [ lokiPort ]; networking.firewall.allowedTCPPorts = [ lokiPort ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(pkgs.writeShellScriptBin "loki-check" "curl http://localhost:3100/ready") (pkgs.writeShellScriptBin "loki-check" "curl http://localhost:${builtins.toString lokiPort}/ready")
(pkgs.writeShellScriptBin "loki-logs" "journalctl -b -u loki.service -n 25") (pkgs.writeShellScriptBin "loki-logs" "journalctl -b -u loki.service -n 10")
]; ];
services.loki = { services.loki = {