mirror of
https://github.com/tuxdotrs/nix-config.git
synced 2026-09-19 16:49:04 +05:30
Compare commits
94 Commits
8f531dfc4e
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
8a6ac1a533
|
|||
|
c009f2be73
|
|||
|
8ef160a991
|
|||
|
c179b45ac1
|
|||
|
ac750098b1
|
|||
|
75ecf511e6
|
|||
|
e48e2903ac
|
|||
|
69882de18a
|
|||
|
e1632cb506
|
|||
|
43b3be09e5
|
|||
|
f960a5eb04
|
|||
|
23dfd5b998
|
|||
|
2b3e4661b3
|
|||
|
cdce741599
|
|||
|
e520cf6767
|
|||
|
30e33cb768
|
|||
|
dc750c6bfe
|
|||
|
80469632b1
|
|||
|
9bb2e1f11d
|
|||
|
3b9774a20d
|
|||
| 932bf56972 | |||
|
dedda22aea
|
|||
|
ef09a8a5d4
|
|||
|
51c6925364
|
|||
|
dbd2353273
|
|||
|
b6aa11fb56
|
|||
|
f08e67c36e
|
|||
|
bd977c0941
|
|||
|
e6ffe8698f
|
|||
|
ac3a0404bc
|
|||
|
cba375a888
|
|||
|
acb825e1db
|
|||
|
344d8bdd4a
|
|||
|
49a341d6b3
|
|||
|
9c77654697
|
|||
|
dacbe6bc24
|
|||
|
33a1e9da9c
|
|||
|
c6b12d6ff9
|
|||
|
3f6fb2e504
|
|||
| 8026816b8f | |||
|
060ecbe7da
|
|||
|
a01bd43ec9
|
|||
|
54049a60ec
|
|||
|
30929f3a7b
|
|||
|
9f190436e9
|
|||
|
884dd188c3
|
|||
|
ea526e6f88
|
|||
|
edb3678ddd
|
|||
|
b87e0889e0
|
|||
|
7a7ba68016
|
|||
|
4f5db036b6
|
|||
|
85fa1f78d0
|
|||
|
b578e3b462
|
|||
|
d0c1416f16
|
|||
|
91942539d7
|
|||
|
40276742bb
|
|||
|
915c30c804
|
|||
|
7f0d55c597
|
|||
|
ba22699df3
|
|||
|
c9a56d4a22
|
|||
|
42e073ea63
|
|||
|
033007490f
|
|||
|
9e2559b1b7
|
|||
|
8c755a5aa1
|
|||
|
69c2254f00
|
|||
|
31f4218115
|
|||
|
7614a68027
|
|||
|
c0a6af4e97
|
|||
|
a522f73de5
|
|||
|
cc2766509e
|
|||
|
95cd68aac2
|
|||
|
967b4f118b
|
|||
|
f0d42515c4
|
|||
|
f7a96f76f7
|
|||
|
ec2e9e0721
|
|||
|
9269257065
|
|||
|
8ec633a0f0
|
|||
|
e48e2cda51
|
|||
|
fbd006ae4c
|
|||
|
67c44b336c
|
|||
|
93dcaeb05e
|
|||
|
0f842359b3
|
|||
|
9e37341838
|
|||
|
4b828d974f
|
|||
|
cf52a84c81
|
|||
|
c5d8729a28
|
|||
|
d083b69cd6
|
|||
|
7a9ad6fd6c
|
|||
|
b060e4ccb6
|
|||
|
9242347eaf
|
|||
|
f801c6c88c
|
|||
|
b071fe502c
|
|||
|
41a5c5be1a
|
|||
|
6379ff4662
|
204
README.md
204
README.md
@@ -15,196 +15,48 @@
|
||||
## Table of Contents
|
||||
|
||||
- [Hosts](#hosts)
|
||||
- [Installation](#installation)
|
||||
- [Components](#components)
|
||||
- [Showcase](#showcase)
|
||||
- [Pain](#spent-weeks-on-this-system-configuration-)
|
||||
- [Pain](#spent-months-on-this-system-configuration-)
|
||||
|
||||
## Hosts
|
||||
|
||||
| | Hostname | Board | CPU | RAM | GPU | Purpose |
|
||||
| --- | ---------- | ----------------- | ------------------ | ----- | ------------------------- | -------------------------------------------------------------------------------- |
|
||||
| 🖥️ | `sirius` | MSI X570-A Pro | Ryzen 7 5700X3D | 64GB | RTX 3080 TI + RTX 3060 TI | Triple-monitor desktop running Windows Subsystem for Linux. |
|
||||
| 💻 | `canopus` | Asus Zephyrus G15 | Ryzen 9 5900HS | 16GB | RTX 3060 | Optimized for productivity on the go and some gaming. |
|
||||
| ☁️ | `homelab` | Minisforum MS-A1 | Ryzen 7 8700G | 32GB | Radeon 780M | WIP |
|
||||
| ☁️ | `arcturus` | KVM | 4 Core | 8GB | | Primary server responsible for exposing my homelab applications to the internet. |
|
||||
| ☁️ | `alpha` | KVM | 4 Core | 4GB | | Monitors uptime and health status of all services across the infrastructure. |
|
||||
| 🥔 | `vega` | Raspberry Pi 3B+ | Cortex A53 | 1GB | | Running AdGuard Home for network-wide ad blocking. |
|
||||
| 📱 | `capella` | Samsung S25 Ultra | Snapdragon 8 Elite | 12GB | Adreno 830 | Primary mobile for daily usage. (Locked) |
|
||||
| 📱 | `rigel` | Motorola Edge 30 | Snapdragon 778G+ | 8GB | Adreno 642L | Secondary mobile for some fun. (Rooted) |
|
||||
| ☁️ | `node` | ASRock B565D4 | Ryzen 9 5950X | 128GB | | Running Ethereum and BSC nodes. |
|
||||
|
||||
## Installation
|
||||
|
||||
> [!NOTE]
|
||||
> This will get your base system ready, but keep in mind that many things might not work correctly — such as monitor resolution, font size, and more.
|
||||
|
||||
### Prerequisites
|
||||
|
||||
Boot into the NixOS bootable USB before proceeding with the installation steps.
|
||||
|
||||
### Installation Steps
|
||||
|
||||
#### 1. Clone the repository
|
||||
|
||||
```bash
|
||||
git clone https://github.com/tuxdotrs/nix-config.git
|
||||
cd nix-config
|
||||
```
|
||||
|
||||
#### 2. Gain root privileges
|
||||
|
||||
```bash
|
||||
sudo su
|
||||
|
||||
```
|
||||
|
||||
#### 3. Set up disk partitioning
|
||||
|
||||
Install the required tools:
|
||||
|
||||
```bash
|
||||
nix-shell -p disko neovim
|
||||
```
|
||||
|
||||
Partition your disk using disko. **This will wipe your drive.** Replace `DISK_PATH` with your actual disk path (e.g., `/dev/vda` or `/dev/nvme0n1`):
|
||||
|
||||
```bash
|
||||
disko --mode disko ./hosts/canopus/disko.nix --arg device '"DISK_PATH"'
|
||||
```
|
||||
|
||||
#### 4. Configure your disk
|
||||
|
||||
Edit the configuration file:
|
||||
|
||||
```bash
|
||||
nvim ./hosts/canopus/default.nix
|
||||
```
|
||||
|
||||
In the imports statement, replace:
|
||||
|
||||
```nix
|
||||
(import ./disko.nix {device = "/dev/nvme0n1";})
|
||||
```
|
||||
|
||||
with:
|
||||
|
||||
```nix
|
||||
(import ./disko.nix {device = "DISK_PATH";})
|
||||
```
|
||||
|
||||
Make sure to replace `DISK_PATH` with your actual disk path.
|
||||
|
||||
#### 5. Generate hardware configuration
|
||||
|
||||
```bash
|
||||
nixos-generate-config --no-filesystems --root /mnt
|
||||
```
|
||||
|
||||
Copy the generated hardware configuration to the repository:
|
||||
|
||||
```bash
|
||||
cp /mnt/etc/nixos/hardware-configuration.nix ./hosts/canopus/hardware.nix
|
||||
```
|
||||
|
||||
#### 6. Install NixOS
|
||||
|
||||
```bash
|
||||
nixos-install --root /mnt --flake .#canopus
|
||||
```
|
||||
|
||||
#### 7. Enter into the new system
|
||||
|
||||
```bash
|
||||
nixos-enter --root /mnt
|
||||
```
|
||||
|
||||
#### 8. Set up directories and permissions
|
||||
|
||||
```bash
|
||||
mkdir -p /persist/home
|
||||
chown -R tux:users /persist/home
|
||||
```
|
||||
|
||||
#### 9. Set passwords
|
||||
|
||||
Set the root password:
|
||||
|
||||
```bash
|
||||
passwd root
|
||||
```
|
||||
|
||||
Set the user password:
|
||||
|
||||
```bash
|
||||
passwd tux
|
||||
```
|
||||
|
||||
#### 10. Reboot
|
||||
|
||||
```bash
|
||||
reboot
|
||||
```
|
||||
|
||||
Your NixOS system should now boot into a beautiful DE.
|
||||
| --- | ---------- | ----------------- | ------------------ | ---- | ------------------------- | --------------------------------------------------------------------- |
|
||||
| 🖥️ | `sirius` | MSI X570-A Pro | Ryzen 7 5700X3D | 64GB | RTX 3080 TI + RTX 3060 TI | Triple-monitor desktop for work, gaming, and media consumption. |
|
||||
| 💻 | `canopus` | Asus Zephyrus G15 | Ryzen 9 5900HS | 16GB | RTX 3060 | Portable workstation for work, gaming, and media on the go. |
|
||||
| ☁️ | `arcturus` | Minisforum MS-A1 | Ryzen 7 8700G | 32GB | Radeon 780M | Homelab server for self-hosted services and infrastructure workloads. |
|
||||
| ☁️ | `alpha` | KVM | 2 Core | 4GB | | Public-facing server for exposing homelab services to the internet. |
|
||||
| 📱 | `vega` | Samsung S25 Ultra | Snapdragon 8 Elite | 12GB | Adreno 830 | Primary mobile for daily usage. (Locked) |
|
||||
| 📱 | `capella` | Motorola Edge 30 | Snapdragon 778G+ | 8GB | Adreno 642L | Secondary mobile for tinkering and experimentation. (Rooted) |
|
||||
|
||||
## Components
|
||||
|
||||
| | Wayland | Xorg |
|
||||
| ------------- | -------- | ---------------- |
|
||||
| DM | ly | ly |
|
||||
| WM/DE | Hyprland | AwesomeWM |
|
||||
| Compositor | Hyprland | Picom (Jonaburg) |
|
||||
| Bar | tPanel | Wibar |
|
||||
| Hotkeys | Hyprland | Awful |
|
||||
| Launcher | tPanel | Rofi |
|
||||
| Notifications | tPanel | Naughty |
|
||||
| Terminal | Wezterm | Wezterm |
|
||||
| Editor | Neovim | Neovim |
|
||||
| ------------- | -------- | ---- |
|
||||
| DM | ly | - |
|
||||
| WM/DE | Hyprland | - |
|
||||
| Compositor | Hyprland | - |
|
||||
| Bar | Tshell | - |
|
||||
| Hotkeys | Hyprland | - |
|
||||
| Launcher | Tshell | - |
|
||||
| Notifications | Tshell | - |
|
||||
| Terminal | Wezterm | - |
|
||||
| Editor | Neovim | - |
|
||||
|
||||
## Showcase
|
||||
|
||||
### Desktop Hyprland
|
||||
| **Desktop** | **Tshell** |
|
||||
| :-------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------: |
|
||||
| <img src="https://raw.githubusercontent.com/tuxdotrs/nix-config/refs/heads/main/assets/hyprland/desktop.png" width="100%"> | <img src="https://raw.githubusercontent.com/tuxdotrs/nix-config/refs/heads/main/assets/hyprland/tPanel.png" width="100%"> |
|
||||
| **Workflow** | **Neovim** |
|
||||
| <img src="https://raw.githubusercontent.com/tuxdotrs/nix-config/refs/heads/main/assets/hyprland/workflow.png" width="100%"> | <img src="https://github.com/user-attachments/assets/f881c672-8d77-43ec-b637-df5004c7d11f" width="100%"> |
|
||||
| **Floating Terminal** | **Lazygit** |
|
||||
| <img src="https://github.com/user-attachments/assets/3339ecf8-3264-4179-a093-337c844592a6" width="100%"> | <img src="https://github.com/user-attachments/assets/6df15881-fc2b-41b1-af3b-124fe0599b94" width="100%"> |
|
||||
| **Telescope** | **Firefox** |
|
||||
| <img src="https://github.com/user-attachments/assets/03be05bc-8ede-4d6e-a341-2761d89b7288" width="100%"> | <img src="https://github.com/user-attachments/assets/6f12173b-2480-404e-b01a-599115a886c0" width="100%"> |
|
||||
|
||||

|
||||
|
||||
### tPanel
|
||||
|
||||

|
||||
|
||||
### Workflow
|
||||
|
||||

|
||||
|
||||
## Showcase
|
||||
|
||||
### Desktop AwesomeWM
|
||||
|
||||

|
||||
|
||||

|
||||
|
||||
### Neovim
|
||||
|
||||

|
||||
|
||||
### Floating Terminal
|
||||
|
||||

|
||||
|
||||
### Lazygit
|
||||
|
||||

|
||||
|
||||
### Telescope
|
||||
|
||||

|
||||
|
||||
### Firefox
|
||||
|
||||

|
||||
|
||||
## Spent weeks on this system configuration 😢
|
||||
## Spent months on this system configuration 😢
|
||||
|
||||
<div align="center">
|
||||
<img src="https://user-images.githubusercontent.com/97862450/265550523-2f66a8b6-4347-40af-89c6-12db3a61cc7c.jpeg" width="60%">
|
||||
|
||||
1525
flake.lock
generated
1525
flake.lock
generated
File diff suppressed because it is too large
Load Diff
31
flake.nix
31
flake.nix
@@ -24,8 +24,18 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
tpanel = {
|
||||
url = "github:tuxdotrs/tpanel";
|
||||
tshell = {
|
||||
url = "github:tuxdotrs/tshell";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
trok = {
|
||||
url = "github:tuxdotrs/trok";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
tfolio = {
|
||||
url = "git+ssh://git@github.com/tuxdotrs/tfolio.git";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
@@ -54,6 +64,17 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
cardwire = {
|
||||
url = "github:opengamingcollective/cardwire";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nix-on-droid = {
|
||||
url = "github:nix-community/nix-on-droid/master";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.home-manager.follows = "home-manager";
|
||||
};
|
||||
|
||||
import-tree.url = "github:vic/import-tree";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11-small";
|
||||
@@ -68,5 +89,11 @@
|
||||
nixcord.url = "github:kaylorben/nixcord";
|
||||
nur.url = "github:nix-community/nur";
|
||||
lanzaboote.url = "github:nix-community/lanzaboote/v1.1.0";
|
||||
copyparty.url = "github:9001/copyparty";
|
||||
hermes-agent.url = "github:NousResearch/hermes-agent";
|
||||
voxtype.url = "github:peteonrails/voxtype/v0.7.5";
|
||||
opencode.url = "github:anomalyco/opencode";
|
||||
serpantinum.url = "github:ilyamiro/serpantinum";
|
||||
llm-agents.url = "github:numtide/llm-agents.nix";
|
||||
};
|
||||
}
|
||||
|
||||
33
modules/droid/core/hm.nix
Normal file
33
modules/droid/core/hm.nix
Normal file
@@ -0,0 +1,33 @@
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
flake.modules.nixOnDroid.core = {
|
||||
hostName,
|
||||
userName,
|
||||
userEmail,
|
||||
...
|
||||
}: {
|
||||
home-manager = {
|
||||
backupFileExtension = "bak";
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
extraSpecialArgs = {
|
||||
inherit
|
||||
inputs
|
||||
hostName
|
||||
userName
|
||||
userEmail
|
||||
;
|
||||
};
|
||||
|
||||
config = {
|
||||
imports = [
|
||||
config.flake.modules.homeManager.shell
|
||||
config.flake.modules.homeManager.${hostName}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
7
modules/droid/core/nix.nix
Normal file
7
modules/droid/core/nix.nix
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
flake.modules.nixOnDroid.core = {
|
||||
nix.extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
'';
|
||||
};
|
||||
}
|
||||
106
modules/droid/networking/ssh.nix
Normal file
106
modules/droid/networking/ssh.nix
Normal file
@@ -0,0 +1,106 @@
|
||||
{
|
||||
flake.modules.nixOnDroid.networking = {
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
# utility functions
|
||||
concatLines = list: builtins.concatStringsSep "\n" list;
|
||||
|
||||
prefixLines = mapper: list: concatLines (map mapper list);
|
||||
|
||||
# could be put in the config
|
||||
configPath = "ssh/sshd_config";
|
||||
|
||||
keysFolder = "/etc/ssh";
|
||||
|
||||
authorizedKeysFolder = "/etc/ssh/authorized_keys.d";
|
||||
|
||||
supportedKeysTypes = [
|
||||
"rsa"
|
||||
"ed25519"
|
||||
];
|
||||
|
||||
sshd-start-bin = "sshd-start";
|
||||
|
||||
# real config
|
||||
cfg = config.tnix.networking.openssh;
|
||||
|
||||
pathOfKeyOf = type: "${keysFolder}/ssh_host_${type}_key";
|
||||
|
||||
generateKeyOf = type: ''
|
||||
${lib.getExe' pkgs.openssh "ssh-keygen"} \
|
||||
-t "${type}" \
|
||||
-f "${pathOfKeyOf type}" \
|
||||
-N ""
|
||||
'';
|
||||
|
||||
generateKeyWhenNeededOf = type: ''
|
||||
if [ ! -f ${pathOfKeyOf type} ]; then
|
||||
mkdir --parents ${keysFolder}
|
||||
${generateKeyOf type}
|
||||
fi
|
||||
'';
|
||||
|
||||
sshd-start = pkgs.writeScriptBin sshd-start-bin ''
|
||||
#!${pkgs.runtimeShell}
|
||||
${prefixLines generateKeyWhenNeededOf supportedKeysTypes}
|
||||
|
||||
mkdir --parents "${authorizedKeysFolder}"
|
||||
echo "${lib.concatStringsSep "\n" cfg.authorizedKeys}" > ${authorizedKeysFolder}/${config.user.userName}
|
||||
|
||||
echo "Starting sshd in non-daemonized way on port ${lib.concatMapStrings toString cfg.ports}"
|
||||
${lib.getExe' pkgs.openssh "sshd"} \
|
||||
-f "/etc/${configPath}" \
|
||||
-D # don't detach into a daemon process
|
||||
'';
|
||||
in {
|
||||
options.tnix.networking.openssh = {
|
||||
enable = lib.mkEnableOption ''
|
||||
Whether to enable the OpenSSH secure shell daemon, which
|
||||
allows secure remote logins.
|
||||
'';
|
||||
|
||||
ports = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.port;
|
||||
default = [22];
|
||||
description = ''
|
||||
Specifies on which ports the SSH daemon listens.
|
||||
'';
|
||||
};
|
||||
|
||||
authorizedKeys = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [];
|
||||
description = ''
|
||||
Specify a list of public keys to be added to the authorized_keys file.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.etc = {
|
||||
"${configPath}".text = ''
|
||||
${prefixLines (port: "Port ${toString port}") cfg.ports}
|
||||
|
||||
AuthorizedKeysFile ${authorizedKeysFolder}/%u
|
||||
|
||||
LogLevel VERBOSE
|
||||
'';
|
||||
};
|
||||
|
||||
environment.packages = [
|
||||
sshd-start
|
||||
pkgs.openssh
|
||||
];
|
||||
|
||||
build.activationAfter.sshd = ''
|
||||
SERVER_PID=$(${lib.getExe' pkgs.procps "ps"} -a | ${lib.getExe' pkgs.toybox "grep"} sshd || true)
|
||||
if [ -z "$SERVER_PID" ]; then
|
||||
$DRY_RUN_CMD ${lib.getExe sshd-start}
|
||||
fi
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
{inputs, ...}: {
|
||||
imports = [inputs.flake-parts.flakeModules.modules];
|
||||
}
|
||||
|
||||
118
modules/flake/hosts.nix
Normal file
118
modules/flake/hosts.nix
Normal file
@@ -0,0 +1,118 @@
|
||||
{
|
||||
self,
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
mkNixOSHost = hostName: {
|
||||
userName ? "tux",
|
||||
userEmail ? "t@tux.rs",
|
||||
system ? "x86_64-linux",
|
||||
unstable ? true,
|
||||
}: let
|
||||
nixpkgs =
|
||||
if unstable
|
||||
then inputs.nixpkgs
|
||||
else inputs.nixpkgs-stable;
|
||||
in
|
||||
nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit
|
||||
hostName
|
||||
userName
|
||||
userEmail
|
||||
system
|
||||
;
|
||||
};
|
||||
modules = [
|
||||
config.flake.modules.nixos.core
|
||||
config.flake.modules.nixos.${hostName}
|
||||
];
|
||||
};
|
||||
|
||||
mkDroidHost = hostName: {
|
||||
userName ? "nix-on-droid",
|
||||
userEmail ? "t@tux.rs",
|
||||
system ? "aarch64-linux",
|
||||
unstable ? true,
|
||||
}: let
|
||||
nixpkgs =
|
||||
if unstable
|
||||
then inputs.nixpkgs
|
||||
else inputs.nixpkgs-stable;
|
||||
in
|
||||
inputs.nix-on-droid.lib.nixOnDroidConfiguration {
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
joypixels.acceptLicense = true;
|
||||
};
|
||||
overlays = builtins.attrValues inputs.self.overlays;
|
||||
};
|
||||
extraSpecialArgs = {
|
||||
inherit
|
||||
hostName
|
||||
userName
|
||||
userEmail
|
||||
;
|
||||
};
|
||||
modules = [
|
||||
config.flake.modules.nixOnDroid.core
|
||||
config.flake.modules.nixOnDroid.${hostName}
|
||||
];
|
||||
};
|
||||
|
||||
mkNixOSNode = hostName: {system ? "x86_64-linux"}: {
|
||||
hostname = hostName;
|
||||
profiles.system = {
|
||||
user = "root";
|
||||
path = inputs.deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.${hostName};
|
||||
};
|
||||
};
|
||||
|
||||
activateNixOnDroid = system: configuration:
|
||||
inputs.deploy-rs.lib.${system}.activate.custom configuration.activationPackage
|
||||
"${configuration.activationPackage}/activate";
|
||||
|
||||
mkDroidNode = hostName: {system ? "aarch64-linux"}: {
|
||||
hostname = hostName;
|
||||
profiles.system = {
|
||||
sshUser = "nix-on-droid";
|
||||
user = "nix-on-droid";
|
||||
magicRollback = true;
|
||||
sshOpts = [
|
||||
"-p"
|
||||
"8033"
|
||||
];
|
||||
path = activateNixOnDroid system self.nixOnDroidConfigurations.${hostName};
|
||||
};
|
||||
};
|
||||
in {
|
||||
flake = {
|
||||
nixosConfigurations = builtins.mapAttrs mkNixOSHost {
|
||||
sirius = {};
|
||||
canopus = {};
|
||||
arcturus = {};
|
||||
alpha = {};
|
||||
vps = {};
|
||||
};
|
||||
|
||||
nixOnDroidConfigurations = builtins.mapAttrs mkDroidHost {
|
||||
vega = {};
|
||||
};
|
||||
|
||||
deploy.nodes =
|
||||
builtins.mapAttrs (hostName: _: mkNixOSNode hostName {}) self.nixosConfigurations
|
||||
// builtins.mapAttrs (hostName: _: mkDroidNode hostName {}) self.nixOnDroidConfigurations;
|
||||
};
|
||||
|
||||
perSystem = {
|
||||
checks =
|
||||
builtins.mapAttrs (
|
||||
_: hostConfig: hostConfig.config.system.build.toplevel
|
||||
)
|
||||
self.nixosConfigurations;
|
||||
};
|
||||
}
|
||||
@@ -1,20 +1,32 @@
|
||||
{
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
{inputs, ...}: {
|
||||
flake.overlays = {
|
||||
modifications = final: prev: {
|
||||
omasnap = prev.callPackage ../../packages/omasnap.nix {};
|
||||
tnvim = inputs.tnvim.packages.${prev.stdenv.hostPlatform.system}.default;
|
||||
tpanel = inputs.tpanel.packages.${prev.stdenv.hostPlatform.system}.default;
|
||||
tshell = inputs.tshell.packages.${prev.stdenv.hostPlatform.system}.default;
|
||||
trok = inputs.trok.packages.${prev.stdenv.hostPlatform.system}.default;
|
||||
tfolio = inputs.tfolio.packages.${prev.stdenv.hostPlatform.system}.default;
|
||||
cyber-tux = inputs.cyber-tux.packages.${prev.stdenv.hostPlatform.system}.default;
|
||||
ags = inputs.tpanel.packages.${prev.stdenv.hostPlatform.system}.ags.default;
|
||||
wezterm-git = inputs.wezterm-flake.packages.${prev.stdenv.hostPlatform.system}.default;
|
||||
hyprland-git = inputs.hyprland.packages.${prev.stdenv.hostPlatform.system};
|
||||
awww = inputs.awww.packages.${prev.stdenv.hostPlatform.system}.awww;
|
||||
vicinae-extensions = inputs.vicinae-extensions.packages.${prev.stdenv.hostPlatform.system};
|
||||
voxtype = inputs.voxtype.packages.${prev.stdenv.hostPlatform.system};
|
||||
opencode-git = inputs.opencode.packages.${prev.stdenv.hostPlatform.system}.default;
|
||||
nix-index-small =
|
||||
inputs.nix-index-database.packages.${prev.stdenv.hostPlatform.system}.nix-index-with-small-db;
|
||||
|
||||
davinci-resolve = prev.davinci-resolve.override {
|
||||
runCommandLocal = name: env: cmd:
|
||||
if prev.lib.hasSuffix "-src.zip" name
|
||||
then
|
||||
prev.runCommandLocal name (env
|
||||
// {
|
||||
outputHash = "sha256-+3SB32EHpH9/0hM3h8CrO6f7V4ZAmxUFh3P8m6QDeO0=";
|
||||
})
|
||||
cmd
|
||||
else prev.runCommandLocal name env cmd;
|
||||
};
|
||||
};
|
||||
|
||||
stable-packages = final: _prev: {
|
||||
@@ -25,14 +37,18 @@
|
||||
};
|
||||
|
||||
nur = inputs.nur.overlays.default;
|
||||
copyparty = inputs.copyparty.overlays.default;
|
||||
llm-agents = inputs.llm-agents.overlays.shared-nixpkgs;
|
||||
};
|
||||
|
||||
perSystem =
|
||||
{ system, ... }:
|
||||
{
|
||||
_module.args.pkgs = import inputs.nixpkgs {
|
||||
perSystem = {system, ...}: let
|
||||
pkgs = import inputs.nixpkgs {
|
||||
inherit system;
|
||||
overlays = builtins.attrValues inputs.self.overlays;
|
||||
};
|
||||
in {
|
||||
_module.args.pkgs = pkgs;
|
||||
|
||||
packages.omasnap = pkgs.omasnap;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
{inputs, ...}: {
|
||||
imports = [
|
||||
inputs.treefmt-nix.flakeModule
|
||||
];
|
||||
@@ -9,7 +8,7 @@
|
||||
projectRootFile = "flake.nix";
|
||||
flakeCheck = true;
|
||||
programs = {
|
||||
nixfmt.enable = true;
|
||||
alejandra.enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
flake.modules.homeManager.core =
|
||||
{ userName, ... }:
|
||||
{
|
||||
flake.modules.homeManager.core = {userName, ...}: {
|
||||
programs.home-manager.enable = true;
|
||||
systemd.user.startServices = "sd-switch";
|
||||
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
flake.modules.homeManager.core =
|
||||
{
|
||||
{inputs, ...}: {
|
||||
flake.modules.homeManager.core = {
|
||||
lib,
|
||||
osConfig ? {},
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
nixpkgs = lib.mkIf (!(osConfig.home-manager.useGlobalPkgs or false)) {
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
{
|
||||
flake.modules.homeManager.desktop =
|
||||
{
|
||||
flake.modules.homeManager.desktop = {
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
configDir = "${config.xdg.configHome}/BraveSoftware/Brave-Browser";
|
||||
}: let
|
||||
configDir = "${config.xdg.configHome}/BraveSoftware/Brave-Origin";
|
||||
|
||||
extensionJson = ext: {
|
||||
name = "${configDir}/External Extensions/${ext.id}.json";
|
||||
@@ -22,17 +20,18 @@
|
||||
{id = "bfnaelmomeimhlpmgjnjophhpkkoljpa";} # Phantom
|
||||
{id = "eimadpbcbfnmbkopoojfekhnkhdbieeh";} # DarkReader
|
||||
];
|
||||
in
|
||||
{
|
||||
in {
|
||||
programs.chromium = {
|
||||
enable = true;
|
||||
package = pkgs.brave;
|
||||
package = pkgs.brave-origin;
|
||||
commandLineArgs = [
|
||||
"--disable-features=WebRtcAllowInputVolumeAdjustment"
|
||||
"--force-device-scale-factor=1.0"
|
||||
];
|
||||
};
|
||||
|
||||
home.packages = [pkgs.brave];
|
||||
|
||||
home.file = builtins.listToAttrs (map extensionJson extensions);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
{
|
||||
flake.modules.homeManager.desktop =
|
||||
{ inputs, userName, ... }:
|
||||
{
|
||||
flake.modules.homeManager.desktop = {
|
||||
inputs,
|
||||
userName,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
inputs.nixcord.homeModules.nixcord
|
||||
];
|
||||
@@ -18,11 +20,22 @@
|
||||
frameless = true;
|
||||
plugins = {
|
||||
hideMedia.enable = true;
|
||||
anonymiseFileNames.enable = true;
|
||||
copyFileContents.enable = true;
|
||||
noTypingAnimation.enable = true;
|
||||
readAllNotificationsButton.enable = true;
|
||||
silentTyping.enable = true;
|
||||
validUser.enable = true;
|
||||
biggerStreamPreview.enable = true;
|
||||
ignoreActivities = {
|
||||
enable = true;
|
||||
ignorePlaying = true;
|
||||
ignoreWatching = true;
|
||||
};
|
||||
sortFriendRequests = {
|
||||
enable = true;
|
||||
showDates = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
dorion = {
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
{
|
||||
flake.modules.homeManager.desktop =
|
||||
{
|
||||
flake.modules.homeManager.desktop = {
|
||||
pkgs,
|
||||
userName,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
|
||||
|
||||
@@ -13,6 +13,8 @@
|
||||
font-size = 12;
|
||||
font-family = "JetBrainsMono Nerd Font";
|
||||
theme = "poimandres";
|
||||
custom-shader = "shaders/cursor_warp.glsl";
|
||||
custom-shader-animation = "always";
|
||||
};
|
||||
|
||||
themes = {
|
||||
|
||||
@@ -1,17 +1,19 @@
|
||||
{
|
||||
flake.modules.homeManager.desktop =
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
flake.modules.homeManager.desktop = {
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
# TODO: Hyprland 0.55 switched to Lua-based configuration.
|
||||
# Until the Home Manager module is updated, we symlink our config instead.
|
||||
|
||||
# wayland.windowManager.hyprland = {
|
||||
# enable = true;
|
||||
# package = null;
|
||||
# portalPackage = null;
|
||||
# xwayland.enable = true;
|
||||
# systemd.variables = [ "--all" ];
|
||||
# };
|
||||
# HM module is updated but I'm too lazy at this point so we symlink our config instead.
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
package = null;
|
||||
portalPackage = null;
|
||||
xwayland.enable = true;
|
||||
configType = "hyprlang";
|
||||
systemd.variables = ["--all"];
|
||||
};
|
||||
|
||||
home.file = {
|
||||
".config/hypr/config".source =
|
||||
@@ -28,6 +30,7 @@
|
||||
hyprshot
|
||||
wl-clipboard
|
||||
wl-screenrec
|
||||
omasnap
|
||||
(writeShellScriptBin "hypr-screenshot" ''
|
||||
hyprshot -m region -r ppm - | satty --filename -
|
||||
'')
|
||||
|
||||
86
modules/hm/desktop/kitty.nix
Normal file
86
modules/hm/desktop/kitty.nix
Normal file
@@ -0,0 +1,86 @@
|
||||
{
|
||||
flake.modules.homeManager.desktop = {pkgs, ...}: {
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
package = pkgs.kitty;
|
||||
|
||||
font = {
|
||||
name = "JetBrainsMono Nerd Font";
|
||||
size = 12.0;
|
||||
};
|
||||
|
||||
shellIntegration.enableZshIntegration = true;
|
||||
|
||||
settings = {
|
||||
background_opacity = "1.0";
|
||||
|
||||
enable_audio_bell = false;
|
||||
confirm_os_window_close = 0;
|
||||
|
||||
cursor_trail = 3;
|
||||
|
||||
# Window
|
||||
window_padding_width = 10;
|
||||
|
||||
foreground = "#f1f1f1";
|
||||
background = "#0f0f0f";
|
||||
|
||||
# Borders
|
||||
active_border_color = "#3d59a1";
|
||||
inactive_border_color = "#101014";
|
||||
bell_border_color = "#fffac2";
|
||||
|
||||
# Colors
|
||||
color0 = "#0f0f0f";
|
||||
color8 = "#a6accd";
|
||||
|
||||
color1 = "#d0679d";
|
||||
color9 = "#d0679d";
|
||||
|
||||
color2 = "#5de4c7";
|
||||
color10 = "#5de4c7";
|
||||
|
||||
color3 = "#fffac2";
|
||||
color11 = "#fffac2";
|
||||
|
||||
color4 = "#89ddff";
|
||||
color12 = "#add7ff";
|
||||
|
||||
color5 = "#fcc5e9";
|
||||
color13 = "#fae4fc";
|
||||
|
||||
color6 = "#add7ff";
|
||||
color14 = "#89ddff";
|
||||
|
||||
color7 = "#ffffff";
|
||||
color15 = "#ffffff";
|
||||
|
||||
# Cursor
|
||||
cursor = "#ffffff";
|
||||
cursor_text_color = "#0f0f0f";
|
||||
|
||||
# Selection
|
||||
selection_foreground = "none";
|
||||
selection_background = "#28344a";
|
||||
|
||||
# URLs
|
||||
url_color = "#5de4c7";
|
||||
|
||||
# Tab bar
|
||||
tab_bar_edge = "bottom";
|
||||
tab_bar_style = "fade";
|
||||
tab_fade = "1";
|
||||
|
||||
active_tab_foreground = "#3d59a1";
|
||||
active_tab_background = "#16161e";
|
||||
active_tab_font_style = "bold";
|
||||
|
||||
inactive_tab_foreground = "#787c99";
|
||||
inactive_tab_background = "#16161e";
|
||||
inactive_tab_font_style = "bold";
|
||||
|
||||
tab_bar_background = "#101014";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,17 +1,13 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
flake.modules.homeManager.desktop =
|
||||
{
|
||||
{inputs, ...}: {
|
||||
flake.modules.homeManager.desktop = {
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
with lib; let
|
||||
cfg = config.tnix.services.lan-mouse;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [inputs.lan-mouse.homeManagerModules.default];
|
||||
|
||||
options.tnix.services.lan-mouse = {
|
||||
@@ -28,7 +24,6 @@
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
programs.lan-mouse = {
|
||||
enable = true;
|
||||
systemd = true;
|
||||
|
||||
@@ -1,17 +1,13 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
flake.modules.homeManager.desktop =
|
||||
{
|
||||
{inputs, ...}: {
|
||||
flake.modules.homeManager.desktop = {
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
with lib; let
|
||||
cfg = config.tnix.desktop.mangowm;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
inputs.mango.hmModules.mango
|
||||
];
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
{
|
||||
flake.modules.homeManager.desktop =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
flake.modules.homeManager.desktop = {pkgs, ...}: {
|
||||
programs.mpv = {
|
||||
enable = true;
|
||||
|
||||
scripts = (
|
||||
with pkgs.mpvScripts;
|
||||
[
|
||||
with pkgs.mpvScripts; [
|
||||
modernz
|
||||
thumbfast
|
||||
mpris
|
||||
|
||||
77
modules/hm/desktop/serpantinum.nix
Normal file
77
modules/hm/desktop/serpantinum.nix
Normal file
@@ -0,0 +1,77 @@
|
||||
{inputs, ...}: {
|
||||
flake.modules.nixos.desktop = {
|
||||
imports = [
|
||||
inputs.serpantinum.nixosModules.default
|
||||
];
|
||||
|
||||
programs.serpantinum.enable = true;
|
||||
};
|
||||
|
||||
flake.modules.homeManager.desktop = {pkgs, ...}: {
|
||||
imports = [
|
||||
inputs.serpantinum.homeManagerModules.default
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [pulseaudioFull];
|
||||
|
||||
programs.serpantinum = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
|
||||
settings = {
|
||||
wallpaperDir = "/home/tux/Wallpapers";
|
||||
|
||||
general = {
|
||||
language = "en";
|
||||
weatherUnit = "metric";
|
||||
weatherInterval = 30;
|
||||
avatarPath = "/home/tux/Wallpapers/tux.png";
|
||||
muteSfx = true;
|
||||
};
|
||||
|
||||
bar = {
|
||||
position = "top";
|
||||
style = "modular";
|
||||
time = {
|
||||
format = "hh:mm:ss A";
|
||||
};
|
||||
width = 5;
|
||||
workspaceCount = 7;
|
||||
modules = {
|
||||
left = [
|
||||
"left"
|
||||
"workspaces"
|
||||
"sysmon"
|
||||
"wifi"
|
||||
];
|
||||
center = ["vis"];
|
||||
right = [
|
||||
"media"
|
||||
"vol"
|
||||
"bat"
|
||||
"tray"
|
||||
"timedate"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
theme = {
|
||||
fontFamily = "JetBrains Mono SemiBold";
|
||||
borderRadius = 12;
|
||||
matugen = true;
|
||||
};
|
||||
|
||||
notifications = {
|
||||
dnd = false;
|
||||
position = "top right";
|
||||
sound = true;
|
||||
};
|
||||
|
||||
idle = {
|
||||
enabled = true;
|
||||
manualInhibit = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,12 +1,10 @@
|
||||
{
|
||||
flake.modules.homeManager.desktop =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
flake.modules.homeManager.desktop = {pkgs, ...}: {
|
||||
home.pointerCursor = {
|
||||
enable = true;
|
||||
package = pkgs.bibata-cursors;
|
||||
name = "Bibata-Modern-Ice";
|
||||
size = 28;
|
||||
size = 24;
|
||||
};
|
||||
|
||||
qt = {
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
{
|
||||
flake.modules.homeManager.desktop =
|
||||
{
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
flake.modules.homeManager.desktop = {pkgs, ...}: {
|
||||
programs.vicinae = {
|
||||
enable = true;
|
||||
systemd = {
|
||||
@@ -14,20 +9,16 @@
|
||||
useLayerShell = true;
|
||||
|
||||
extensions = with pkgs.vicinae-extensions; [
|
||||
# @TODO broken in upstream repo
|
||||
# bluetooth
|
||||
nix
|
||||
ssh
|
||||
awww-switcher
|
||||
process-manager
|
||||
pulseaudio
|
||||
wifi-commander
|
||||
port-killer
|
||||
silverbullet
|
||||
];
|
||||
|
||||
settings = {
|
||||
close_on_focus_loss = true;
|
||||
close_on_focus_loss = false;
|
||||
consider_preedit = true;
|
||||
pop_to_root_on_close = true;
|
||||
favicon_service = "twenty";
|
||||
|
||||
26
modules/hm/desktop/voxtype.nix
Normal file
26
modules/hm/desktop/voxtype.nix
Normal file
@@ -0,0 +1,26 @@
|
||||
{inputs, ...}: {
|
||||
flake.modules.homeManager.desktop = {pkgs, ...}: {
|
||||
imports = [
|
||||
inputs.voxtype.homeManagerModules.default
|
||||
];
|
||||
|
||||
programs.voxtype = {
|
||||
enable = true;
|
||||
package = pkgs.voxtype.onnx-cuda;
|
||||
engine = "parakeet";
|
||||
model.path = "/home/tux/.local/share/voxtype/models/parakeet-tdt-0.6b-v3";
|
||||
service.enable = true;
|
||||
settings = {
|
||||
hotkey.enabled = false;
|
||||
whisper = {
|
||||
language = "en";
|
||||
on_demand_loading = true;
|
||||
};
|
||||
|
||||
parakeet = {
|
||||
on_demand_loading = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
flake.modules.homeManager.desktop =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
flake.modules.homeManager.desktop = {pkgs, ...}: {
|
||||
programs.wezterm = {
|
||||
enable = true;
|
||||
package = pkgs.wezterm-git;
|
||||
|
||||
@@ -29,6 +29,25 @@
|
||||
diagnostics = false;
|
||||
metrics = false;
|
||||
};
|
||||
|
||||
agent = {
|
||||
dock = "right";
|
||||
favorite_models = [];
|
||||
model_parameters = [];
|
||||
};
|
||||
|
||||
collaboration_panel = {
|
||||
button = false;
|
||||
};
|
||||
|
||||
agent_servers = {
|
||||
opencode = {
|
||||
default_config_options = {
|
||||
model = "opencode-go/deepseek-v4.1-flash";
|
||||
};
|
||||
type = "registry";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
8
modules/hm/gaming/lutris.nix
Normal file
8
modules/hm/gaming/lutris.nix
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
flake.modules.homeManager.desktop = {osConfig, ...}: {
|
||||
programs.lutris = {
|
||||
enable = true;
|
||||
steamPackage = osConfig.programs.steam.package;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,11 +1,9 @@
|
||||
{
|
||||
flake.modules.homeManager.shell =
|
||||
{
|
||||
flake.modules.homeManager.shell = {
|
||||
userName,
|
||||
userEmail,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
signing = {
|
||||
|
||||
7
modules/hm/shell/github.nix
Normal file
7
modules/hm/shell/github.nix
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
flake.modules.homeManager.shell = {
|
||||
programs.gh = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
flake.modules.homeManager.shell =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
flake.modules.homeManager.shell = {pkgs, ...}: {
|
||||
home.packages = with pkgs; [
|
||||
systemctl-tui
|
||||
zip
|
||||
@@ -11,6 +9,78 @@
|
||||
jq
|
||||
dig
|
||||
lsof
|
||||
trok
|
||||
|
||||
(writeShellScriptBin "hm-override" ''
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
usage() {
|
||||
echo "Usage:"
|
||||
echo " $0 <filename> Override symlink"
|
||||
echo " $0 <filename> --restore Restore symlink"
|
||||
echo " $0 <filename> -r Restore symlink"
|
||||
exit 1
|
||||
}
|
||||
|
||||
if [[ $# -lt 1 || $# -gt 2 ]]; then
|
||||
usage
|
||||
fi
|
||||
|
||||
FILE="$1"
|
||||
LINK_BACKUP="''${FILE}.backup-link"
|
||||
|
||||
# Restore
|
||||
if [[ "''${2:-}" == "--restore" || "''${2:-}" == "-r" ]]; then
|
||||
if [[ ! -f "$LINK_BACKUP" ]]; then
|
||||
echo "Error: no backup symlink found: $LINK_BACKUP"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
TARGET="$(cat "$LINK_BACKUP")"
|
||||
|
||||
# Remove the temporary override.
|
||||
rm -f "$FILE"
|
||||
|
||||
# Restore the original symlink.
|
||||
ln -s "$TARGET" "$FILE"
|
||||
|
||||
# Remove the temporary symlink target backup.
|
||||
rm "$LINK_BACKUP"
|
||||
|
||||
echo "Restored: $FILE -> $TARGET"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Override mode
|
||||
if [[ ! -L "$FILE" ]]; then
|
||||
echo "Error: $FILE is not a symlink"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -e "$LINK_BACKUP" ]]; then
|
||||
echo "Error: backup already exists: $LINK_BACKUP"
|
||||
echo "Restore the existing override before running again."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Remember the original symlink target.
|
||||
TARGET="$(readlink "$FILE")"
|
||||
printf '%s\n' "$TARGET" > "$LINK_BACKUP"
|
||||
|
||||
# Copy the contents before removing the symlink.
|
||||
cp "$FILE" "$FILE.tmp"
|
||||
|
||||
# Replace the symlink with a regular writable file.
|
||||
rm "$FILE"
|
||||
mv "$FILE.tmp" "$FILE"
|
||||
|
||||
chmod u+w "$FILE"
|
||||
|
||||
echo "Overridden: $FILE"
|
||||
echo "Original: $FILE -> $TARGET"
|
||||
'')
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
flake.modules.homeManager.shell =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
flake.modules.homeManager.shell = {pkgs, ...}: {
|
||||
home.file = {
|
||||
".config/nvim" = {
|
||||
recursive = true;
|
||||
@@ -14,8 +12,6 @@
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
};
|
||||
|
||||
vim.enable = true;
|
||||
};
|
||||
|
||||
home = {
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
{
|
||||
flake.modules.homeManager.shell = {
|
||||
flake.modules.homeManager.shell = {pkgs, ...}: {
|
||||
programs.opencode = {
|
||||
enable = true;
|
||||
package = pkgs.opencode-git;
|
||||
tui = {
|
||||
theme = "system";
|
||||
};
|
||||
settings = {
|
||||
model = "opencode-go/kimi-k3";
|
||||
model = "opencode-go/deepseek-v4.1-flash";
|
||||
provider = {
|
||||
google = {
|
||||
options = {
|
||||
@@ -23,8 +24,14 @@
|
||||
apiKey = "{file:/run/secrets/opencode-go-api-key}";
|
||||
};
|
||||
};
|
||||
zai-coding-plan = {
|
||||
options = {
|
||||
apiKey = "{file:/run/secrets/zai-coding-plan-api-key}";
|
||||
};
|
||||
};
|
||||
};
|
||||
plugin = ["@dietrichgebert/ponytail"];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,58 +1,47 @@
|
||||
{
|
||||
flake.modules.homeManager.shell =
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
flake.modules.homeManager.shell = {pkgs, ...}: let
|
||||
bg = "default";
|
||||
fg = "default";
|
||||
bg2 = "brightblack";
|
||||
fg2 = "white";
|
||||
color = c: "#{@${c}}";
|
||||
|
||||
indicator =
|
||||
let
|
||||
indicator = let
|
||||
accent = color "indicator_color";
|
||||
content = " ";
|
||||
in
|
||||
"#[reverse,fg=${accent}]#{?client_prefix,${content},}";
|
||||
in "#[reverse,fg=${accent}]#{?client_prefix,${content},}";
|
||||
|
||||
current_window =
|
||||
let
|
||||
current_window = let
|
||||
accent = color "main_accent";
|
||||
index = "#[reverse,fg=${accent},bg=${fg}] #I ";
|
||||
name = "#[fg=${bg2},bg=${fg2}] #W ";
|
||||
# flags = "#{?window_flags,#{window_flags}, }";
|
||||
in
|
||||
"${index}${name}";
|
||||
in "${index}${name}";
|
||||
|
||||
window_status =
|
||||
let
|
||||
window_status = let
|
||||
accent = color "window_color";
|
||||
index = "#[reverse,fg=${accent},bg=${fg}] #I ";
|
||||
name = "#[fg=${bg2},bg=${fg2}] #W ";
|
||||
# flags = "#{?window_flags,#{window_flags}, }";
|
||||
in
|
||||
"${index}${name}";
|
||||
in "${index}${name}";
|
||||
|
||||
battery =
|
||||
let
|
||||
battery = let
|
||||
percentage = pkgs.writeShellScript "percentage" (
|
||||
if pkgs.stdenv.isDarwin then
|
||||
''
|
||||
if pkgs.stdenv.isDarwin
|
||||
then ''
|
||||
echo $(pmset -g batt | grep -o "[0-9]\+%" | tr '%' ' ')
|
||||
''
|
||||
else
|
||||
''
|
||||
else ''
|
||||
path="/org/freedesktop/UPower/devices/DisplayDevice"
|
||||
echo $(${pkgs.upower}/bin/upower -i $path | grep -o "[0-9]\+%" | tr '%' ' ')
|
||||
''
|
||||
);
|
||||
state = pkgs.writeShellScript "state" (
|
||||
if pkgs.stdenv.isDarwin then
|
||||
''
|
||||
if pkgs.stdenv.isDarwin
|
||||
then ''
|
||||
echo $(pmset -g batt | awk '{print $4}')
|
||||
''
|
||||
else
|
||||
''
|
||||
else ''
|
||||
path="/org/freedesktop/UPower/devices/DisplayDevice"
|
||||
echo $(${pkgs.upower}/bin/upower -i $path | grep state | awk '{print $2}')
|
||||
''
|
||||
@@ -77,31 +66,25 @@
|
||||
elif [ $percentage -ge 0 ]; then echo "red"
|
||||
fi
|
||||
'';
|
||||
in
|
||||
"#[fg=#(${color})]#(${icon}) #[fg=${fg}]#(${percentage})%";
|
||||
in "#[fg=#(${color})]#(${icon}) #[fg=${fg}]#(${percentage})%";
|
||||
|
||||
pwd =
|
||||
let
|
||||
pwd = let
|
||||
accent = color "main_accent";
|
||||
icon = "#[fg=${accent}] ";
|
||||
format = "#[fg=${fg}]#{b:pane_current_path}";
|
||||
in
|
||||
"${icon}${format}";
|
||||
in "${icon}${format}";
|
||||
|
||||
git =
|
||||
let
|
||||
git = let
|
||||
icon = pkgs.writeShellScript "branch" ''
|
||||
git -C "$1" branch && echo " "
|
||||
'';
|
||||
branch = pkgs.writeShellScript "branch" ''
|
||||
git -C "$1" rev-parse --abbrev-ref HEAD
|
||||
'';
|
||||
in
|
||||
"#[fg=magenta]#(${icon} #{pane_current_path})#(${branch} #{pane_current_path})";
|
||||
in "#[fg=magenta]#(${icon} #{pane_current_path})#(${branch} #{pane_current_path})";
|
||||
|
||||
separator = "#[fg=${fg}]|";
|
||||
in
|
||||
{
|
||||
in {
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
baseIndex = 1;
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
flake.modules.homeManager.shell =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
{lib, ...}: {
|
||||
flake.modules.homeManager.shell = {pkgs, ...}: {
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
history = {
|
||||
@@ -21,6 +18,10 @@
|
||||
bindkey "^A" vi-beginning-of-line
|
||||
bindkey "^E" vi-end-of-line
|
||||
bindkey '^R' fzf-history-widget
|
||||
|
||||
PATH=$PATH:~/.cargo/bin:~/.local/bin
|
||||
alias stui='systemctl-tui'
|
||||
alias vim='nvim --clean'
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,17 +1,23 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
flake.modules.nixos.alpha =
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
flake.modules.nixos.alpha = {
|
||||
hostName,
|
||||
userName,
|
||||
...
|
||||
}@innerArgs:
|
||||
{
|
||||
imports = with config.flake.modules.nixos; [
|
||||
} @ innerArgs: {
|
||||
imports = with config.flake.modules.nixos;
|
||||
[
|
||||
boot
|
||||
networking
|
||||
virtualisation
|
||||
services
|
||||
]
|
||||
++ [
|
||||
inputs.trok.nixosModules.default
|
||||
inputs.tfolio.nixosModules.default
|
||||
];
|
||||
|
||||
tnix = {
|
||||
@@ -34,18 +40,18 @@
|
||||
};
|
||||
|
||||
networking = {
|
||||
openssh.enable = true;
|
||||
openssh = {
|
||||
enable = true;
|
||||
ports = [
|
||||
23
|
||||
];
|
||||
};
|
||||
netbird-client.enable = true;
|
||||
};
|
||||
|
||||
services = {
|
||||
nginx = {
|
||||
enable = true;
|
||||
domain = "lab.tux.rs";
|
||||
};
|
||||
|
||||
pangolin = {
|
||||
enable = false;
|
||||
enable = true;
|
||||
domain = "pangolin.lab.tux.rs";
|
||||
baseDomain = "lab.tux.rs";
|
||||
environmentFile = innerArgs.config.sops.secrets."pangolin".path;
|
||||
@@ -53,21 +59,17 @@
|
||||
|
||||
uptime-kuma = {
|
||||
enable = true;
|
||||
port = 1111;
|
||||
domain = "status.lab.tux.rs";
|
||||
};
|
||||
|
||||
vaultwarden = {
|
||||
enable = true;
|
||||
port = 9999;
|
||||
domain = "bw.lab.tux.rs";
|
||||
};
|
||||
|
||||
mediaflow-proxy = {
|
||||
enable = true;
|
||||
port = 8888;
|
||||
environmentFile = innerArgs.config.sops.secrets."mediaflow-proxy".path;
|
||||
};
|
||||
|
||||
trok = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
virtualisation = {
|
||||
@@ -96,6 +98,11 @@
|
||||
owner = userName;
|
||||
};
|
||||
|
||||
zai-coding-plan-api-key = {
|
||||
sopsFile = ./secrets.yaml;
|
||||
owner = userName;
|
||||
};
|
||||
|
||||
netbird-key = {
|
||||
sopsFile = ./secrets.yaml;
|
||||
owner = userName;
|
||||
@@ -129,6 +136,8 @@
|
||||
firewall.enable = false;
|
||||
};
|
||||
|
||||
services.tfolio.enable = true;
|
||||
|
||||
system.stateVersion = "26.05";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
hostName = "alpha";
|
||||
userName = "tux";
|
||||
userEmail = "t@tux.rs";
|
||||
system = "x86_64-linux";
|
||||
unstable = true;
|
||||
nixpkgs = if unstable then inputs.nixpkgs else inputs.nixpkgs-stable;
|
||||
in
|
||||
{
|
||||
flake.nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit
|
||||
hostName
|
||||
userName
|
||||
userEmail
|
||||
system
|
||||
;
|
||||
};
|
||||
modules = [
|
||||
config.flake.modules.nixos.core
|
||||
config.flake.modules.nixos.${hostName}
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,12 +1,12 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
flake.modules.nixos.alpha =
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
{inputs, ...}: {
|
||||
flake.modules.nixos.alpha = {
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
hasOptinPersistence = config.tnix.boot.impermanence.enable;
|
||||
isLegacy = config.tnix.boot.legacy.enable;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
inputs.disko.nixosModules.disko
|
||||
];
|
||||
@@ -16,7 +16,8 @@
|
||||
type = "disk";
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
partitions =
|
||||
{
|
||||
ESP = {
|
||||
size = "1G";
|
||||
type = "EF00";
|
||||
@@ -36,7 +37,8 @@
|
||||
content = {
|
||||
type = "btrfs";
|
||||
# Base subvolumes that always exist
|
||||
subvolumes = {
|
||||
subvolumes =
|
||||
{
|
||||
"/root" = {
|
||||
mountOptions = [
|
||||
"compress=zstd"
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
{
|
||||
flake.modules.nixos.alpha =
|
||||
{
|
||||
flake.modules.nixos.alpha = {
|
||||
lib,
|
||||
modulesPath,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
{ ... }:
|
||||
{
|
||||
flake.modules.homeManager.alpha = {
|
||||
home.stateVersion = "26.05";
|
||||
|
||||
@@ -2,6 +2,7 @@ tux-password: ENC[AES256_GCM,data:tvx3nMoIuQSotxHDWLs7UesnyWY3u3EwkqAIzCw3Z2AJse
|
||||
gemini-api-key: ENC[AES256_GCM,data:Bo3Z5Jhce0UOBn77I2AcrXYbBgPLDx0eOjPC8J63E/VWNhMPbbxb,iv:iWOsTACOMcK3oqq848WnJ5Ku3tYy1aadmLB4IMgoyqg=,tag:BPzlXoP8/iJaj8c/YFCWyg==,type:str]
|
||||
openrouter-api-key: ENC[AES256_GCM,data:D+/ImUTg7UvBTh0fMlWMZ0O/GsQS/R4Hz+CO4l42R6mn+zk+udvw79BctXdWWyrFf2ZNOTJ/99QTtWOUOvHISWaEJogXyb+93g==,iv:c7OtgBu1Zaf7lA4InIsKOAPbAvTl3gaO7QGCFNx21Bo=,tag:KXiASj/qC1YzK6DUox57ug==,type:str]
|
||||
opencode-go-api-key: ENC[AES256_GCM,data:ipKkNcRqBERIQ6f6yFzVm999s+UwJys4elHWhzpL441RfOaG9MmRWMcD+wRLJ7DSWFjYu6uUPF7TKez8J6abWeKDgg==,iv:FDSYE3R8zKVxWiP2S/sCVcwEu3fEXg/hCeqCRSF+c6g=,tag:5RDuMFGMoN6xwAYj0HiyjQ==,type:str]
|
||||
zai-coding-plan-api-key: ENC[AES256_GCM,data:HrNfR+Ux/Iyt4qkD1uXzDFQb+l0ltMMrbRahEG3pofFbw98VXfRFbhspcxh9vEyqkw==,iv:lzkLxPV7Q38dn0IEgtchVMrvnVBz4e5q282704x/hmU=,tag:IKzE6Tp6D93nJHoEvCPGBQ==,type:str]
|
||||
netbird-key: ENC[AES256_GCM,data:NilfyafnGhFVYD6q4+jJQxlhXNdNC8BQ1CZfu8a5wc693Y1h,iv:Rpl0OpkQdBMPpIJ08t9Z0AjDAW6c97pFZKO1KPu8ipY=,tag:du3d0SQWuqJtJSwhSgJE4g==,type:str]
|
||||
cloudflare-credentials:
|
||||
email: ENC[AES256_GCM,data:K9L6H4dqNNgbCFg=,iv:jirDJb+Y2sXrup6/doRmOdd8tV7zLnttcgG75r4Fs04=,tag:XeyMVC+Q9TEuTxSfOeR2Uw==,type:str]
|
||||
@@ -29,7 +30,7 @@ sops:
|
||||
4TkObqH8ddGpbd7cX5a/wboTjYuEdAviWxjK2oBPgtcFc1f03X3tmA==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
recipient: age1mzxxxzhy3us3rd960ufqv7vlxj5cnug86md6x69llg9ujzw2pqws057llf
|
||||
lastmodified: "2026-08-07T20:02:00Z"
|
||||
mac: ENC[AES256_GCM,data:VrA2OPCcVvAzYjZTkHPxytclISP24P1FqiIQjSGQItkMLieom80N6933hB0Tdn3BM6600bHt2NweSqHjGx//pn2Gbur4pxeN3TpF9tKXc12IcAThUL9g48fMbk5y+kWWVUF1Pezod0YnzWAlalUXFqvKinfm4RqPNjDjndA/dcI=,iv:xfs9XD5ZIQ6dyMMZ8OE5FEs/hrSr/T2VwC7XvZ7xC2A=,tag:jYWo2kgwwltKB+njiYaPkQ==,type:str]
|
||||
lastmodified: "2026-09-16T14:21:00Z"
|
||||
mac: ENC[AES256_GCM,data:Aqg1cboHKW5QrJooVIqgbHTFg9EpTEnfCv/RRSp0efzyXvDrR7eG5WTvJPE9IbrmS190yvOlT0fw1Bhzyr8kiyoO71sbyUessw5IMUGcLP+m2FNtt8osc7fSTGseojv3MXBndOMDEOpT+Clv6hbv/rr5eGbb05oK6rW97/pDDfU=,iv:s/9PAHHQ0mHQJosKGclSnumHqm6CG3fDVKD5eT4Q1Y0=,tag:3pgycAwYUz9aEOy4/aW30Q==,type:str]
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.13.3
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
flake.modules.nixos.arcturus =
|
||||
{
|
||||
{config, ...}: {
|
||||
flake.modules.nixos.arcturus = {
|
||||
pkgs,
|
||||
hostName,
|
||||
userName,
|
||||
...
|
||||
}@innerArgs:
|
||||
{
|
||||
} @ innerArgs: {
|
||||
imports = with config.flake.modules.nixos; [
|
||||
boot
|
||||
networking
|
||||
@@ -24,7 +22,10 @@
|
||||
home = {
|
||||
directories = [
|
||||
"Distrobox"
|
||||
".bun"
|
||||
".rustup"
|
||||
".config/sops"
|
||||
".config/nix"
|
||||
".local/share/nvim"
|
||||
".local/share/opencode"
|
||||
".local/share/zsh"
|
||||
@@ -43,16 +44,49 @@
|
||||
openssh.enable = true;
|
||||
netbird-client.enable = true;
|
||||
newt = {
|
||||
enable = false;
|
||||
enable = true;
|
||||
environmentFile = innerArgs.config.sops.secrets.newt.path;
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
hermes-agent = {
|
||||
enable = true;
|
||||
environmentFiles = [innerArgs.config.sops.secrets.hermes.path];
|
||||
};
|
||||
|
||||
cyber-tux = {
|
||||
enable = true;
|
||||
environmentFile = innerArgs.config.sops.secrets.discord-token.path;
|
||||
};
|
||||
|
||||
vaultwarden = {
|
||||
enable = true;
|
||||
domain = "bw.lab.tux.rs";
|
||||
configurePangolin = true;
|
||||
};
|
||||
|
||||
copyparty = {
|
||||
enable = true;
|
||||
domain = "files.lab.tux.rs";
|
||||
accounts.${userName}.passwordFile = innerArgs.config.sops.secrets.copyparty.path;
|
||||
volumes = {
|
||||
"/" = {
|
||||
path = "/var/lib/copyparty/data";
|
||||
access = {
|
||||
r = "*";
|
||||
rwmdgGha = [userName];
|
||||
};
|
||||
};
|
||||
};
|
||||
configurePangolin = true;
|
||||
};
|
||||
|
||||
coder = {
|
||||
enable = true;
|
||||
domain = "coder.lab.tux.rs";
|
||||
configurePangolin = true;
|
||||
};
|
||||
};
|
||||
|
||||
virtualisation = {
|
||||
@@ -86,6 +120,11 @@
|
||||
owner = userName;
|
||||
};
|
||||
|
||||
zai-coding-plan-api-key = {
|
||||
sopsFile = ./secrets.yaml;
|
||||
owner = userName;
|
||||
};
|
||||
|
||||
netbird-key = {
|
||||
sopsFile = ./secrets.yaml;
|
||||
owner = userName;
|
||||
@@ -95,6 +134,15 @@
|
||||
sopsFile = ./secrets.yaml;
|
||||
owner = userName;
|
||||
};
|
||||
|
||||
copyparty = {
|
||||
sopsFile = ./secrets.yaml;
|
||||
owner = innerArgs.config.services.copyparty.user;
|
||||
};
|
||||
|
||||
hermes = {
|
||||
sopsFile = ./secrets.yaml;
|
||||
};
|
||||
};
|
||||
|
||||
# --- Networking ---
|
||||
@@ -118,6 +166,10 @@
|
||||
firewall.enable = false;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
impala
|
||||
];
|
||||
|
||||
system.stateVersion = "26.05";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
hostName = "arcturus";
|
||||
userName = "tux";
|
||||
userEmail = "t@tux.rs";
|
||||
system = "x86_64-linux";
|
||||
unstable = true;
|
||||
nixpkgs = if unstable then inputs.nixpkgs else inputs.nixpkgs-stable;
|
||||
in
|
||||
{
|
||||
flake.nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit
|
||||
hostName
|
||||
userName
|
||||
userEmail
|
||||
system
|
||||
;
|
||||
};
|
||||
modules = [
|
||||
config.flake.modules.nixos.core
|
||||
config.flake.modules.nixos.${hostName}
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
flake.modules.nixos.arcturus =
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
{inputs, ...}: {
|
||||
flake.modules.nixos.arcturus = {
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
hasOptinPersistence = config.tnix.boot.impermanence.enable;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
inputs.disko.nixosModules.disko
|
||||
];
|
||||
@@ -35,7 +35,8 @@
|
||||
content = {
|
||||
type = "btrfs";
|
||||
# Base subvolumes that always exist
|
||||
subvolumes = {
|
||||
subvolumes =
|
||||
{
|
||||
"/root" = {
|
||||
mountOptions = [
|
||||
"compress=zstd"
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
flake.modules.nixos.arcturus =
|
||||
{
|
||||
{config, ...}: {
|
||||
flake.modules.nixos.arcturus = {
|
||||
lib,
|
||||
pkgs,
|
||||
system,
|
||||
...
|
||||
}@innerArgs:
|
||||
{
|
||||
} @ innerArgs: {
|
||||
imports = with config.flake.modules.nixos; [
|
||||
hardware
|
||||
];
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
{ ... }:
|
||||
{
|
||||
flake.modules.homeManager.arcturus = {
|
||||
home.stateVersion = "26.05";
|
||||
|
||||
@@ -3,8 +3,11 @@ discord-token: ENC[AES256_GCM,data:uzxkrNRRplL/1MfvPZ/EL+I8UACuZQBHZ95BSHuxW0nBj
|
||||
gemini-api-key: ENC[AES256_GCM,data:gLZSoYTdKY+rwIpYiXvN9n9PGkUD6q8Oe7dHnYkjEjwDf5qpjubg,iv:ySoNgQWTu9DjvbashF4ulyYP8fJUl4yrCTeBQ0jrGmw=,tag:FctubsQv50AP78JvTb9bpQ==,type:str]
|
||||
openrouter-api-key: ENC[AES256_GCM,data:6xONCl9lqOoO7b4CEyCz9607tICDUAkpglRjGS5nYq2ppg2UKqYTrWD1BGCA5Xfs/CWskniVhoNG3vscjKiYCCh9gbM6aqdmTQ==,iv:7Iwc9t00HOOBjA7URXcUO41badqYyJCkFHM/uPkLFxY=,tag:Cl39kitr2e0//HVwAdsdUQ==,type:str]
|
||||
opencode-go-api-key: ENC[AES256_GCM,data:dmeRKn7TWHnqvpyPQpcEG6yHTb2bRby/rh10ytL0jHj5R+lRmNVdmqUF92GTznY9vEaB6ZYCJecWhpm8g4upNfOWBg==,iv:9UMJpAlD8gpcNiN+liu3nawoAZQKapEg7sCp561N9E8=,tag:OZlASpOa5BQaQwFWjoLCRw==,type:str]
|
||||
zai-coding-plan-api-key: ENC[AES256_GCM,data:lLegmS/RIo7JoBoAyVdcS++rXS8W62cwz+zVsv4dPnlfjGFO/nVlI5InqC34sPxLRQ==,iv:BRC7eYVmdZuWwb+2k2FrnlJih63HXrcvhVp/K5t5td8=,tag:aP8x+Xcnkz2t0hn7erCkKw==,type:str]
|
||||
netbird-key: ENC[AES256_GCM,data:q6eKisca04qn/CvALrvXF79MsToDhvLRLv2JTiUBAZglCC9m,iv:jj0/ZD7IDgopprTVUgSfJmdAJmUP3iqewU3dqssGYbk=,tag:6IPRdCm2FGdlTEIX7jt3qA==,type:str]
|
||||
newt: ENC[AES256_GCM,data:Agv3ljcUhld+e+YpRNsOXuQPq5uyZWQ+S6epUH044CIlvrC3DMFskOFVPnDco9P5y0pBnL5m9rltlRiQtMP4RNMzYFz5yR/weskmvZkt3dtZ2sdyaK36p6PTsQDOLl3l8rCDoFxaGRHBz3gD5Gyz9lS5GmLcZql6xg/VIAMdwv36/g0=,iv:NrsrTVJ+ycjEU1/nPigCXGUoIZqheEf+WqYhVqVsuJ0=,tag:0UqLf5ZdVCoQrhKDq4EgPw==,type:str]
|
||||
copyparty: ENC[AES256_GCM,data:QXt8IgTekg9rzFyuzpg=,iv:vJYfHqCiheq290K9TGACHNHyOWzIn60j1Kz502SE27w=,tag:ECt7Wavlqw1V6zgXiRZtUg==,type:str]
|
||||
newt: ENC[AES256_GCM,data:r5Rd81ZrzrIYbXtFkypbJltoGCOYrW6P4IpwGCtaH7lqCg7wD/WMboMx13HN4Mm0J4qbBpDakpfVv9qUTrisYP1xwpKkmY1kqPlFWRZN8hzuuNS2Tv3qUjavTp5XGotVPLHj1Cg/cwGcf8EAssYTwTy7H0PgdQKwqigQD1f1s/j4iXQ=,iv:1xP38/Ayt1xvn2fJGa5zgOrVNOw2J5taG1Orx6uNgZI=,tag:H9JXu9gzyyvTPWgXaoTsiw==,type:str]
|
||||
hermes: ENC[AES256_GCM,data:9A2T2LIeVGo805k5E8wPHmqfjqQ6Dp7srQrVXHLsJRk+9N9bo2pMZUvAZm9FI89zPyK7tMnmLd56Jwf+W+mmQqbupnmN66jxOxOaB0MQ9/6/1oNHvaii337ed6fviLy6hx24pEOpY3OXwSEdNftwJqzc7YXLZK3UX8thhDDdxd0TSj3VUBd0ZHDWd4NpsgtjRRyVDBjHsnF0vzSZXtomithnHqeVHpp/jWPc+ZGrpnVvU8wxNMGLlDtr4A==,iv:dYCaTygVp1hqunPmBcNaYr7JxrdxfH1pcBE6B5HMgzk=,tag:/fddnR3n6+erzWF+m/bgGQ==,type:str]
|
||||
sops:
|
||||
age:
|
||||
- enc: |
|
||||
@@ -25,7 +28,7 @@ sops:
|
||||
TLKEYsPQgOJ7s8P9gw2uPUY6HRz86CtiC6EbO27u0+8BbI85x1QScg==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
recipient: age1huqa3hc7wcxk4dpelrzny437nzrx4fnll3d8g9ahznzk268yju5qufapxy
|
||||
lastmodified: "2026-08-08T11:57:44Z"
|
||||
mac: ENC[AES256_GCM,data:0BYRw78P4Q0x/Wm5XmT1Jg3o/njic4qmaCFrZ+Egz34TL42zLCjax7TvVrJ/Rzb6UqGgeQb0Nca+JOHjOqs5J+J3SqnTpWnQa51LBu3naPwMphPhGrXgmvzHIFNlTXmljxjGo7tHt8hWHtHy6SgAOuep4tP7vgV/XeY91HGQyXc=,iv:mEbJ8OZ+uaTjhG4tsrHtPjQ6N6UDo7yAJAA7JMdO/r8=,tag:JE2aqSv4hJT4hpWZiyu9/g==,type:str]
|
||||
lastmodified: "2026-09-16T14:20:26Z"
|
||||
mac: ENC[AES256_GCM,data:I33KZL3u+7jfOFu0qn4LVx2nACiURSd6RcEn0ojfT62yC/TcXlGGu4QeN1Dx4Nta77n/h8RzDTcZtiUJylLhiVBmqyMOoNaBOmLDJ+P1L7weYLoWMoaDP7IWyzttGkNTgvyv2nW5IxbdcTZwrcSlPtdupsJeNy76ATHO+eUsvGQ=,iv:FvQKGH5Vzm36huGDnMr15wQL9vsH2hsAhvu0BE/NfEI=,tag:fzAzzgmv3vjWs1VYhh4GeA==,type:str]
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.13.3
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
flake.modules.nixos.canopus =
|
||||
{
|
||||
{config, ...}: {
|
||||
flake.modules.nixos.canopus = {
|
||||
pkgs,
|
||||
hostName,
|
||||
userName,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = with config.flake.modules.nixos; [
|
||||
boot
|
||||
networking
|
||||
@@ -27,28 +24,46 @@
|
||||
directories = [
|
||||
"Distrobox"
|
||||
".steam"
|
||||
".bun"
|
||||
".rustup"
|
||||
".cache/awww"
|
||||
".cache/serpantinum"
|
||||
".config/BraveSoftware"
|
||||
".config/zed"
|
||||
".config/Vencord"
|
||||
".config/vesktop"
|
||||
".config/sops"
|
||||
".config/nix"
|
||||
".config/coderv2"
|
||||
".config/obs-studio"
|
||||
".config/easyeffects"
|
||||
".config/DankMaterialShell"
|
||||
".local/share/Steam"
|
||||
".local/share/lutris"
|
||||
".local/share/net.lutris.Lutris"
|
||||
".local/share/nvim"
|
||||
".local/share/opencode"
|
||||
".local/share/zsh"
|
||||
".local/share/zoxide"
|
||||
".local/share/voxtype"
|
||||
".local/state/lazygit"
|
||||
".local/share/vicinae"
|
||||
".local/share/TelegramDesktop"
|
||||
".local/share/GalaxyBudsClient"
|
||||
".local/state/serpantinum"
|
||||
".local/share/zed"
|
||||
|
||||
".claude"
|
||||
".orca"
|
||||
".config/orca"
|
||||
".zcode"
|
||||
".config/ZCode"
|
||||
];
|
||||
|
||||
files = [
|
||||
".wakatime.cfg"
|
||||
".claude.json"
|
||||
".config/gh/hosts.yml"
|
||||
];
|
||||
};
|
||||
};
|
||||
@@ -66,6 +81,8 @@
|
||||
waydroid.enable = true;
|
||||
distrobox.enable = true;
|
||||
};
|
||||
|
||||
programs.nix-ld.enable = true;
|
||||
};
|
||||
|
||||
sops.secrets = {
|
||||
@@ -89,6 +106,11 @@
|
||||
owner = userName;
|
||||
};
|
||||
|
||||
zai-coding-plan-api-key = {
|
||||
sopsFile = ./secrets.yaml;
|
||||
owner = userName;
|
||||
};
|
||||
|
||||
netbird-key = {
|
||||
sopsFile = ./secrets.yaml;
|
||||
owner = userName;
|
||||
@@ -125,6 +147,11 @@
|
||||
davinci-resolve
|
||||
telegram-desktop
|
||||
galaxy-buds-client
|
||||
impala
|
||||
llm-agents.claude-code
|
||||
llm-agents.orca
|
||||
llm-agents.zcode
|
||||
coder
|
||||
];
|
||||
|
||||
# !!! DO NOT CHANGE THIS !!!
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
hostName = "canopus";
|
||||
userName = "tux";
|
||||
userEmail = "t@tux.rs";
|
||||
system = "x86_64-linux";
|
||||
unstable = true;
|
||||
nixpkgs = if unstable then inputs.nixpkgs else inputs.nixpkgs-stable;
|
||||
in
|
||||
{
|
||||
flake.nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit
|
||||
hostName
|
||||
userName
|
||||
userEmail
|
||||
system
|
||||
;
|
||||
};
|
||||
modules = [
|
||||
config.flake.modules.nixos.core
|
||||
config.flake.modules.nixos.${hostName}
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
flake.modules.nixos.canopus =
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
{inputs, ...}: {
|
||||
flake.modules.nixos.canopus = {
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
hasOptinPersistence = config.tnix.boot.impermanence.enable;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
inputs.disko.nixosModules.disko
|
||||
];
|
||||
@@ -43,7 +43,8 @@
|
||||
content = {
|
||||
type = "btrfs";
|
||||
# Base subvolumes that always exist
|
||||
subvolumes = {
|
||||
subvolumes =
|
||||
{
|
||||
"/root" = {
|
||||
mountOptions = [
|
||||
"compress=zstd"
|
||||
|
||||
@@ -1,19 +1,22 @@
|
||||
{ inputs, config, ... }:
|
||||
{
|
||||
flake.modules.nixos.canopus =
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
flake.modules.nixos.canopus = {
|
||||
lib,
|
||||
pkgs,
|
||||
system,
|
||||
...
|
||||
}@innerArgs:
|
||||
{
|
||||
imports =
|
||||
with config.flake.modules.nixos;
|
||||
} @ innerArgs: {
|
||||
imports = with config.flake.modules.nixos;
|
||||
[
|
||||
hardware
|
||||
]
|
||||
++ [ inputs.nixos-hardware.nixosModules.asus-zephyrus-ga503 ];
|
||||
++ [
|
||||
inputs.nixos-hardware.nixosModules.asus-zephyrus-ga503
|
||||
inputs.cardwire.nixosModules.default
|
||||
];
|
||||
|
||||
boot.kernelParams = ["nvidia-drm.modeset=1"];
|
||||
boot.initrd.availableKernelModules = [
|
||||
@@ -43,16 +46,13 @@
|
||||
power-profiles-daemon.enable = true;
|
||||
upower.enable = true;
|
||||
|
||||
supergfxd = {
|
||||
cardwire = {
|
||||
enable = true;
|
||||
settings = {
|
||||
mode = "Hybrid";
|
||||
vfio_enable = false;
|
||||
vfio_save = false;
|
||||
always_reboot = false;
|
||||
no_logind = false;
|
||||
logout_timeout_s = 180;
|
||||
hotplug_type = "None";
|
||||
auto_apply_gpu_state = true;
|
||||
experimental_nvidia_block = true;
|
||||
battery_auto_switch = true;
|
||||
battery_auto_switch_mode = "hybrid";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
{config, ...}: {
|
||||
flake.modules.homeManager.canopus = {pkgs, ...}: {
|
||||
imports = with config.flake.modules.homeManager; [
|
||||
desktop
|
||||
@@ -27,8 +26,7 @@
|
||||
enable = true;
|
||||
settings = {
|
||||
authorized_fingerprints = {
|
||||
"f4:4b:17:61:f7:01:a4:a2:e1:c7:8c:1c:7a:f3:8b:87:14:3d:05:3d:a0:8b:cc:e7:88:d8:d8:d2:a4:c2:75:8b" =
|
||||
"sirius";
|
||||
"f4:4b:17:61:f7:01:a4:a2:e1:c7:8c:1c:7a:f3:8b:87:14:3d:05:3d:a0:8b:cc:e7:88:d8:d8:d2:a4:c2:75:8b" = "sirius";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -2,12 +2,12 @@ tux-password: ENC[AES256_GCM,data:Xb4/JMAZCBnBheDCJdRRGXLnMJ1ej8HbN+AUqA/+2sdYES
|
||||
gemini-api-key: ENC[AES256_GCM,data:Q6+actg0oyUWiUJVy/9yZmea1QyGu2o8LfMsuAVFD6k7kp0dYIrl,iv:ukyouqrHxzVpBBE98KL6PW8P3j+seemm/e0Gl1urUcM=,tag:Z7MM3dJ414CmdxE72cdzNA==,type:str]
|
||||
openrouter-api-key: ENC[AES256_GCM,data:SalhWKR6artX/kOVKZGpKSmrgsQDU/heshrdkK3wotOZ3BRn/ZqZRBldvl1JPSenMAMvE2LWUdmBQmwG/id7L7JL1O/+lUHIQw==,iv:hLlHayFJgUkWOirVLfqP0pGRBZAqGKe+EE2yG1ELGNk=,tag:0qoo0tb+xWjjQXr4n1qGmw==,type:str]
|
||||
opencode-go-api-key: ENC[AES256_GCM,data:zbeTcaXJZFVfYnM/7sgblJFU9WfeosX/44KsXvrzKwiLPfGLLYYo9AFaCvWzzG6jHuSZC5OYrBWfOZv4+3omfCgglQ==,iv:LscUQE+PNhXGim9PSqc9nZIZichWSgAn/zsNxQ/HM/o=,tag:MaBCobnRM42fopiibibe5Q==,type:str]
|
||||
zai-coding-plan-api-key: ENC[AES256_GCM,data:osUoFOvBgu+PtNiTIDIm3JoxsBJnQ9I8zY//9oeTpJxIvMctSWYnT4GYP4oI5mClZg==,iv:z5qxUPomGF1avLyk8PrAS3t+34ZGlQMRjbxVJ4JH9Cc=,tag:Qbz/LYAMXejXU4RS3RUPqA==,type:str]
|
||||
netbird-key: ENC[AES256_GCM,data:swmaa+RjxeUmEl8hS2riGrW4lP5jdks9HM3x57/FLpOuqFtR,iv:MrpVjiocrPi+dBGPk7pwgSUNlJ1eryRpMjC8+jkU+T0=,tag:j6sqpQ02apqc6FwkdDvk9g==,type:str]
|
||||
vicinae-json: ENC[AES256_GCM,data:FarBf6l8pl3hF7kGKPIWztUhwiKoQXmyTufCuJ120K/bPh1Bfiyi+ETt4DLYOGI6FJXfpVz4BbZOA29bXTLhVPxH0QtyBu/F5uEqA015b/c8VevDJSyy9huR13qO9ksLbMBt8RfWbAd9j26t7A1C8/mMyiJOEXCCTV9CEIW3xWrsYmhwsT8RYM+PwrPSeN1gQXHSMyRUjf/kOdJoda8+iXpLfjo4II4r2ELpbqi8QxhrRdsJsoOfAymFM784NtlTjE+h6S4TMehmoF/9ARif6I5SGQ0WfIKt/8orTGCPllL+NupLziSnpIGRGSybdArD+o5NCw59GOAbVRADxq8rCESwEkq3cF+hm8HabfYbiQ==,iv:Y/hXLFTJT3gNF3B6tgKoAh7njVuneoUzjVTlsCZiySw=,tag:2hfrwph6IccJdRu/yGu3XA==,type:str]
|
||||
sops:
|
||||
age:
|
||||
- recipient: age14vktfes95f33vuefwnmuvryas7az04u76dsgyhfvsx73czkvmp2q7njkl4
|
||||
enc: |
|
||||
- enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqS2RZdVJaNTlRamZPMkll
|
||||
MDRVSVl1b2x2LzZpdlBrdmZtdyt3UE15RldRCldXUXE2a1BFeHg5NGNPbW5IMDht
|
||||
@@ -15,8 +15,8 @@ sops:
|
||||
bThQTFdZU29ISm93TWcwVk5ZTkhRWm8KCcprmLGhahgDkXCBpzjctHgao+gc+rKC
|
||||
xLIwheUyFJOGK+ixqcdoZ/PC0kY68hVLt1YzLAyxFi4Ur1wltPrNug==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age1x36yr8h993srfj29sfpzt4wyz52nztvncpmhgmfs0j26qvfecq3qvcm0an
|
||||
enc: |
|
||||
recipient: age14vktfes95f33vuefwnmuvryas7az04u76dsgyhfvsx73czkvmp2q7njkl4
|
||||
- enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGVW13WFE1Ylh3Uk1HNU1i
|
||||
bU9kRzFqTmhkQlRzMlRkM0VhMlNmMDUyK25NCkZYUStxM2tScGozRXJGekxGa1RX
|
||||
@@ -24,7 +24,8 @@ sops:
|
||||
V1N3eUVjZ0VZRjBZdXRPNng3Y3JoUTAKQau9CG9XfvM+5JZVRwaJr/o/sXMaJiy2
|
||||
wo2YcDb+4vfT4Wr+/8J3ccQgbLRZH916X5ZPL+A+nFyVXVKOCl3ENg==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2026-05-12T06:33:00Z"
|
||||
mac: ENC[AES256_GCM,data:htDJdEx34Q5NG8vwbBimnFENZawbLZ4FC0DkyG6J5RYP0BFnycKcKGsYR87SvIjcJZXvfZ0e6fXdtc78dd6I0sQtrQ7aNn4Iktbu/AkPmntsBwpIjVI99X9zUyQB87go/oX15yuyt8loB6ds2RkL/pfFsgLbFc10JHsBy+WcEzI=,iv:HvY+5LYzyHpRm8XCSKrN8ra/LJT9v23TPSsZg/4QVNU=,tag:k+d45+zgBYq4vlWmmc8ZkQ==,type:str]
|
||||
recipient: age1x36yr8h993srfj29sfpzt4wyz52nztvncpmhgmfs0j26qvfecq3qvcm0an
|
||||
lastmodified: "2026-09-16T14:20:36Z"
|
||||
mac: ENC[AES256_GCM,data:mhJvvn/+VBfNrP1pXRweLSNVlHq9/DLDcKQv8k9ZVsEcd077ifEAqduOXVKXcXDM0VTuBzArw9hmih+kZbCHoUZAQrk8LF7FC4a4FFwXG9p45uKWbUloTuq5w3MCxyU8IoyiAufZcWUlYFQjZ8K4n8N0bVrGQGHogemnrBXTUIo=,iv:H3tKQOuIe/pEIp0pUWCSar8VDompXNZ4BZfD1Wg4pb0=,tag:lyPR4Prlal1bpSRLmGfy7A==,type:str]
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.12.2
|
||||
version: 3.13.3
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
flake.modules.nixos.sirius =
|
||||
{
|
||||
{config, ...}: {
|
||||
flake.modules.nixos.sirius = {
|
||||
pkgs,
|
||||
hostName,
|
||||
userName,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = with config.flake.modules.nixos; [
|
||||
boot
|
||||
networking
|
||||
@@ -27,28 +24,47 @@
|
||||
directories = [
|
||||
"Distrobox"
|
||||
".steam"
|
||||
".bun"
|
||||
".rustup"
|
||||
".cache/awww"
|
||||
".cache/serpantinum"
|
||||
".config/BraveSoftware"
|
||||
".config/zed"
|
||||
".config/Vencord"
|
||||
".config/vesktop"
|
||||
".config/sops"
|
||||
".config/nix"
|
||||
".config/coderv2"
|
||||
".config/obs-studio"
|
||||
".config/easyeffects"
|
||||
".config/DankMaterialShell"
|
||||
".local/share/Steam"
|
||||
".local/share/lutris"
|
||||
".local/share/net.lutris.Lutris"
|
||||
".local/share/nvim"
|
||||
".local/share/opencode"
|
||||
".local/share/zsh"
|
||||
".local/share/zoxide"
|
||||
".local/share/voxtype"
|
||||
".local/state/lazygit"
|
||||
".local/share/vicinae"
|
||||
".local/share/TelegramDesktop"
|
||||
".local/share/GalaxyBudsClient"
|
||||
".local/state/serpantinum"
|
||||
".local/share/zed"
|
||||
|
||||
".claude"
|
||||
".orca"
|
||||
".config/orca"
|
||||
".zcode"
|
||||
".config/ZCode"
|
||||
];
|
||||
|
||||
files = [
|
||||
".wakatime.cfg"
|
||||
".config/lan-mouse/lan-mouse.pem"
|
||||
".claude.json"
|
||||
".config/gh/hosts.yml"
|
||||
];
|
||||
};
|
||||
};
|
||||
@@ -66,6 +82,8 @@
|
||||
waydroid.enable = true;
|
||||
distrobox.enable = true;
|
||||
};
|
||||
|
||||
programs.nix-ld.enable = true;
|
||||
};
|
||||
|
||||
sops.secrets = {
|
||||
@@ -89,6 +107,11 @@
|
||||
owner = userName;
|
||||
};
|
||||
|
||||
zai-coding-plan-api-key = {
|
||||
sopsFile = ./secrets.yaml;
|
||||
owner = userName;
|
||||
};
|
||||
|
||||
netbird-key = {
|
||||
sopsFile = ./secrets.yaml;
|
||||
owner = userName;
|
||||
@@ -124,6 +147,12 @@
|
||||
environment.systemPackages = with pkgs; [
|
||||
davinci-resolve
|
||||
telegram-desktop
|
||||
galaxy-buds-client
|
||||
impala
|
||||
llm-agents.claude-code
|
||||
llm-agents.orca
|
||||
llm-agents.zcode
|
||||
coder
|
||||
];
|
||||
|
||||
# !!! DO NOT CHANGE THIS !!!
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
hostName = "sirius";
|
||||
userName = "tux";
|
||||
userEmail = "t@tux.rs";
|
||||
system = "x86_64-linux";
|
||||
unstable = true;
|
||||
nixpkgs = if unstable then inputs.nixpkgs else inputs.nixpkgs-stable;
|
||||
in
|
||||
{
|
||||
flake.nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit
|
||||
hostName
|
||||
userName
|
||||
userEmail
|
||||
system
|
||||
;
|
||||
};
|
||||
modules = [
|
||||
config.flake.modules.nixos.core
|
||||
config.flake.modules.nixos.${hostName}
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
flake.modules.nixos.sirius =
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
{inputs, ...}: {
|
||||
flake.modules.nixos.sirius = {
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
hasOptinPersistence = config.tnix.boot.impermanence.enable;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
inputs.disko.nixosModules.disko
|
||||
];
|
||||
@@ -43,7 +43,8 @@
|
||||
content = {
|
||||
type = "btrfs";
|
||||
# Base subvolumes that always exist
|
||||
subvolumes = {
|
||||
subvolumes =
|
||||
{
|
||||
"/root" = {
|
||||
mountOptions = [
|
||||
"compress=zstd"
|
||||
|
||||
@@ -1,15 +1,20 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
flake.modules.nixos.sirius =
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
flake.modules.nixos.sirius = {
|
||||
lib,
|
||||
pkgs,
|
||||
system,
|
||||
...
|
||||
}@innerArgs:
|
||||
{
|
||||
imports = with config.flake.modules.nixos; [
|
||||
} @ innerArgs: {
|
||||
imports = with config.flake.modules.nixos;
|
||||
[
|
||||
hardware
|
||||
]
|
||||
++ [
|
||||
inputs.cardwire.nixosModules.default
|
||||
];
|
||||
|
||||
boot.kernelParams = ["nvidia-drm.modeset=1"];
|
||||
@@ -38,6 +43,11 @@
|
||||
services = {
|
||||
xserver.videoDrivers = ["nvidia"];
|
||||
power-profiles-daemon.enable = true;
|
||||
|
||||
cardwire = {
|
||||
enable = true;
|
||||
settings.auto_apply_gpu_state = true;
|
||||
};
|
||||
};
|
||||
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
{config, ...}: {
|
||||
flake.modules.homeManager.sirius = {
|
||||
imports = with config.flake.modules.homeManager; [
|
||||
desktop
|
||||
|
||||
@@ -2,12 +2,12 @@ tux-password: ENC[AES256_GCM,data:JWQVd2MYX2U4UP4II62ixG9hWI5MtgHAFhl8aCmyrYPl1H
|
||||
gemini-api-key: ENC[AES256_GCM,data:Y9YgXp/tB3Q1Rb5YMsZLgWCq+bdeIjsXAVeO3Yh7nZ8MwDH7d5De,iv:FIXxJCn6JDYsHIoNn8f8Un3z9ZPVbxdjR48Ux88poRg=,tag:bMJ4i69HTspnhzsrsxkbrw==,type:str]
|
||||
openrouter-api-key: ENC[AES256_GCM,data:HfZgZz4NyCLLM9woTZp2I6JGOlVcFblw2OMjx8k0TG5ZU2ycBCF6bKqp3wFibUxXcHy+nIfjI82fkLeSyIaGILRLYCJCc8BHKw==,iv:umUcn8MRaj7JXo6IFrGMXOu+jsFSCEikMxsQxfaFS/Q=,tag:l2s61C4EpJoKv8cc9nYGFA==,type:str]
|
||||
opencode-go-api-key: ENC[AES256_GCM,data:BGERcZg5Jpnznc4cXeYFMhPk9kKBkd9GvIuQBV9TW3JE1utgrLLYK6mKNCQqrEStRFiO2jUUnBm3opUNL4SuEHFLpw==,iv:fgFAwx6z9yruK27PvAJX/Q2CS9gU+LJ5zMUK/f/rzpo=,tag:BPu3M+jppPB8sLoLmfuY/Q==,type:str]
|
||||
zai-coding-plan-api-key: ENC[AES256_GCM,data:u5RHaBq5WHit+GjcKYnr6vN7jkputBtt3G0lCNBciMgBnBzIcZd/JjJcNaKXfbal5w==,iv:x+mG1aoct7yfm4Hvu1mMqBq8MiF8UZbQ8SFjA99qTIw=,tag:9cEIO2tuhqE6df2M2N/R+g==,type:str]
|
||||
netbird-key: ENC[AES256_GCM,data:qXAnRnLM2TlzpOvWG4exJv0+pUvpe0FpRN5xOWx3+KNt+yhq,iv:X+yl4o1RSYMCMWdVXo1hpzy+6IdKXUpsKPtYNSiHiCY=,tag:I8HbnD5iw6EJ1TdsNrhvfw==,type:str]
|
||||
vicinae-json: ENC[AES256_GCM,data:JjxolEgS6uakqR4eHOx3VyrOO5kaL4dj1jcEiLWsrktCU32UB7OmP1kJEVomA1rZjODpFHL89+FRpcNFspTFrc365WlANE81RLg/M2Ja1MiLYaDFNcBGtqMX9Yc1muor53Xl7t+rTSvDIj1oE1L7xPPcjCLfwC5QDzJjCBWj9FhCxnU5BwvoJNv9vgA6xnkzAOYSPZK/ihULMD0DxyqOUEa5ECGX62OPM9Gbr7jEviaItYzOOxaRs/yQVqizodGGl/BcK6fPqvOYSxip9ABYRVSI9ZvysY7ofAkeX91ardPwVG5VvEYfxZwBvGFjV7ZfTzVkK+BiUUNrvciAETHqwkjHftPpfJjxWsgLr8lbOA==,iv:HjDE/sqVDnxeww7r2upxH57rc1+LpuMKnhhyGXoc1Ms=,tag:d2kZeWkg17eVoNACIQ3Q9A==,type:str]
|
||||
sops:
|
||||
age:
|
||||
- recipient: age14vktfes95f33vuefwnmuvryas7az04u76dsgyhfvsx73czkvmp2q7njkl4
|
||||
enc: |
|
||||
- enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQNGdHcDc4bTFkR0EyZlUr
|
||||
eXovR1lyeTZJTDg5R281MFFuMHVwOXZXYzNvCkpIT1g3K05WUUswaEVjVVJWQkJq
|
||||
@@ -15,8 +15,8 @@ sops:
|
||||
Z0JwWWR0STUybjVhSXdDR3NiKzV1eDQK22HmMuyqYaR/eGuALkAPB1Y5bN2KwIt3
|
||||
pamM8vbnjB//hXoyrv4vsoDk9WzLGFGjgiw2qsM2HQgzQqtrwF1/1A==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age1maxsx5tq2h3d92rfyl8ekcdan5gu5cpch4qs3c56cu7qag02xgvs3h0gqc
|
||||
enc: |
|
||||
recipient: age14vktfes95f33vuefwnmuvryas7az04u76dsgyhfvsx73czkvmp2q7njkl4
|
||||
- enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1N3ZBd1pHODFtZkZxaHNP
|
||||
OXlXUzVFS0ZIam1IWVkxNldOdTEwY0s4aUNZCjVlcnF1aXJxUUlQSXhteXJ6OU1W
|
||||
@@ -24,7 +24,8 @@ sops:
|
||||
M3JocWZJeXFxenhXOENBVWpvNkd3bm8KqhNLzCyEAI643jGWpZF/uTchHmBj8ozU
|
||||
HtpOzKsshif66D0XOHeJQfQamJI4TyKsj3Sk3j9rstsLmN2lxTRGHg==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2026-05-10T00:35:50Z"
|
||||
mac: ENC[AES256_GCM,data:u27zQ1PPnWy5Parbh/1DkVP3ICmHnLZJKaLbN3dZEVONgqOWi32LV3t0iNhtLWwVnzFPBusRWahQiqAkUdnQtrXF0OtjPCpLuIw86xB75QPGbet0GZlLNb8/xPshChZe4v520csdJMWiy3vYeKrk8LxMSViAGhmhYK2a5NbGhzI=,iv:/9vePmvCNqoP0kx24fP3HfCjS2FkjBmI5B+SycvKKW4=,tag:gE1/DnLolwhoyfMJYejGIQ==,type:str]
|
||||
recipient: age1maxsx5tq2h3d92rfyl8ekcdan5gu5cpch4qs3c56cu7qag02xgvs3h0gqc
|
||||
lastmodified: "2026-09-16T14:20:48Z"
|
||||
mac: ENC[AES256_GCM,data:i2I6vo/tKTLq44Tu6vI2Cqp0EqQPbwuuRM2WUflD58UCr7huXIKnKrxmB1Hz/fdmpZPiCZ2dSlmOh733fKFclRmpHJLScYRX4+lFXEzToYExZlybVergxC6Cr4IaiB+A/HZIkW6iKK/ULr2mtXYNCqQgDQw8BgJuV2M/bAMM/V4=,iv:9akzmVH4CMMdDS5aukeLOxncMLKfvQCw2BYl36WAfOM=,tag:4F26bqEI8fEtNugqjHCUOg==,type:str]
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.12.2
|
||||
version: 3.13.3
|
||||
|
||||
51
modules/hosts/vega/config.nix
Normal file
51
modules/hosts/vega/config.nix
Normal file
@@ -0,0 +1,51 @@
|
||||
{config, ...}: {
|
||||
flake.modules.nixOnDroid.vega = {
|
||||
pkgs,
|
||||
userEmail,
|
||||
...
|
||||
}: {
|
||||
imports = with config.flake.modules.nixOnDroid; [
|
||||
networking
|
||||
];
|
||||
|
||||
# @TODO: Broken currently
|
||||
# android-integration.am.enable = true;
|
||||
# android-integration.termux-open-url.enable = true;
|
||||
# android-integration.xdg-open.enable = true;
|
||||
# android-integration.termux-setup-storage.enable = true;
|
||||
# android-integration.termux-reload-settings.enable = true;
|
||||
|
||||
terminal.font = let
|
||||
firacode = pkgs.nerd-fonts.fira-code;
|
||||
fontPath = "share/fonts/truetype/NerdFonts/FiraCode/FiraCodeNerdFont-Regular.ttf";
|
||||
in "${firacode}/${fontPath}";
|
||||
|
||||
time.timeZone = "Asia/Kolkata";
|
||||
|
||||
tnix.networking.openssh = {
|
||||
enable = true;
|
||||
ports = [8033];
|
||||
authorizedKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+OzPUe2ECPC929DqpkM39tl/vdNAXfsRnmrGfR+X3D ${userEmail}"
|
||||
];
|
||||
};
|
||||
|
||||
user = {
|
||||
uid = 10481;
|
||||
gid = 10481;
|
||||
shell = "${pkgs.zsh}/bin/zsh";
|
||||
};
|
||||
|
||||
environment.etcBackupExtension = ".backup";
|
||||
environment.motd = "";
|
||||
environment.packages = with pkgs; [
|
||||
ncurses
|
||||
procps
|
||||
util-linux
|
||||
rsync
|
||||
gnutar
|
||||
];
|
||||
|
||||
system.stateVersion = "24.05";
|
||||
};
|
||||
}
|
||||
8
modules/hosts/vega/home.nix
Normal file
8
modules/hosts/vega/home.nix
Normal file
@@ -0,0 +1,8 @@
|
||||
{lib, ...}: {
|
||||
flake.modules.homeManager.vega = {
|
||||
# @TODO: Broken currently - By default it's enabled by neovim module
|
||||
programs.vim.enable = lib.mkForce false;
|
||||
|
||||
home.stateVersion = "26.05";
|
||||
};
|
||||
}
|
||||
@@ -1,11 +1,5 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
flake.modules.nixos.vps =
|
||||
{
|
||||
hostName,
|
||||
...
|
||||
}:
|
||||
{
|
||||
{config, ...}: {
|
||||
flake.modules.nixos.vps = {hostName, ...}: {
|
||||
imports = with config.flake.modules.nixos; [
|
||||
boot
|
||||
networking
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
hostName = "vps";
|
||||
userName = "tux";
|
||||
userEmail = "t@tux.rs";
|
||||
system = "x86_64-linux";
|
||||
unstable = true;
|
||||
nixpkgs = if unstable then inputs.nixpkgs else inputs.nixpkgs-stable;
|
||||
in
|
||||
{
|
||||
flake.nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit
|
||||
hostName
|
||||
userName
|
||||
userEmail
|
||||
system
|
||||
;
|
||||
};
|
||||
modules = [
|
||||
config.flake.modules.nixos.core
|
||||
config.flake.modules.nixos.${hostName}
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,12 +1,12 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
flake.modules.nixos.vps =
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
{inputs, ...}: {
|
||||
flake.modules.nixos.vps = {
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
hasOptinPersistence = config.tnix.boot.impermanence.enable;
|
||||
isLegacy = config.tnix.boot.legacy.enable;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
inputs.disko.nixosModules.disko
|
||||
];
|
||||
@@ -16,7 +16,8 @@
|
||||
type = "disk";
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
partitions =
|
||||
{
|
||||
ESP = {
|
||||
size = "1G";
|
||||
type = "EF00";
|
||||
@@ -36,7 +37,8 @@
|
||||
content = {
|
||||
type = "btrfs";
|
||||
# Base subvolumes that always exist
|
||||
subvolumes = {
|
||||
subvolumes =
|
||||
{
|
||||
"/root" = {
|
||||
mountOptions = [
|
||||
"compress=zstd"
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
{
|
||||
flake.modules.nixos.vps =
|
||||
{
|
||||
flake.modules.nixos.vps = {
|
||||
lib,
|
||||
modulesPath,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
{ ... }:
|
||||
{
|
||||
flake.modules.homeManager.vps = {
|
||||
home.stateVersion = "26.05";
|
||||
|
||||
@@ -1,16 +1,12 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
flake.modules.nixos.boot =
|
||||
{
|
||||
{inputs, ...}: {
|
||||
flake.modules.nixos.boot = {
|
||||
config,
|
||||
lib,
|
||||
userName,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
cfg = config.tnix.boot;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
inputs.impermanence.nixosModules.impermanence
|
||||
];
|
||||
@@ -46,25 +42,30 @@
|
||||
fileSystems."/persist".neededForBoot = true;
|
||||
environment.persistence."/persist" = {
|
||||
hideMounts = true;
|
||||
directories = [
|
||||
directories =
|
||||
[
|
||||
"/var/log"
|
||||
"/var/lib"
|
||||
"/etc/NetworkManager/system-connections"
|
||||
]
|
||||
++ cfg.impermanence.directories;
|
||||
|
||||
files = [
|
||||
files =
|
||||
[
|
||||
"/etc/machine-id"
|
||||
"/etc/ssh/ssh_host_ed25519_key"
|
||||
"/etc/ssh/ssh_host_ed25519_key.pub"
|
||||
"/etc/ssh/ssh_host_rsa_key"
|
||||
"/etc/ssh/ssh_host_rsa_key.pub"
|
||||
"/etc/ly/save.txt"
|
||||
]
|
||||
++ cfg.impermanence.files;
|
||||
};
|
||||
|
||||
home-manager.users.${userName} = {
|
||||
home.persistence."/persist" = {
|
||||
directories = [
|
||||
directories =
|
||||
[
|
||||
"Downloads"
|
||||
"Music"
|
||||
"Wallpapers"
|
||||
|
||||
@@ -1,16 +1,19 @@
|
||||
{
|
||||
flake.modules.nixos.boot =
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
flake.modules.nixos.boot = {
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.tnix.boot;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.tnix.boot.legacy = {
|
||||
enable = lib.mkEnableOption "legacy boot (GRUB) instead of systemd-boot";
|
||||
};
|
||||
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
boot.binfmt.emulatedSystems = ["aarch64-linux"];
|
||||
|
||||
boot.loader = {
|
||||
timeout = 1;
|
||||
efi.canTouchEfiVariables = true;
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
flake.modules.nixos.boot =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
flake.modules.nixos.boot = {pkgs, ...}: {
|
||||
boot = {
|
||||
consoleLogLevel = 0;
|
||||
initrd.verbose = false;
|
||||
|
||||
@@ -1,16 +1,12 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
flake.modules.nixos.boot =
|
||||
{
|
||||
{inputs, ...}: {
|
||||
flake.modules.nixos.boot = {
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
cfg = config.tnix.boot;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [inputs.lanzaboote.nixosModules.lanzaboote];
|
||||
|
||||
options.tnix.boot.secure-boot = {
|
||||
|
||||
5
modules/nixos/core/env.nix
Normal file
5
modules/nixos/core/env.nix
Normal file
@@ -0,0 +1,5 @@
|
||||
{
|
||||
flake.modules.nixos.core = {...}: {
|
||||
environment.enableAllTerminfo = true;
|
||||
};
|
||||
}
|
||||
@@ -1,13 +1,14 @@
|
||||
{ inputs, config, ... }:
|
||||
{
|
||||
flake.modules.nixos.core =
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
flake.modules.nixos.core = {
|
||||
hostName,
|
||||
userName,
|
||||
userEmail,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
];
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
{
|
||||
flake.modules.nixos.core =
|
||||
{
|
||||
flake.modules.nixos.core = {
|
||||
config,
|
||||
userName,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
programs.nh = {
|
||||
enable = true;
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
{inputs, ...}: {
|
||||
flake.modules.nixos.core = {pkgs, ...}: {
|
||||
imports = [
|
||||
inputs.nix-index-database.nixosModules.default
|
||||
|
||||
18
modules/nixos/core/nix-ld.nix
Normal file
18
modules/nixos/core/nix-ld.nix
Normal file
@@ -0,0 +1,18 @@
|
||||
{...}: {
|
||||
flake.modules.nixos.core = {
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.tnix.programs.nix-ld;
|
||||
in {
|
||||
options.tnix.programs.nix-ld = {
|
||||
enable = mkEnableOption "nix-ld";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.nix-ld.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
flake.modules.nixos.core =
|
||||
{ userName, ... }:
|
||||
{
|
||||
flake.modules.nixos.core = {userName, ...}: {
|
||||
nix = {
|
||||
channel.enable = false;
|
||||
|
||||
@@ -15,6 +13,11 @@
|
||||
optimise.automatic = true;
|
||||
|
||||
settings = {
|
||||
extra-platforms = [
|
||||
"aarch64-linux"
|
||||
"arm-linux"
|
||||
];
|
||||
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
{inputs, ...}: {
|
||||
flake.modules.nixos.core = {
|
||||
nixpkgs = {
|
||||
config = {
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
flake.modules.nixos.core =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
flake.modules.nixos.core = {
|
||||
security = {
|
||||
sudo.wheelNeedsPassword = false;
|
||||
};
|
||||
|
||||
@@ -1,17 +1,13 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
flake.modules.nixos.core =
|
||||
{
|
||||
{inputs, ...}: {
|
||||
flake.modules.nixos.core = {
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
isEd25519 = k: k.type == "ed25519";
|
||||
getKeyPath = k: k.path;
|
||||
keys = builtins.filter isEd25519 config.services.openssh.hostKeys;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [inputs.sops-nix.nixosModules.sops];
|
||||
|
||||
sops.age = {
|
||||
|
||||
@@ -33,6 +33,10 @@
|
||||
"wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0="
|
||||
"cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M="
|
||||
];
|
||||
extra-substituters = ["https://cache.numtide.com"];
|
||||
extra-trusted-public-keys = [
|
||||
"niks3.numtide.com-1:DTx8wZduET09hRmMtKdQDxNNthLQETkc/yaX7M4qK0g="
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,17 +1,14 @@
|
||||
{
|
||||
flake.modules.nixos.core =
|
||||
{
|
||||
flake.modules.nixos.core = {
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
userName,
|
||||
userEmail,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
hasPasswordSecret = lib.hasAttrByPath ["sops" "secrets" "tux-password"] config;
|
||||
in
|
||||
{
|
||||
in {
|
||||
programs.zsh.enable = true;
|
||||
|
||||
time.timeZone = "Asia/Kolkata";
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
flake.modules.nixos.desktop =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
flake.modules.nixos.desktop = {pkgs, ...}: {
|
||||
fonts.packages = with pkgs.nerd-fonts; [
|
||||
fira-code
|
||||
jetbrains-mono
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
flake.modules.nixos.desktop =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
flake.modules.nixos.desktop = {pkgs, ...}: {
|
||||
programs.gpu-screen-recorder = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
flake.modules.nixos.desktop =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
flake.modules.nixos.desktop = {pkgs, ...}: {
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
package = pkgs.hyprland-git.hyprland;
|
||||
|
||||
@@ -1,15 +1,9 @@
|
||||
{
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
flake.modules.nixos.desktop =
|
||||
{
|
||||
{inputs, ...}: {
|
||||
flake.modules.nixos.desktop = {
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
inputs.mango.nixosModules.mango
|
||||
];
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
flake.modules.nixos.desktop =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
flake.modules.nixos.desktop = {pkgs, ...}: {
|
||||
environment.systemPackages = with pkgs; [brightnessctl];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
flake.modules.nixos.desktop =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
flake.modules.nixos.desktop = {pkgs, ...}: {
|
||||
programs.obs-studio = {
|
||||
enable = true;
|
||||
enableVirtualCamera = true;
|
||||
@@ -9,6 +7,7 @@
|
||||
obs-vaapi
|
||||
wlrobs
|
||||
obs-source-record
|
||||
obs-advanced-masks
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
flake.modules.nixos.desktop =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
flake.modules.nixos.desktop = {pkgs, ...}: {
|
||||
services = {
|
||||
gvfs.enable = true;
|
||||
tumbler.enable = true;
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
{
|
||||
flake.modules.nixos.desktop =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [ tpanel ];
|
||||
};
|
||||
}
|
||||
5
modules/nixos/desktop/tshell.nix
Normal file
5
modules/nixos/desktop/tshell.nix
Normal file
@@ -0,0 +1,5 @@
|
||||
{
|
||||
flake.modules.nixos.desktop = {pkgs, ...}: {
|
||||
environment.systemPackages = with pkgs; [tshell];
|
||||
};
|
||||
}
|
||||
@@ -1,7 +1,5 @@
|
||||
{
|
||||
flake.modules.nixos.gaming =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
flake.modules.nixos.gaming = {pkgs, ...}: {
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
protontricks.enable = true;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
flake.modules.nixos.hardware = {
|
||||
flake.modules.nixos.hardware = {pkgs, ...}: {
|
||||
security.rtkit.enable = true;
|
||||
|
||||
services.pipewire = {
|
||||
@@ -9,5 +9,10 @@
|
||||
pulse.enable = true;
|
||||
wireplumber.enable = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
alsa-utils
|
||||
pavucontrol
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
{
|
||||
flake.modules.nixos.networking =
|
||||
{
|
||||
flake.modules.nixos.networking = {
|
||||
config,
|
||||
lib,
|
||||
hostName,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
with lib; let
|
||||
cfg = config.tnix.networking.netbird-client;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.tnix.networking.netbird-client = {
|
||||
enable = mkEnableOption "Enable netbird client";
|
||||
};
|
||||
@@ -18,7 +15,7 @@
|
||||
config = mkIf cfg.enable {
|
||||
services.netbird.clients = {
|
||||
${hostName} = {
|
||||
port = 51820;
|
||||
port = 61820;
|
||||
login = {
|
||||
enable = true;
|
||||
setupKeyFile = config.sops.secrets.netbird-key.path;
|
||||
|
||||
@@ -1,15 +1,12 @@
|
||||
{
|
||||
flake.modules.nixos.networking =
|
||||
{
|
||||
flake.modules.nixos.networking = {
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
with lib; let
|
||||
cfg = config.tnix.networking.newt;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.tnix.networking.newt = {
|
||||
enable = mkEnableOption "Newt";
|
||||
|
||||
|
||||
@@ -1,19 +1,16 @@
|
||||
{
|
||||
flake.modules.nixos.networking =
|
||||
{
|
||||
flake.modules.nixos.networking = {
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
with lib; let
|
||||
cfg = config.tnix.networking.openssh;
|
||||
|
||||
# Sops needs acess to the keys before the persist dirs are even mounted; so
|
||||
# just persisting the keys won't work, we must point at /persist
|
||||
hasOptinPersistence = config.tnix.boot.impermanence.enable;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.tnix.networking.openssh = {
|
||||
enable = mkEnableOption "Enable OpenSSH server";
|
||||
|
||||
|
||||
@@ -1,20 +1,23 @@
|
||||
{
|
||||
flake.modules.nixos.services =
|
||||
{
|
||||
flake.modules.nixos.services = {
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
with lib; let
|
||||
cfg = config.tnix.services.aiostreams;
|
||||
port = toString cfg.port;
|
||||
acmeHost = config.tnix.services.nginx.domain;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.tnix.services.aiostreams = {
|
||||
enable = mkEnableOption "AIOStreams";
|
||||
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1";
|
||||
description = "Host on which AIOStreams listens";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 3000;
|
||||
@@ -24,7 +27,19 @@
|
||||
domain = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = "Domain on which nginx serves AIOStreams (disabled when empty)";
|
||||
description = "Domain on which AIOStreams is available";
|
||||
};
|
||||
|
||||
configureNginx = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether to configure Nginx as a reverse proxy for AIOStreams";
|
||||
};
|
||||
|
||||
configurePangolin = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether to configure Pangolin as a reverse proxy for AIOStreams";
|
||||
};
|
||||
|
||||
image = mkOption {
|
||||
@@ -47,10 +62,17 @@
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.domain != "";
|
||||
message = "tnix.services.aiostreams.domain must be set when tnix.services.aiostreams.enable is true.";
|
||||
}
|
||||
];
|
||||
|
||||
virtualisation.oci-containers.containers.aiostreams = {
|
||||
image = cfg.image;
|
||||
ports = [
|
||||
"127.0.0.1:${port}:3000"
|
||||
"${cfg.host}:${port}:3000"
|
||||
];
|
||||
environment = {
|
||||
ADDON_ID = cfg.domain;
|
||||
@@ -62,11 +84,39 @@
|
||||
];
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts.${cfg.domain} = mkIf (cfg.domain != "") {
|
||||
services = {
|
||||
nginx.virtualHosts.${cfg.domain} = mkIf cfg.configureNginx {
|
||||
forceSSL = acmeHost != "";
|
||||
useACMEHost = mkIf (acmeHost != "") acmeHost;
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:${port}";
|
||||
proxyPass = "http://${cfg.host}:${port}";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
|
||||
newt.blueprint.proxy-resources = mkIf cfg.configurePangolin {
|
||||
aiostreams = {
|
||||
auth = {
|
||||
sso-enabled = false;
|
||||
};
|
||||
full-domain = cfg.domain;
|
||||
name = "aiostreams";
|
||||
protocol = "http";
|
||||
targets = [
|
||||
{
|
||||
hostname = "localhost";
|
||||
method = "http";
|
||||
port = cfg.port;
|
||||
healthcheck = {
|
||||
hostname = "localhost";
|
||||
port = cfg.port;
|
||||
scheme = "http";
|
||||
method = "GET";
|
||||
path = "/";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
95
modules/nixos/services/coder.nix
Normal file
95
modules/nixos/services/coder.nix
Normal file
@@ -0,0 +1,95 @@
|
||||
{
|
||||
flake.modules.nixos.services = {
|
||||
config,
|
||||
lib,
|
||||
options,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.tnix.services.coder;
|
||||
port = toString cfg.port;
|
||||
in {
|
||||
options.tnix.services.coder = {
|
||||
enable = mkEnableOption "Coder";
|
||||
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1";
|
||||
description = "Host on which Coder listens";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 1116;
|
||||
description = "Port on which Coder listens";
|
||||
};
|
||||
|
||||
environment = options.services.coder.environment;
|
||||
|
||||
domain = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = "Domain on which Coder is available";
|
||||
};
|
||||
|
||||
configureNginx = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether to configure Nginx as a reverse proxy for Coder";
|
||||
};
|
||||
|
||||
configurePangolin = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether to configure Pangolin as a reverse proxy for Coder";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
users.users.coder.extraGroups = ["docker"];
|
||||
|
||||
services = {
|
||||
coder = {
|
||||
enable = true;
|
||||
accessUrl = "https://${cfg.domain}";
|
||||
listenAddress = "${cfg.host}:${port}";
|
||||
environment = cfg.environment;
|
||||
};
|
||||
|
||||
nginx.virtualHosts.${cfg.domain} = mkIf cfg.configureNginx {
|
||||
forceSSL = acmeHost != "";
|
||||
useACMEHost = mkIf (acmeHost != "") acmeHost;
|
||||
locations."/" = {
|
||||
proxyPass = "http://${cfg.host}:${port}";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
|
||||
newt.blueprint.proxy-resources = mkIf cfg.configurePangolin {
|
||||
gitea = {
|
||||
auth = {
|
||||
sso-enabled = false;
|
||||
};
|
||||
full-domain = cfg.domain;
|
||||
name = "coder";
|
||||
protocol = "http";
|
||||
targets = [
|
||||
{
|
||||
hostname = "localhost";
|
||||
method = "http";
|
||||
port = cfg.port;
|
||||
healthcheck = {
|
||||
hostname = "localhost";
|
||||
port = cfg.port;
|
||||
scheme = "http";
|
||||
method = "GET";
|
||||
path = "/";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
115
modules/nixos/services/copyparty.nix
Normal file
115
modules/nixos/services/copyparty.nix
Normal file
@@ -0,0 +1,115 @@
|
||||
{inputs, ...}: {
|
||||
flake.modules.nixos.services = {
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
options,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.tnix.services.copyparty;
|
||||
port = toString cfg.port;
|
||||
acmeHost = config.tnix.services.nginx.domain;
|
||||
in {
|
||||
imports = [
|
||||
inputs.copyparty.nixosModules.default
|
||||
];
|
||||
|
||||
options.tnix.services.copyparty = {
|
||||
enable = mkEnableOption "Copyparty";
|
||||
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1";
|
||||
description = "Host on which Copyparty listens";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 1115;
|
||||
description = "Port on which Copyparty listens";
|
||||
};
|
||||
|
||||
domain = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = "Domain on which Copyparty is available";
|
||||
};
|
||||
|
||||
accounts = options.services.copyparty.accounts;
|
||||
volumes = options.services.copyparty.volumes;
|
||||
|
||||
configureNginx = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether to configure Nginx as a reverse proxy for Copyparty";
|
||||
};
|
||||
|
||||
configurePangolin = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether to configure Pangolin as a reverse proxy for Copyparty";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.domain != "";
|
||||
message = "tnix.services.copyparty.domain must be set when tnix.services.copyparty.enable is true.";
|
||||
}
|
||||
];
|
||||
|
||||
services = {
|
||||
copyparty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
i = cfg.host;
|
||||
p = cfg.port;
|
||||
no-reload = true;
|
||||
ignored-flag = false;
|
||||
};
|
||||
accounts = cfg.accounts;
|
||||
volumes = cfg.volumes;
|
||||
package = pkgs.copyparty.override {
|
||||
extraPackages = [pkgs.exiftool];
|
||||
};
|
||||
};
|
||||
|
||||
nginx.virtualHosts.${cfg.domain} = mkIf cfg.configureNginx {
|
||||
forceSSL = acmeHost != "";
|
||||
useACMEHost = mkIf (acmeHost != "") acmeHost;
|
||||
locations."/" = {
|
||||
proxyPass = "http://${cfg.host}:${port}";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
|
||||
newt.blueprint.proxy-resources = mkIf cfg.configurePangolin {
|
||||
copyparty = {
|
||||
auth = {
|
||||
sso-enabled = false;
|
||||
};
|
||||
full-domain = cfg.domain;
|
||||
name = "copyparty";
|
||||
protocol = "http";
|
||||
targets = [
|
||||
{
|
||||
hostname = "localhost";
|
||||
method = "http";
|
||||
port = cfg.port;
|
||||
healthcheck = {
|
||||
hostname = "localhost";
|
||||
port = cfg.port;
|
||||
scheme = "http";
|
||||
method = "GET";
|
||||
path = "/";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,16 +1,13 @@
|
||||
{
|
||||
flake.modules.nixos.services =
|
||||
{
|
||||
flake.modules.nixos.services = {
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
with lib; let
|
||||
cfg = config.tnix.services.cyber-tux;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.tnix.services.cyber-tux = {
|
||||
enable = mkEnableOption "CyberTux Discord bot";
|
||||
|
||||
|
||||
120
modules/nixos/services/gitea.nix
Normal file
120
modules/nixos/services/gitea.nix
Normal file
@@ -0,0 +1,120 @@
|
||||
{
|
||||
flake.modules.nixos.services = {
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.tnix.services.gitea;
|
||||
port = toString cfg.port;
|
||||
acmeHost = config.tnix.services.nginx.domain;
|
||||
in {
|
||||
options.tnix.services.gitea = {
|
||||
enable = mkEnableOption "Gitea";
|
||||
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1";
|
||||
description = "Host on which Gitea listens";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 1114;
|
||||
description = "Port on which Gitea listens";
|
||||
};
|
||||
|
||||
domain = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = "Domain on which Gitea is available";
|
||||
};
|
||||
|
||||
configureNginx = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether to configure Nginx as a reverse proxy for Gitea";
|
||||
};
|
||||
|
||||
configurePangolin = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether to configure Pangolin as a reverse proxy for Gitea";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.domain != "";
|
||||
message = "tnix.services.gitea.domain must be set when tnix.services.gitea.enable is true.";
|
||||
}
|
||||
];
|
||||
|
||||
services = {
|
||||
gitea = {
|
||||
enable = true;
|
||||
settings = {
|
||||
service.DISABLE_REGISTRATION = true;
|
||||
server = {
|
||||
HTTP_ADDR = cfg.host;
|
||||
HTTP_PORT = cfg.port;
|
||||
DOMAIN = cfg.domain;
|
||||
ROOT_URL = "https://${cfg.domain}";
|
||||
};
|
||||
};
|
||||
database = {
|
||||
type = "postgres";
|
||||
name = "gitea";
|
||||
user = "gitea";
|
||||
};
|
||||
};
|
||||
|
||||
nginx.virtualHosts.${cfg.domain} = mkIf cfg.configureNginx {
|
||||
forceSSL = acmeHost != "";
|
||||
useACMEHost = mkIf (acmeHost != "") acmeHost;
|
||||
locations."/" = {
|
||||
proxyPass = "http://${cfg.host}:${port}";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
|
||||
newt.blueprint.proxy-resources = mkIf cfg.configurePangolin {
|
||||
gitea = {
|
||||
auth = {
|
||||
sso-enabled = false;
|
||||
};
|
||||
full-domain = cfg.domain;
|
||||
name = "gitea";
|
||||
protocol = "http";
|
||||
targets = [
|
||||
{
|
||||
hostname = "localhost";
|
||||
method = "http";
|
||||
port = cfg.port;
|
||||
healthcheck = {
|
||||
hostname = "localhost";
|
||||
port = cfg.port;
|
||||
scheme = "http";
|
||||
method = "GET";
|
||||
path = "/";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
postgresql = {
|
||||
enable = true;
|
||||
ensureDatabases = ["gitea"];
|
||||
ensureUsers = [
|
||||
{
|
||||
name = "gitea";
|
||||
ensureDBOwnership = true;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user