Compare commits
4 Commits
660307a862
...
fca7f8878a
Author | SHA1 | Date | |
---|---|---|---|
|
fca7f8878a | ||
|
ad1e1ff6c8 | ||
|
2bb530b378 | ||
|
bb026f9a6d |
22
flake.lock
generated
22
flake.lock
generated
@ -7,27 +7,27 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700392168,
|
"lastModified": 1700814205,
|
||||||
"narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
|
"narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
|
"rev": "aeb2232d7a32530d3448318790534d196bf9427a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-23.05",
|
"ref": "release-23.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixos-unstable": {
|
"nixos-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700390070,
|
"lastModified": 1701718080,
|
||||||
"narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
|
"narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
|
"rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -39,16 +39,16 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700565382,
|
"lastModified": 1702141067,
|
||||||
"narHash": "sha256-fn7daU1uz0BDWyRmOqm1N8rvnGCYB0kHjzKB5MeG2P8=",
|
"narHash": "sha256-Xus22U0FymdODEv4dmwXjztyOftu7A+rYxU50UFMvjM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "767986a42765f97edb87e9134133cb3057fcecb3",
|
"rev": "f33536f3403c64bfd8f54f002b88cc2f568e10a9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "release-23.05",
|
"ref": "release-23.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
|
nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
|
||||||
nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-23.05";
|
url = "github:nix-community/home-manager/release-23.11";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -29,18 +29,18 @@ in
|
|||||||
./minecraft.nix
|
./minecraft.nix
|
||||||
./prowlarr.nix
|
./prowlarr.nix
|
||||||
./libreddit.nix
|
./libreddit.nix
|
||||||
./invidious.nix
|
# ./invidious.nix
|
||||||
# ./lidarr.nix
|
# ./lidarr.nix
|
||||||
# ./navidrome.nix
|
# ./navidrome.nix
|
||||||
# ./jellyfin.nix
|
# ./jellyfin.nix
|
||||||
./prosody.nix
|
# ./prosody.nix
|
||||||
./deluge.nix
|
./deluge.nix
|
||||||
#./calibre.nix
|
#./calibre.nix
|
||||||
./docker.nix
|
./docker.nix
|
||||||
./keycloak.nix
|
# ./keycloak.nix
|
||||||
# ./runas.nix
|
# ./runas.nix
|
||||||
./tailscale.nix
|
./tailscale.nix
|
||||||
./searx.nix
|
# ./searx.nix
|
||||||
./plex.nix
|
./plex.nix
|
||||||
./headscale.nix
|
./headscale.nix
|
||||||
./llm.nix
|
./llm.nix
|
||||||
|
@ -24,22 +24,6 @@ in
|
|||||||
|
|
||||||
auto_join_rooms = [ "#general:${domain}" "#music:${domain}" "#movies:${domain}" ];
|
auto_join_rooms = [ "#general:${domain}" "#music:${domain}" "#movies:${domain}" ];
|
||||||
|
|
||||||
oidc_providers = [{
|
|
||||||
idp_id = "keycloak";
|
|
||||||
idp_name = "Architect SSO";
|
|
||||||
issuer = "https://auth.giugl.io/realms/master";
|
|
||||||
client_id = "synapse";
|
|
||||||
client_secret = "hj7dkbAI75jIeggr1cW0JTRzAdvJUtq6";
|
|
||||||
scopes = [ "openid" "profile" ];
|
|
||||||
user_profile_method = "userinfo_endpoint";
|
|
||||||
user_mapping_provider.config = {
|
|
||||||
localpart_template = "{{ user.preferred_username }}";
|
|
||||||
display_name_template = "{{ user.name }}";
|
|
||||||
confirm_localpart = true;
|
|
||||||
};
|
|
||||||
backchannel_logout_enabled = true;
|
|
||||||
}];
|
|
||||||
|
|
||||||
listeners = [{
|
listeners = [{
|
||||||
port = 8008;
|
port = 8008;
|
||||||
bind_addresses = [ "127.0.0.1" ];
|
bind_addresses = [ "127.0.0.1" ];
|
||||||
@ -57,10 +41,10 @@ in
|
|||||||
postgresql = {
|
postgresql = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.postgresql;
|
package = pkgs.postgresql;
|
||||||
ensureUsers = [{
|
# ensureUsers = [{
|
||||||
name = db_name;
|
# name = db_name;
|
||||||
ensurePermissions = { "DATABASE \"${db_name}\"" = "ALL PRIVILEGES"; };
|
# ensurePermissions = { "DATABASE \"${db_name}\"" = "ALL PRIVILEGES"; };
|
||||||
}];
|
# }];
|
||||||
};
|
};
|
||||||
|
|
||||||
nginx.virtualHosts = {
|
nginx.virtualHosts = {
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
system.stateVersion = "23.05";
|
system.stateVersion = "23.11";
|
||||||
}
|
}
|
||||||
|
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, home-manager, mkHomeRole, ... }:
|
{ pkgs, stdenv, home-manager, mkHomeRole, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
mkUser = { name, roles ? [ ] }:
|
mkUser = { name, roles ? [ ] }:
|
||||||
@ -39,7 +39,7 @@
|
|||||||
home = {
|
home = {
|
||||||
username = name;
|
username = name;
|
||||||
homeDirectory =
|
homeDirectory =
|
||||||
if pkgs.stdenv.isLinux then "/home/${name}" else "/Users/${name}";
|
if stdenv.isLinux then "/home/${name}" else "/Users/${name}";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
(mkHomeRole "common")
|
(mkHomeRole "common")
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
fonts = {
|
fonts = {
|
||||||
fontconfig.enable = true;
|
fontconfig.enable = true;
|
||||||
fonts = with pkgs; [ cascadia-code victor-mono ];
|
packages = with pkgs; [ cascadia-code victor-mono ];
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
@ -22,8 +22,8 @@
|
|||||||
glances
|
glances
|
||||||
tree
|
tree
|
||||||
]
|
]
|
||||||
++ lib.optional (!stdenv.isDarwin) pastebinit;
|
++ lib.optional (!pkgs.stdenv.isDarwin) pastebinit;
|
||||||
|
|
||||||
stateVersion = "23.05";
|
stateVersion = "23.11";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -146,7 +146,7 @@
|
|||||||
user = "git";
|
user = "git";
|
||||||
identityFile = "~/.ssh/github";
|
identityFile = "~/.ssh/github";
|
||||||
};
|
};
|
||||||
|
|
||||||
"code.iti.illinois.edu" = {
|
"code.iti.illinois.edu" = {
|
||||||
user = "gitlab";
|
user = "gitlab";
|
||||||
identityFile = "~/.ssh/github";
|
identityFile = "~/.ssh/github";
|
||||||
@ -190,11 +190,13 @@
|
|||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
IdentitiesOnly yes
|
IdentitiesOnly yes
|
||||||
ServerAliveInterval 3600
|
ServerAliveInterval 3600
|
||||||
Include config.d/*
|
Include config.d/*
|
||||||
'' + lib.optionalString pkgs.stdenv.isDarwin ''
|
${if pkgs.stdenv.isDarwin then
|
||||||
AddKeysToAgent yes
|
''
|
||||||
UseKeychain yes
|
AddKeysToAgent yes
|
||||||
TCPKeepAlive no
|
UseKeychain yes
|
||||||
|
TCPKeepAlive no
|
||||||
|
'' else ""}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, lib, stdenv, ... }:
|
{ pkgs, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
home.packages = with pkgs; [ any-nix-shell ];
|
home.packages = with pkgs; [ any-nix-shell ];
|
||||||
@ -21,8 +21,7 @@
|
|||||||
|
|
||||||
any-nix-shell zsh --info-right | source /dev/stdin
|
any-nix-shell zsh --info-right | source /dev/stdin
|
||||||
source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
|
source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
|
||||||
'' + lib.optional (stdenv.isDarwin) ''
|
${if pkgs.stdenv.isDarwin then "export PATH=$PATH:/opt/homebrew/bin" else ""}
|
||||||
export PATH=$PATH:/opt/homebrew/bin
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user