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

Compare commits

base: Nickiel:804c9fe07071889958ddf3ed587e4756afb6bb11
Branches Tags
Nickiel:main
Nickiel:awesome-dev
..
compare: Nickiel:2d9584458851bf94ac897051535680cb7c1b150d
Branches Tags
Nickiel:main
Nickiel:awesome-dev

No commits in common. "804c9fe07071889958ddf3ed587e4756afb6bb11" and "2d9584458851bf94ac897051535680cb7c1b150d" have entirely different histories.
804c9fe070 ... 2d95844588

9 changed files with 61 additions and 225 deletions
Show stats Expand all files Collapse all files

181
flake.lock
View file

@ -1,27 +1,5 @@
{ {
"nodes": { "nodes": {
"atuin": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1704832947,
"narHash": "sha256-OIyAB2DqW/MmNGBTnJdW2qKm8wfRLsQJfAuMjhk7fLA=",
"owner": "atuinsh",
"repo": "atuin",
"rev": "f63f24699e910be41a02682ad4fdd5c25febd0e5",
"type": "github"
},
"original": {
"owner": "atuinsh",
"repo": "atuin",
"type": "github"
}
},
"ewwtilities": { "ewwtilities": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
@ -57,53 +35,16 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1704152458,
"narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "88a2cd8166694ba0b6cb374700799cec53aef527",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1689068808, "lastModified": 1681202837,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -135,11 +76,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1701680307,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401", "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,32 +160,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704809957, "lastModified": 1703838268,
"narHash": "sha256-Z8sBeoeeY2O+BNqh5C+4Z1h1F1wQ2mij7yPZ2GY397M=", "narHash": "sha256-SRg5nXcdPnrsQR2MTAp7en0NyJnQ2wB1ivmsgEbvN+o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e13aa9e287b3365473e5897e3667ea80a899cdfb", "rev": "2aff324cf65f5f98f89d878c056b779466b17db8",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1704498488,
"narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -292,27 +212,6 @@
"url": "https://git.nickiel.net/Nickiel/nicks_nextcloud_integrations.git" "url": "https://git.nickiel.net/Nickiel/nicks_nextcloud_integrations.git"
} }
}, },
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1704277720,
"narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4",
"type": "github"
},
"original": {
"owner": "lnl7",
"repo": "nix-darwin",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1699099776, "lastModified": 1699099776,
@ -331,11 +230,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1704844897, "lastModified": 1703957214,
"narHash": "sha256-B93cvvx2aqffleVrpnCW4U/YO190OfNq5i0XrspwLa0=", "narHash": "sha256-VBiQAJaGnksf9na2rtOvxliKuK+Bn8LMyz2gzyNowc4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "41cc007ec08faecf4156bf73271b218249984088", "rev": "ab3d01706825b1291a77187f2756c8fac3da2ca9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -345,6 +244,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1685801374,
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1681358109, "lastModified": 1681358109,
@ -411,11 +326,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1704538339, "lastModified": 1703637592,
"narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -427,11 +342,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1704538339, "lastModified": 1703637592,
"narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -443,18 +358,16 @@
}, },
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-utils": "flake-utils_3",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_7",
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1704812275, "lastModified": 1703944758,
"narHash": "sha256-uRe8BdZhuSiupXOxohaVP8LzJtBRG+ETP9PgzR60orI=", "narHash": "sha256-VOe76pyV9zY+1pX09nX4ZDv2dINZylI7U5sWmWm20gA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "b4ddb322889e2daf41333b4dbca2555da2e8bb7e", "rev": "9738dae3eac5c9b1c1e3ab787db0cedfc59e49b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -465,24 +378,21 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_4",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": [ "nixpkgs-stable": "nixpkgs-stable_2"
"nixvim",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1704668415, "lastModified": 1703426812,
"narHash": "sha256-BMzNHFod53iiU4lkR5WHwqQCFmaCLq85sUCskXneXlA=", "narHash": "sha256-aODSOH8Og8ne4JylPJn+hZ6lyv6K7vE5jFo4KAGIebM=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "44493e2b3c3ebcd39a9947e9ed9f2c2af164ec4c", "rev": "7f35ec30d16b38fe0eed8005933f418d1a4693ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -493,7 +403,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"atuin": "atuin",
"ewwtilities": "ewwtilities", "ewwtilities": "ewwtilities",
"headscale": "headscale", "headscale": "headscale",
"home-manager": "home-manager", "home-manager": "home-manager",
@ -507,7 +416,7 @@
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
@ -526,7 +435,7 @@
}, },
"rust-overlay_2": { "rust-overlay_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {

11
flake.nix
View file

@ -14,10 +14,6 @@
}; };
kmonad.url = "github:kmonad/kmonad?dir=nix"; kmonad.url = "github:kmonad/kmonad?dir=nix";
atuin = {
url = "github:atuinsh/atuin";
inputs.nixpkgs.follows = "nixpkgs";
};
headscale = { headscale = {
# url = "github:kradalby/headscale/bbb4c357268998fd02780b7f8f2013f76e3ab80a"; # url = "github:kradalby/headscale/bbb4c357268998fd02780b7f8f2013f76e3ab80a";
url = "github:juanfont/headscale/6049ec758ca46b5c6ee7abba4f3d472fb1e2ffa6"; url = "github:juanfont/headscale/6049ec758ca46b5c6ee7abba4f3d472fb1e2ffa6";
@ -43,7 +39,6 @@
home-manager, home-manager,
ewwtilities, ewwtilities,
kmonad, kmonad,
atuin,
... ...
}: }:
let let
@ -77,7 +72,7 @@
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { extraSpecialArgs = {
inherit user ewwtilities atuin pkgs-stable; inherit user ewwtilities pkgs-stable;
}; };
users.${user} = { users.${user} = {
imports = [ imports = [
@ -110,7 +105,7 @@
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { extraSpecialArgs = {
inherit user ewwtilities atuin pkgs-stable; inherit user ewwtilities pkgs-stable;
}; };
users.${user} = { users.${user} = {
imports = [ imports = [
@ -142,7 +137,7 @@
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { extraSpecialArgs = {
inherit user ewwtilities atuin pkgs-stable; inherit user ewwtilities pkgs-stable;
}; };
users.${user} = { users.${user} = {
imports = [ imports = [

4
home.nix
View file

@ -1,5 +1,5 @@
{ inputs, config, osConfig, pkgs, pkgs-stable, ewwtilities, atuin, user, ... }: { inputs, config, osConfig, pkgs, pkgs-stable, ewwtilities, user, ... }:
let let
moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz); moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz);
@ -18,7 +18,6 @@ let
install_packages = with pkgs; [ install_packages = with pkgs; [
# (pkgs.callPackage ./modules/minecraft-bedrock/minecraft-bedrock-server.nix {}) # the possible minecraft-bedrock-server package for testing # (pkgs.callPackage ./modules/minecraft-bedrock/minecraft-bedrock-server.nix {}) # the possible minecraft-bedrock-server package for testing
# utilities # utilities
atuin.packages.${pkgs.system}.atuin
bat # cat with wings (better cat) bat # cat with wings (better cat)
bottom # system monitor bottom # system monitor
du-dust # directory disk-space analyzer du-dust # directory disk-space analyzer
@ -89,7 +88,6 @@ in
{ {
imports = [ imports = [
./modules/atuin.nix
./modules/discord.nix ./modules/discord.nix
#./modules/emacs.nix #./modules/emacs.nix
./modules/fusuma.nix ./modules/fusuma.nix

1
hosts/Alaska/default.nix
View file

@ -4,7 +4,6 @@
{ {
imports = [ imports = [
./modules/atuin.nix
./modules/backup_script.nix ./modules/backup_script.nix
./configuration.nix ./configuration.nix
./hardware-configuration.nix ./hardware-configuration.nix

32
hosts/Alaska/modules/atuin.nix
View file

@ -1,32 +0,0 @@
{ config, ...}:
let
in
{
services.atuin = {
enable = true;
openFirewall = true;
port = 8910;
host = "127.0.0.1";
openRegistration = false;
database = {
createLocally = true;
};
};
services.nginx.virtualHosts = {
"atuin.nickiel.net" = {
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://127.0.0.1:${builtins.toString config.services.atuin.port}";
proxyWebsockets = true;
extraConfig = ''
allow 100.64.0.0/16;
allow 127.0.0.1;
deny all;
'';
};
};
};
}

5
hosts/Alaska/modules/dns.nix
View file

@ -19,9 +19,4 @@
type = "A"; type = "A";
value = "100.64.0.1"; value = "100.64.0.1";
} }
{
name = "atuin.nickiel.net";
type = "A";
value = "100.64.0.1";
}
] ]

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

@ -1,4 +1,4 @@
{ config, pkgs, headscale, ... }: { config, headscale, ... }:
let let
tailscale_dns_entries = import ./dns.nix; tailscale_dns_entries = import ./dns.nix;
@ -16,7 +16,7 @@ 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.${pkgs.system}.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;

21
hosts/Alaska/modules/nextcloud.nix
View file

@ -29,6 +29,16 @@
database.createLocally = false; database.createLocally = false;
config = { config = {
defaultPhoneRegion = "US";
overwriteProtocol = "https";
extraTrustedDomains = [
"10.0.0.183"
"files.nickiel.net"
];
trustedProxies = [
"files.nickiel.net"
];
dbtype = "pgsql"; dbtype = "pgsql";
dbuser = "nextcloud"; dbuser = "nextcloud";
dbhost = "/run/postgresql"; dbhost = "/run/postgresql";
@ -40,17 +50,6 @@
adminpassFile = "/Aurora/nextcloud/nextcloud-admin-password"; adminpassFile = "/Aurora/nextcloud/nextcloud-admin-password";
adminuser = "admin"; adminuser = "admin";
}; };
extraOptions = {
defaultPhoneRegion = "US";
overwriteProtocol = "https";
extraTrustedDomains = [
"10.0.0.183"
"files.nickiel.net"
];
trustedProxies = [
"files.nickiel.net"
];
};
}; };
services.postgresql = { services.postgresql = {

27
modules/atuin.nix
View file

@ -1,27 +0,0 @@
{osConfig, config, pkgs, atuin, ...}:
let
hostname = osConfig.networking.hostName;
in
{
programs.atuin = {
enable = true;
package = atuin.packages.${pkgs.system}.atuin;
enableZshIntegration = true;
flags = [
];
settings = {
auto_sync = true;
sync_frequency = "20m";
sync_address = if (hostname == "Alaska") then "http://127.0.0.1:8910"
else "https://atuin.nickiel.net";
# filter_mode = "global" | "host" | "session" | "directory"
inline_height = 40;
show_preview = true;
show_help = true;
exit_mode = "return-query";
secrets_filter = true;
};
};
}