Nickiel/nicks-nix-config
1
0
Fork 0
mirror of https://github.com/Nickiel12/nicks-nix-config.git synced 2024-11-24 21:55:28 -08:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: Nickiel:026e41ccb4a8be80ee87d1e57307135f518248a5
Branches Tags
Nickiel:main
Nickiel:awesome-dev
..
compare: Nickiel:ca7ccf8dc85acb5f323bde4a0cd6c9ca2ae47c4e
Branches Tags
Nickiel:main
Nickiel:awesome-dev

No commits in common. "026e41ccb4a8be80ee87d1e57307135f518248a5" and "ca7ccf8dc85acb5f323bde4a0cd6c9ca2ae47c4e" have entirely different histories.
026e41ccb4 ... ca7ccf8dc8

5 changed files with 46 additions and 43 deletions
Show stats Expand all files Collapse all files

62
flake.lock
View file

@ -162,17 +162,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683878976, "lastModified": 1701336075,
"narHash": "sha256-nqmTqe3F3Oh8rnJH0clwACD/0RpqmfOMXNubr3C8rEc=", "narHash": "sha256-1AN5KGL42BwBNkJMjS2ZDcd/CT/AtH1BkT+azHMI5NY=",
"owner": "juanfont", "owner": "kradalby",
"repo": "headscale", "repo": "headscale",
"rev": "b01f1f1867136d9b2d7b1392776eb363b482c525", "rev": "bbb4c357268998fd02780b7f8f2013f76e3ab80a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "juanfont", "owner": "kradalby",
"repo": "headscale", "repo": "headscale",
"rev": "b01f1f1867136d9b2d7b1392776eb363b482c525", "rev": "bbb4c357268998fd02780b7f8f2013f76e3ab80a",
"type": "github" "type": "github"
} }
}, },
@ -183,11 +183,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701609479, "lastModified": 1700847865,
"narHash": "sha256-mcEnMz7XB3K57ZX16VXoEkswljSNGXdMuUu5+g8a8R8=", "narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e504e8d01f950776c3a3160ba38c5957a1b89e66", "rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -202,11 +202,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1701282310, "lastModified": 1700205230,
"narHash": "sha256-9QaOSN4qiLqmb1auVSurPN1FrXAaZ7M324TQO0oggco=", "narHash": "sha256-jF6Qb47maZHTwexI+eY4tL0QAnHJX+MVu74DEWeazA0=",
"owner": "kmonad", "owner": "kmonad",
"repo": "kmonad", "repo": "kmonad",
"rev": "0a761c5e2b7a71a5a203d5f04cd2f7c209e79322", "rev": "cec7d4ac3644c96737da23124e473e13ace5156c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -222,11 +222,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1701647612, "lastModified": 1694485605,
"narHash": "sha256-hGLOVe2vXNUJxcXNFpKipthxXRidgNyL1Vg3A0OtrFY=", "narHash": "sha256-xgRzeGU5EH+q38NPerJda65Ft/T3RBnqVheFRWfXVvc=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "f67292fd9023fef8499da69a2c85a3e8447306c9", "rev": "0b5175f90a9679ba8402a40091c52d5ef0a79f08",
"revCount": 77, "revCount": 72,
"type": "git", "type": "git",
"url": "https://git.nickiel.net/Nickiel/nicks_nextcloud_integrations.git" "url": "https://git.nickiel.net/Nickiel/nicks_nextcloud_integrations.git"
}, },
@ -253,11 +253,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1701615100, "lastModified": 1700854570,
"narHash": "sha256-7VI84NGBvlCTduw2aHLVB62NvCiZUlALLqBe5v684Aw=", "narHash": "sha256-GiwMS5sWSgF/CyZYbm+G5EcgG1VOEyvcsP5lE1L97Aw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19", "rev": "cbd3f3722ac41a200c1655141e021cf12c3ba4e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -349,11 +349,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1701253981, "lastModified": 1700612854,
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -365,11 +365,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1701253981, "lastModified": 1700612854,
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -387,11 +387,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1701545368, "lastModified": 1700831612,
"narHash": "sha256-AzE7T/aRj/3kJ6nKJZ4zxuPpSJ+NvU8NpTUS7ipbonA=", "narHash": "sha256-4rjt03g847UpPYshwItJqFqxHJ6l4aoXqDVT9CNOCu4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "741dd36395236f34dbe35a2db79a711c6b318ce4", "rev": "bacdae2c508defccdff1af8511e4d639d26d3d47",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -439,11 +439,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1700922917, "lastModified": 1700064067,
"narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=", "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78", "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8",
"type": "github" "type": "github"
}, },
"original": { "original": {

19
flake.nix
View file

@ -5,14 +5,11 @@
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
nixvim.url = "github:nix-community/nixvim"; nixvim.url = "github:nix-community/nixvim";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable = { nixpkgs-stable.url = "github:NixOS/nixpkgs/release-23.05";
url = "github:NixOS/nixpkgs/release-23.05";
};
kmonad.url = "github:kmonad/kmonad?dir=nix"; kmonad.url = "github:kmonad/kmonad?dir=nix";
headscale = { headscale = {
# url = "github:kradalby/headscale/bbb4c357268998fd02780b7f8f2013f76e3ab80a"; url = "github:kradalby/headscale/bbb4c357268998fd02780b7f8f2013f76e3ab80a";
url = "github:juanfont/headscale/b01f1f1867136d9b2d7b1392776eb363b482c525";
# url = "github:juanfont/headscale"; # Real repo # url = "github:juanfont/headscale"; # Real repo
inputs."flake-utils".follows = "utils"; inputs."flake-utils".follows = "utils";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -43,6 +40,14 @@
user = "nixolas"; user = "nixolas";
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
overlays = [
headscale.overlay
];
config.allowUnfree = true;
};
pkgs-stable = import nixpkgs-stable { pkgs-stable = import nixpkgs-stable {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
@ -58,7 +63,7 @@
Alaska = lib.nixosSystem { Alaska = lib.nixosSystem {
inherit system; inherit system;
specialArgs = { specialArgs = {
inherit user headscale pkgs-stable; inherit user pkgs pkgs-stable;
}; };
modules = [ modules = [
@ -90,7 +95,7 @@
NicksNixLaptop = lib.nixosSystem { NicksNixLaptop = lib.nixosSystem {
inherit system; inherit system;
specialArgs = { specialArgs = {
inherit user; inherit user pkgs;
}; };
modules = [ modules = [

3
hosts/Alaska/default.nix
View file

@ -1,5 +1,5 @@
{ config, lib, pkgs, headscale, ... }: { config, lib, pkgs, ... }:
{ {
@ -33,7 +33,6 @@
}; };
}; };
# headscale dns is handled by dnsmasq
networking.hosts = { networking.hosts = {
"100.64.0.1" = ["files.nickiel.net" "git.nickiel.net" "nickiel.net" "jellyfin.nickiel.net" ]; "100.64.0.1" = ["files.nickiel.net" "git.nickiel.net" "nickiel.net" "jellyfin.nickiel.net" ];
}; };

3
hosts/Alaska/modules/headscale.nix
View file

@ -1,4 +1,4 @@
{ config, headscale, ... }: { config, ... }:
let let
tailscale_dns_entries = import ./dns.nix; tailscale_dns_entries = import ./dns.nix;
@ -13,7 +13,6 @@ in {
# https://carjorvaz.com/posts/setting-up-headscale-on-nixos/ # https://carjorvaz.com/posts/setting-up-headscale-on-nixos/
services.headscale = { services.headscale = {
package = headscale.packages."x86_64-linux".headscale;
enable = true; enable = true;
address = "0.0.0.0"; address = "0.0.0.0";
port = 8082; port = 8082;

2
hosts/Alaska/modules/nicks_nextcould_integrations.nix
View file

@ -2,7 +2,7 @@
{ {
services.status_cloud = { services.status_cloud = {
enable = false; enable = true;
config_path = "/home/nixolas/nextcloud_integrations.toml"; config_path = "/home/nixolas/nextcloud_integrations.toml";
frequency = 15; frequency = 15;
}; };