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:2d9584458851bf94ac897051535680cb7c1b150d
Branches Tags
Nickiel:main
Nickiel:awesome-dev
...
compare: Nickiel:804c9fe07071889958ddf3ed587e4756afb6bb11
Branches Tags
Nickiel:main
Nickiel:awesome-dev

11 commits
2d95844588 ... 804c9fe070

Author SHA1 Message Date
Nickiel12
804c9fe070 added atuin server exception 2024-01-09 19:52:14 -08:00
Nickiel12
c334804585 turned off atuin registry 2024-01-09 19:42:33 -08:00
Nickiel12
a5e9770cea re-add atuin proxypass 2024-01-09 19:27:51 -08:00
Nickiel12
555eb113f0 fixed typo 2024-01-09 19:25:02 -08:00
Nickiel12
bd54829982 moved settings - depreciation warning 2024-01-09 19:05:50 -08:00
Nickiel12
2a828ef30c fixed missing atuin references 2024-01-09 19:04:28 -08:00
Nickiel12
6e2f3eee1c fixed file not being imported 2024-01-09 18:56:16 -08:00
Nickiel12
0156669ba3 flake.lock: Update 
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/2aff324cf65f5f98f89d878c056b779466b17db8' (2023-12-29)
  → 'github:nix-community/home-manager/e13aa9e287b3365473e5897e3667ea80a899cdfb' (2024-01-09)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/cfc3698c31b1fb9cdcf10f36c9643460264d0ca8' (2023-12-27)
  → 'github:nixos/nixpkgs/46ae0210ce163b3cba6c7da08840c1d63de9c701' (2024-01-06)
• Updated input 'nixpkgs-stable':
    'github:NixOS/nixpkgs/ab3d01706825b1291a77187f2756c8fac3da2ca9' (2023-12-30)
  → 'github:NixOS/nixpkgs/41cc007ec08faecf4156bf73271b218249984088' (2024-01-10)
• Updated input 'nixvim':
    'github:nix-community/nixvim/9738dae3eac5c9b1c1e3ab787db0cedfc59e49b9' (2023-12-30)
  → 'github:nix-community/nixvim/b4ddb322889e2daf41333b4dbca2555da2e8bb7e' (2024-01-09)
• Added input 'nixvim/flake-parts':
    'github:hercules-ci/flake-parts/88a2cd8166694ba0b6cb374700799cec53aef527' (2024-01-01)
• Added input 'nixvim/flake-parts/nixpkgs-lib':
    follows 'nixvim/nixpkgs'
• Removed input 'nixvim/flake-utils'
• Removed input 'nixvim/flake-utils/systems'
• Added input 'nixvim/home-manager':
    'github:nix-community/home-manager/51e44a13acea71b36245e8bd8c7db53e0a3e61ee' (2024-01-05)
• Added input 'nixvim/home-manager/nixpkgs':
    follows 'nixvim/nixpkgs'
• Added input 'nixvim/nix-darwin':
    'github:lnl7/nix-darwin/0dd382b70c351f528561f71a0a7df82c9d2be9a4' (2024-01-03)
• Added input 'nixvim/nix-darwin/nixpkgs':
    follows 'nixvim/nixpkgs'
• Updated input 'nixvim/nixpkgs':
    'github:NixOS/nixpkgs/cfc3698c31b1fb9cdcf10f36c9643460264d0ca8' (2023-12-27)
  → 'github:NixOS/nixpkgs/46ae0210ce163b3cba6c7da08840c1d63de9c701' (2024-01-06)
• Updated input 'nixvim/pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/7f35ec30d16b38fe0eed8005933f418d1a4693ee' (2023-12-24)
  → 'github:cachix/pre-commit-hooks.nix/44493e2b3c3ebcd39a9947e9ed9f2c2af164ec4c' (2024-01-07)
• Updated input 'nixvim/pre-commit-hooks/nixpkgs-stable':
    'github:NixOS/nixpkgs/c37ca420157f4abc31e26f436c1145f8951ff373' (2023-06-03)
  → follows 'nixvim/nixpkgs'
 2024-01-09 18:51:59 -08:00
Nickiel12
2acc272a85 added atuin follows unstable 2024-01-09 18:49:24 -08:00
Nickiel12
54995bff7c fixed syntax error 2024-01-09 18:48:18 -08:00
Nickiel12
5382c0dc61 added atuin shell history 2024-01-09 18:47:47 -08:00
9 changed files with 225 additions and 61 deletions
Show stats Expand all files Collapse all files

181
flake.lock
View file

@ -1,5 +1,27 @@
{
"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": {
"inputs": {
"nixpkgs": "nixpkgs",
@ -35,16 +57,53 @@
"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": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github"
},
"original": {
@ -76,11 +135,11 @@
"systems": "systems_3"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
@ -160,11 +219,32 @@
]
},
"locked": {
"lastModified": 1703838268,
"narHash": "sha256-SRg5nXcdPnrsQR2MTAp7en0NyJnQ2wB1ivmsgEbvN+o=",
"lastModified": 1704809957,
"narHash": "sha256-Z8sBeoeeY2O+BNqh5C+4Z1h1F1wQ2mij7yPZ2GY397M=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2aff324cf65f5f98f89d878c056b779466b17db8",
"rev": "e13aa9e287b3365473e5897e3667ea80a899cdfb",
"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"
},
"original": {
@ -212,6 +292,27 @@
"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": {
"locked": {
"lastModified": 1699099776,
@ -230,11 +331,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1703957214,
"narHash": "sha256-VBiQAJaGnksf9na2rtOvxliKuK+Bn8LMyz2gzyNowc4=",
"lastModified": 1704844897,
"narHash": "sha256-B93cvvx2aqffleVrpnCW4U/YO190OfNq5i0XrspwLa0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ab3d01706825b1291a77187f2756c8fac3da2ca9",
"rev": "41cc007ec08faecf4156bf73271b218249984088",
"type": "github"
},
"original": {
@ -244,22 +345,6 @@
"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": {
"locked": {
"lastModified": 1681358109,
@ -326,11 +411,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1703637592,
"narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=",
"lastModified": 1704538339,
"narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8",
"rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701",
"type": "github"
},
"original": {
@ -342,11 +427,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1703637592,
"narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=",
"lastModified": 1704538339,
"narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8",
"rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701",
"type": "github"
},
"original": {
@ -358,16 +443,18 @@
},
"nixvim": {
"inputs": {
"flake-utils": "flake-utils_3",
"flake-parts": "flake-parts",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_7",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1703944758,
"narHash": "sha256-VOe76pyV9zY+1pX09nX4ZDv2dINZylI7U5sWmWm20gA=",
"lastModified": 1704812275,
"narHash": "sha256-uRe8BdZhuSiupXOxohaVP8LzJtBRG+ETP9PgzR60orI=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "9738dae3eac5c9b1c1e3ab787db0cedfc59e49b9",
"rev": "b4ddb322889e2daf41333b4dbca2555da2e8bb7e",
"type": "github"
},
"original": {
@ -378,21 +465,24 @@
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_4",
"gitignore": "gitignore",
"nixpkgs": [
"nixvim",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable_2"
"nixpkgs-stable": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1703426812,
"narHash": "sha256-aODSOH8Og8ne4JylPJn+hZ6lyv6K7vE5jFo4KAGIebM=",
"lastModified": 1704668415,
"narHash": "sha256-BMzNHFod53iiU4lkR5WHwqQCFmaCLq85sUCskXneXlA=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "7f35ec30d16b38fe0eed8005933f418d1a4693ee",
"rev": "44493e2b3c3ebcd39a9947e9ed9f2c2af164ec4c",
"type": "github"
},
"original": {
@ -403,6 +493,7 @@
},
"root": {
"inputs": {
"atuin": "atuin",
"ewwtilities": "ewwtilities",
"headscale": "headscale",
"home-manager": "home-manager",
@ -416,7 +507,7 @@
},
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2"
},
"locked": {
@ -435,7 +526,7 @@
},
"rust-overlay_2": {
"inputs": {
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_5"
},
"locked": {

11
flake.nix
View file

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

4
home.nix
View file

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

1
hosts/Alaska/default.nix
View file

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

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

@ -0,0 +1,32 @@
{ 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,4 +19,9 @@
type = "A";
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, headscale, ... }:
{ config, pkgs, headscale, ... }:
let
tailscale_dns_entries = import ./dns.nix;
@ -16,7 +16,7 @@ in {
# https://carjorvaz.com/posts/setting-up-headscale-on-nixos/
services.headscale = {
package = headscale.packages."x86_64-linux".headscale;
package = headscale.packages.${pkgs.system}.headscale;
enable = true;
address = "0.0.0.0";
port = 8082;

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

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

27
modules/atuin.nix Normal file
View file

@ -0,0 +1,27 @@
{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;
};
};
}