Compare commits
21
Commits
ca2854e432
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7ccd4e15da | ||
|
|
3490817248 | ||
|
|
148640bb2a | ||
|
|
ba44c1bc08 | ||
|
|
4d3a006bfd | ||
|
|
491d6adc91 | ||
|
|
8e0c80c3b0 | ||
|
|
b23dbf47b3 | ||
|
|
eac355b345 | ||
|
|
49c73c9139 | ||
|
|
4319f158ff | ||
|
|
9a2939d652 | ||
|
|
5cb7962371 | ||
|
|
de75a0fdbd | ||
|
|
34ba6d636c | ||
|
|
dcacdc457c | ||
|
|
0ee096cc68 | ||
|
|
23769c139f | ||
|
|
7c68d3e0d3 | ||
|
|
8fd41b9360 | ||
|
|
a29b3994a3 |
+1
-1
@@ -1,2 +1,2 @@
|
|||||||
.env
|
*.env
|
||||||
.gitea-actions-runner-token
|
.gitea-actions-runner-token
|
||||||
+26
-18
@@ -11,6 +11,7 @@
|
|||||||
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
||||||
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
||||||
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
|
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
|
||||||
|
gamescopeSession.enable = true;
|
||||||
};
|
};
|
||||||
programs.neovim = {
|
programs.neovim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -56,7 +57,10 @@
|
|||||||
LC_TIME = "en_US.UTF-8";
|
LC_TIME = "en_US.UTF-8";
|
||||||
};
|
};
|
||||||
|
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.docker = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.docker_29;
|
||||||
|
};
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
@@ -161,7 +165,7 @@
|
|||||||
};
|
};
|
||||||
programs.vscode = { # Configure vscodium
|
programs.vscode = { # Configure vscodium
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.vscodium;
|
package = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.vscodium; # i just want the vscode-dark-2026 theme
|
||||||
mutableExtensionsDir = true; # Keep theme updated
|
mutableExtensionsDir = true; # Keep theme updated
|
||||||
profiles.default.extensions = with pkgs.vscode-extensions; [
|
profiles.default.extensions = with pkgs.vscode-extensions; [
|
||||||
jnoortheen.nix-ide # NIX syntax highlighting. Also uses nixfmt package
|
jnoortheen.nix-ide # NIX syntax highlighting. Also uses nixfmt package
|
||||||
@@ -172,18 +176,18 @@
|
|||||||
tekumara.typos-vscode # spellcheck
|
tekumara.typos-vscode # spellcheck
|
||||||
bierner.markdown-mermaid # mermaid
|
bierner.markdown-mermaid # mermaid
|
||||||
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
||||||
{
|
# {
|
||||||
name = "skillavid-pure-black";
|
# name = "skillavid-pure-black";
|
||||||
publisher = "redwan-hossain";
|
# publisher = "redwan-hossain";
|
||||||
version = "5.0.0";
|
# version = "5.0.0";
|
||||||
sha256 = "sha256-/gLvhw0XcUb6Jch/LZ4k7xpSS9wdYWVf5u7uvOHS+i8=";
|
# sha256 = "sha256-/gLvhw0XcUb6Jch/LZ4k7xpSS9wdYWVf5u7uvOHS+i8=";
|
||||||
}
|
# }
|
||||||
{
|
# {
|
||||||
name = "remote-ssh-edit";
|
# name = "remote-ssh-edit";
|
||||||
publisher = "ms-vscode-remote";
|
# publisher = "ms-vscode-remote";
|
||||||
version = "0.47.2";
|
# version = "0.47.2";
|
||||||
sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
|
# sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
|
||||||
}
|
# }
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -204,11 +208,9 @@
|
|||||||
# godot # 4.5.1 for now
|
# godot # 4.5.1 for now
|
||||||
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.godot_4
|
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.godot_4
|
||||||
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.typst # bleeding edge html exports for typst
|
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.typst # bleeding edge html exports for typst
|
||||||
tinymist # typst previews
|
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.tinymist # typst previews
|
||||||
nextcloud-client
|
nextcloud-client
|
||||||
steam
|
|
||||||
signal-desktop
|
signal-desktop
|
||||||
docker
|
|
||||||
# swaybg # wallpaper
|
# swaybg # wallpaper
|
||||||
nixfmt # nix file formatting
|
nixfmt # nix file formatting
|
||||||
openrgb # RGB editor
|
openrgb # RGB editor
|
||||||
@@ -224,6 +226,7 @@
|
|||||||
patchelf # make programs understand nix. good for downloaded executables such as crackmes
|
patchelf # make programs understand nix. good for downloaded executables such as crackmes
|
||||||
starsector # support indie games!
|
starsector # support indie games!
|
||||||
htop
|
htop
|
||||||
|
ripgrep
|
||||||
mullvad-vpn # arrr
|
mullvad-vpn # arrr
|
||||||
qbittorrent # arrr
|
qbittorrent # arrr
|
||||||
mpv # arrr
|
mpv # arrr
|
||||||
@@ -235,6 +238,7 @@
|
|||||||
wireguard-tools
|
wireguard-tools
|
||||||
blender # drone
|
blender # drone
|
||||||
gnumake # make & makefile
|
gnumake # make & makefile
|
||||||
|
thunderbird
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -248,7 +252,6 @@
|
|||||||
libnotify
|
libnotify
|
||||||
rofi
|
rofi
|
||||||
alacritty
|
alacritty
|
||||||
vscodium
|
|
||||||
ncdu
|
ncdu
|
||||||
nmap
|
nmap
|
||||||
kitty
|
kitty
|
||||||
@@ -265,6 +268,8 @@
|
|||||||
wireless-regdb
|
wireless-regdb
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
fonts.packages = [ pkgs.nerd-fonts.jetbrains-mono ];
|
fonts.packages = [ pkgs.nerd-fonts.jetbrains-mono ];
|
||||||
|
|
||||||
programs.niri.enable = false;
|
programs.niri.enable = false;
|
||||||
@@ -367,6 +372,9 @@
|
|||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [2121];
|
networking.firewall.allowedTCPPorts = [2121];
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
networking.extraHosts = ''
|
||||||
|
10.0.1.51 freeipa.bsidestoctf.com
|
||||||
|
'';
|
||||||
programs.nm-applet.enable = true;
|
programs.nm-applet.enable = true;
|
||||||
|
|
||||||
# Binaries auto linked
|
# Binaries auto linked
|
||||||
|
|||||||
Generated
+9
-9
@@ -7,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1778606796,
|
"lastModified": 1779506708,
|
||||||
"narHash": "sha256-P2krpSkFVYJ89bgsnAZ9RtQiGwiTW77sfSJp9SEDscM=",
|
"narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "e1fd7350f4410972bcb8c42a697d8c924ffe642a",
|
"rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -23,11 +23,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1778430510,
|
"lastModified": 1782847189,
|
||||||
"narHash": "sha256-Ti+ZBvW6yrWWAg2szExVTwCd4qOJ3KlVr1tFHfyfi8Q=",
|
"narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8fd9daa3db09ced9700431c5b7ad0e8ba199b575",
|
"rev": "b6018f87da91d19d0ab4cf979885689b469cdd41",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -39,11 +39,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1785090369,
|
"lastModified": 1787498568,
|
||||||
"narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=",
|
"narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "624af665418d3c65d544145b4d34ad696439570e",
|
"rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
modules = [
|
modules = [
|
||||||
./client-configuration.nix
|
./client-configuration.nix
|
||||||
./alien-hardware-configuration.nix
|
./alien-hardware-configuration.nix
|
||||||
|
./shared-configuration.nix
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
@@ -35,6 +36,7 @@
|
|||||||
modules = [
|
modules = [
|
||||||
./client-configuration.nix
|
./client-configuration.nix
|
||||||
./thinkpad-hardware-configuration.nix
|
./thinkpad-hardware-configuration.nix
|
||||||
|
./shared-configuration.nix
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
@@ -50,6 +52,7 @@
|
|||||||
modules = [
|
modules = [
|
||||||
./server-configuration.nix
|
./server-configuration.nix
|
||||||
./predator-hardware-configuration.nix
|
./predator-hardware-configuration.nix
|
||||||
|
./shared-configuration.nix
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
|
{ config, lib, pkgs, inputs, ... }:
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [];
|
imports = [];
|
||||||
@@ -10,13 +9,23 @@
|
|||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
|
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
networking.firewall.allowedTCPPorts = [22 42069];
|
networking.firewall.allowedTCPPorts = [22 42069 9876];
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
ports = [22];
|
ports = [22];
|
||||||
settings.X11Forwarding = true;
|
settings.X11Forwarding = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.miniflux = {
|
||||||
|
enable = true;
|
||||||
|
createDatabaseLocally = true;
|
||||||
|
adminCredentialsFile = "/etc/miniflux.env";
|
||||||
|
config = {
|
||||||
|
LISTEN_ADDR = "0.0.0.0:9876";
|
||||||
|
BASE_URL = "https://reader.janel.la";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
systemd.services."gitea-runner-homelab".serviceConfig = {
|
systemd.services."gitea-runner-homelab".serviceConfig = {
|
||||||
ReadWritePaths = [ "/servers/site" ];
|
ReadWritePaths = [ "/servers/site" ];
|
||||||
DynamicUser = lib.mkForce false;
|
DynamicUser = lib.mkForce false;
|
||||||
@@ -26,7 +35,7 @@
|
|||||||
environment.binsh = "${pkgs.bash}/bin/bash";
|
environment.binsh = "${pkgs.bash}/bin/bash";
|
||||||
services.gitea-actions-runner.instances."homelab" = {
|
services.gitea-actions-runner.instances."homelab" = {
|
||||||
enable = true;
|
enable = true;
|
||||||
url = "https://git.jeremyjanella.com";
|
url = "https://git.janel.la";
|
||||||
tokenFile = "/servers/gitea/runner-token";
|
tokenFile = "/servers/gitea/runner-token";
|
||||||
name = "predator";
|
name = "predator";
|
||||||
labels = [ "homelab:host" "nixos:host" "predator:host" ];
|
labels = [ "homelab:host" "nixos:host" "predator:host" ];
|
||||||
@@ -37,7 +46,10 @@
|
|||||||
|
|
||||||
time.timeZone = "America/Toronto";
|
time.timeZone = "America/Toronto";
|
||||||
|
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.docker = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.docker_29;
|
||||||
|
};
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
@@ -93,7 +105,7 @@
|
|||||||
usbutils # for lsusb
|
usbutils # for lsusb
|
||||||
networkmanagerapplet
|
networkmanagerapplet
|
||||||
wireguard-tools
|
wireguard-tools
|
||||||
typst
|
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.typst # bleeding edge html exports for typst
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
{ config, lib, pkgs, inputs, ... }:
|
||||||
|
{
|
||||||
|
programs.ssh.extraConfig = ''
|
||||||
|
Host scinet
|
||||||
|
HostName teach.scinet.utoronto.ca
|
||||||
|
User lcl_uotcscd60s2180
|
||||||
|
ForwardX11 yes
|
||||||
|
ForwardX11Trusted yes
|
||||||
|
IdentityFile ~/.ssh/id_ed25519.pub
|
||||||
|
|
||||||
|
Host node
|
||||||
|
Hostname janel.la
|
||||||
|
User jeremy
|
||||||
|
ForwardX11Trusted yes
|
||||||
|
IdentityFile ~/.ssh/id_ed25519.pub
|
||||||
|
|
||||||
|
Host predator
|
||||||
|
Hostname 10.8.0.4
|
||||||
|
User jeremy
|
||||||
|
ForwardX11Trusted yes
|
||||||
|
ProxyJump node
|
||||||
|
|
||||||
|
Host mathlab
|
||||||
|
Hostname mathlab.utsc.utoronto.ca
|
||||||
|
User janellaj
|
||||||
|
ForwardX11 yes
|
||||||
|
ForwardX11Trusted yes
|
||||||
|
IdentityFile ~/.ssh/id_ed25519.pub
|
||||||
|
|
||||||
|
Host lab
|
||||||
|
Hostname it-ia3160-01.utsc-labs.utoronto.ca
|
||||||
|
User janellaj
|
||||||
|
ForwardX11 yes
|
||||||
|
ForwardX11Trusted yes
|
||||||
|
IdentityFile ~/.ssh/id_ed25519.pub
|
||||||
|
ProxyJump mathlab
|
||||||
|
'';
|
||||||
|
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user