john/panoptes-nix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trying to fix git

Browse Source
This commit is contained in:
John Lancaster
2024-12-08 15:25:55 -06:00
parent 9d4c47682b
commit 9334d2cc7f
6 changed files with 39 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configuration.nix
View File

@@ -11,10 +11,6 @@
eza eza
]; ];
# imports = [
# ./
# ];
# For SSH access # For SSH access
services.openssh.enable = true; services.openssh.enable = true;

22
flake.lock generated
View File

@@ -5,11 +5,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1681202837,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -40,11 +40,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733392399, "lastModified": 1733581040,
"narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -72,10 +72,12 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 0, "lastModified": 1682134069,
"narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
"path": "/nix/store/nr5nl3zwzl02x3rnikjbry3s5xy7bm1d-source", "owner": "NixOS",
"type": "path" "repo": "nixpkgs",
"rev": "fd901ef4bf93499374c5af385b2943f5801c0833",
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",

19
flake.nix
View File

@@ -24,6 +24,15 @@
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
stateVersion = "24.05"; stateVersion = "24.05";
# userSettings = rec {
# username = "shahvirb"; # username on the system
# name = "Shahvir"; # name/identifier on the system
# email = "shahvirb@gmail.com";
# gitUserName = "shahvirb";
# gitUserEmail = "shahvirb@gmail.com";
# };
timeZone = "America/Chicago"; timeZone = "America/Chicago";
hostname = "panoptes-nix"; hostname = "panoptes-nix";
user = "panoptes"; user = "panoptes";
@@ -53,14 +62,10 @@
homeConfigurations = { homeConfigurations = {
useGlobalPkgs = true; useGlobalPkgs = true;
"root@${hostname}" = home-manager.lib.homeManagerConfiguration { user = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {inherit inputs outputs pkgs;}; extraSpecialArgs = {inherit inputs outputs pkgs;};
modules = [ ./home-manager/git.nix ]; modules = [ ./homeManagerModules/home.nix ];
};
"${user}@${hostname}" = home-manager.lib.homeManagerConfiguration {
extraSpecialArgs = {inherit inputs outputs pkgs;};
modules = [ ./home-manager/home.nix ];
}; };
}; };
}; };

3
homeManagerModules/home.nix
View File

@@ -10,13 +10,12 @@ let
in in
{ {
imports = [ ./git.nix ]; imports = [ ./git.nix ];
programs.git.extraConfig.safe.directory = "${homePath}"; programs.git.extraConfig.safe.directory = "${homePath}";
programs.home-manager.enable = true; programs.home-manager.enable = true;
home = { home = {
stateVersion = "24.05"; stateVersion = "24.05";
username = "${user}"; # username = "${user}";
homeDirectory = "${homePath}"; homeDirectory = "${homePath}";
packages = [ packages = [
(pkgs.writeShellScriptBin "nfs" '' (pkgs.writeShellScriptBin "nfs" ''

8
nixosModules/services/loki.nix
View File

@@ -1,11 +1,13 @@
{ pkgs, config, lokiPort ? 3100, ... }: { pkgs, config, ... }:
{ {
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
config.services.loki.configuration.server.http_listen_port config.services.loki.configuration.server.http_listen_port
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(pkgs.writeShellScriptBin "loki-check" "curl http://localhost:${builtins.toString lokiPort}/ready") (pkgs.writeShellScriptBin "loki-check" ''
curl http://localhost:${config.services.loki.configuration.server.http_listen_port}/ready
'')
(pkgs.writeShellScriptBin "loki-logs" "journalctl -b -u loki.service -n 10") (pkgs.writeShellScriptBin "loki-logs" "journalctl -b -u loki.service -n 10")
]; ];
@@ -14,7 +16,7 @@
user = "loki"; user = "loki";
configuration = { configuration = {
server.http_listen_port = lokiPort; server.http_listen_port = 3100;
# server.grpc_listen_port = 9096; # server.grpc_listen_port = 9096;
auth_enabled = false; auth_enabled = false;

14
nixosModules/vscode/flake.nix
View File

@@ -1,14 +0,0 @@
{
inputs.vscode-server.url = "github:nix-community/nixos-vscode-server";
outputs = { self, nixpkgs, vscode-server }: {
nixosConfigurations.yourhostname = nixpkgs.lib.nixosSystem {
modules = [
vscode-server.nixosModules.default
({ config, pkgs, ... }: {
services.vscode-server.enable = true;
})
];
};
};
}