Compare commits
No commits in common. "main" and "hyprland" have entirely different histories.
13 changed files with 72 additions and 198 deletions
75
flake.lock
generated
75
flake.lock
generated
|
|
@ -12,11 +12,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760836749,
|
||||
"narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
|
||||
"lastModified": 1754433428,
|
||||
"narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "2f0f812f69f3eb4140157fe15e12739adf82e32a",
|
||||
"rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -43,11 +43,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1752264895,
|
||||
"narHash": "sha256-1zBPE/PNAkPNUsOWFET4J0cjlvziH8DOekesDmjND+w=",
|
||||
"lastModified": 1748883665,
|
||||
"narHash": "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=",
|
||||
"owner": "cachix",
|
||||
"repo": "cachix",
|
||||
"rev": "47053aef762f452e816e44eb9a23fbc3827b241a",
|
||||
"rev": "f707778d902af4d62d8dd92c269f8e70de09acbe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -62,11 +62,11 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760953099,
|
||||
"narHash": "sha256-sOKx2YcHa+lWEvaEOIGqLN2WWk1Wf5z6KM02tdfhMtw=",
|
||||
"lastModified": 1757320803,
|
||||
"narHash": "sha256-7PUIQOMQSJLkNtV42SAYUDw0mRdbBNl6q8pLN8GViwM=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"rev": "f5b21876888265d2fee7fb0640d1b66a1c1c6503",
|
||||
"rev": "d75e3fe67f49728cb5035bc791f4b9065ff3a2c9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -101,7 +101,6 @@
|
|||
"inputs": {
|
||||
"cachix": "cachix",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-parts": "flake-parts",
|
||||
"git-hooks": "git-hooks",
|
||||
"nix": "nix",
|
||||
"nixpkgs": [
|
||||
|
|
@ -109,11 +108,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761091275,
|
||||
"narHash": "sha256-SIiugXvSuI2WFedt1NyDj8yHsSDntsO/JWKyEZ+mI50=",
|
||||
"lastModified": 1757570236,
|
||||
"narHash": "sha256-Gy15+KtKc/MyT4L9Ad/2wkXQvDiMkhtKy9Tnn3+kPww=",
|
||||
"owner": "cachix",
|
||||
"repo": "devenv",
|
||||
"rev": "a795c32dc826b51d12706f27fb344f966bb2b084",
|
||||
"rev": "c57bded76fa6a885ab1dee2c75216cc23d58b311",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -174,15 +173,16 @@
|
|||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"devenv",
|
||||
"nix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1756770412,
|
||||
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
|
||||
"lastModified": 1733312601,
|
||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "4524271976b625a4a605beefd893f270620fd751",
|
||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -299,11 +299,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1758108966,
|
||||
"narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
|
||||
"lastModified": 1750779888,
|
||||
"narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
|
||||
"rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -341,11 +341,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761081701,
|
||||
"narHash": "sha256-IwpfaKg5c/WWQiy8b5QGaVPMvoEQ2J6kpwRFdpVpBNQ=",
|
||||
"lastModified": 1757784838,
|
||||
"narHash": "sha256-6aHo1++bAFdW1z+0tfuxM9EmxHvon90mHo8/+izXMcY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "9b4a2a7c4fbd75b422f00794af02d6edb4d9d315",
|
||||
"rev": "6e28513cf2ee9a985c339fcef24d44f43d23456b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -391,10 +391,7 @@
|
|||
"devenv",
|
||||
"flake-compat"
|
||||
],
|
||||
"flake-parts": [
|
||||
"devenv",
|
||||
"flake-parts"
|
||||
],
|
||||
"flake-parts": "flake-parts",
|
||||
"git-hooks-nix": [
|
||||
"devenv",
|
||||
"git-hooks"
|
||||
|
|
@ -411,16 +408,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1758763079,
|
||||
"narHash": "sha256-Bx1A+lShhOWwMuy3uDzZQvYiBKBFcKwy6G6NEohhv6A=",
|
||||
"lastModified": 1755029779,
|
||||
"narHash": "sha256-3+GHIYGg4U9XKUN4rg473frIVNn8YD06bjwxKS1IPrU=",
|
||||
"owner": "cachix",
|
||||
"repo": "nix",
|
||||
"rev": "6f0140527c2b0346df4afad7497baa08decb929f",
|
||||
"rev": "b0972b0eee6726081d10b1199f54de6d2917f861",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"ref": "devenv-2.30.5",
|
||||
"ref": "devenv-2.30",
|
||||
"repo": "nix",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -463,11 +460,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1760958188,
|
||||
"narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=",
|
||||
"lastModified": 1757775351,
|
||||
"narHash": "sha256-xWsxmNHwt9jV/yFJqzsNeilpH4BR8MPe44Yt0eaGAIM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc",
|
||||
"rev": "f89c620d3d6e584d98280b48f0af7be4f8506ab5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -479,11 +476,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1760524057,
|
||||
"narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
|
||||
"lastModified": 1756266583,
|
||||
"narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
|
||||
"rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -510,11 +507,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1760878510,
|
||||
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
|
||||
"lastModified": 1757487488,
|
||||
"narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
|
||||
"rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@
|
|||
profiles.system = {
|
||||
user = "root";
|
||||
sshUser = "alejandro";
|
||||
path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.gospel;
|
||||
path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.node;
|
||||
sshOpts = [ "-A" ];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
aa = {
|
||||
apps = {
|
||||
|
|
@ -22,6 +22,6 @@
|
|||
|
||||
# misc utils without custom config
|
||||
programs = {
|
||||
fzf.enable = lib.mkForce false;
|
||||
fzf.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,48 +36,35 @@ in
|
|||
};
|
||||
|
||||
catppuccin.delta.enable = true;
|
||||
programs.delta = {
|
||||
enable = true;
|
||||
enableGitIntegration = true;
|
||||
options = {
|
||||
line-numbers = true;
|
||||
navigate = true;
|
||||
};
|
||||
};
|
||||
|
||||
programs.git = {
|
||||
delta = {
|
||||
enable = true;
|
||||
options = {
|
||||
line-numbers = true;
|
||||
navigate = true;
|
||||
};
|
||||
};
|
||||
|
||||
enable = true;
|
||||
settings = {
|
||||
alias = {
|
||||
# Prettier log
|
||||
lol = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative";
|
||||
# Find log and grab its hash
|
||||
lof = ''
|
||||
!${pkgs.git}/bin/git log --pretty=oneline \
|
||||
| ${pkgs.fzf}/bin/fzf --scheme history \
|
||||
| ${pkgs.gawk}/bin/awk '{print $1}'
|
||||
'';
|
||||
# Push up a new branch with the same as local
|
||||
pushup = "push -u origin HEAD";
|
||||
};
|
||||
userName = cfg.userName;
|
||||
userEmail = cfg.userEmail;
|
||||
|
||||
user = {
|
||||
name = cfg.userName;
|
||||
email = cfg.userEmail;
|
||||
};
|
||||
|
||||
init = {
|
||||
defaultBranch = "main";
|
||||
};
|
||||
|
||||
pull = {
|
||||
rebase = true;
|
||||
};
|
||||
aliases = {
|
||||
# Prettier log
|
||||
lol = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative";
|
||||
# Find log and grab its hash
|
||||
lof = ''
|
||||
!${pkgs.git}/bin/git log --pretty=oneline \
|
||||
| ${pkgs.fzf}/bin/fzf --scheme history \
|
||||
| ${pkgs.gawk}/bin/awk '{print $1}'
|
||||
'';
|
||||
# Push up a new branch with the same as local
|
||||
pushup = "push -u origin HEAD";
|
||||
};
|
||||
|
||||
signing = {
|
||||
key = cfg.signingKey;
|
||||
signByDefault = mkDefault false;
|
||||
signByDefault = mkDefault true;
|
||||
};
|
||||
|
||||
ignores = [
|
||||
|
|
@ -96,6 +83,16 @@ in
|
|||
".envrc"
|
||||
".direnv"
|
||||
];
|
||||
|
||||
extraConfig = {
|
||||
init = {
|
||||
defaultBranch = "main";
|
||||
};
|
||||
|
||||
pull = {
|
||||
rebase = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
catppuccin.lazygit.enable = true;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ in
|
|||
enable = mkEnableOption "manage nix configuration.";
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.nixVersions.nix_2_31;
|
||||
default = pkgs.nixVersions.latest;
|
||||
description = "Which nix package to use.";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ in
|
|||
hass_mqtt.file = ../../../../secrets/hass_mqtt.age;
|
||||
theengs_ble_mqtt.file = ../../../../secrets/theengs_ble_mqtt.age;
|
||||
teslamate_mqtt.file = ../../../../secrets/teslamate_mqtt.age;
|
||||
zigbee2mqtt_mqtt.file = ../../../../secrets/zigbee2mqtt_mqtt.age;
|
||||
};
|
||||
|
||||
services.mosquitto = {
|
||||
|
|
@ -42,13 +41,6 @@ in
|
|||
acl = [ "readwrite teslamate/#" ];
|
||||
passwordFile = config.age.secrets.teslamate_mqtt.path;
|
||||
};
|
||||
zigbee2mqtt = {
|
||||
acl = [
|
||||
"readwrite zigbee2mqtt/#"
|
||||
"readwrite homeassistant/#"
|
||||
];
|
||||
passwordFile = config.age.secrets.zigbee2mqtt_mqtt.path;
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,75 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
namespace,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.${namespace}.services.zigbee2mqtt;
|
||||
in
|
||||
{
|
||||
options.${namespace}.services.zigbee2mqtt = {
|
||||
enable = lib.mkEnableOption "zigbee2mqtt";
|
||||
acmeCertName = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "";
|
||||
description = ''
|
||||
If set to a non-empty string, forces SSL with the supplied acme
|
||||
certificate.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
age.secrets.zigbee2mqtt_creds = {
|
||||
file = ../../../../secrets/zigbee2mqtt_creds.age;
|
||||
path = "/var/lib/zigbee2mqtt/secret.yaml";
|
||||
owner = "zigbee2mqtt";
|
||||
group = "zigbee2mqtt";
|
||||
mode = "0400";
|
||||
};
|
||||
|
||||
services.zigbee2mqtt = {
|
||||
enable = true;
|
||||
settings = {
|
||||
version = 4;
|
||||
mqtt = {
|
||||
base_topic = "zigbee2mqtt";
|
||||
server = "mqtt://192.168.113.13:1833";
|
||||
# TODO: Write secret.yaml file
|
||||
user = "!secret.yaml user";
|
||||
password = "!secret.yaml password";
|
||||
};
|
||||
serial = {
|
||||
port = "tcp://192.168.113.130:6638";
|
||||
adapter = "zstack";
|
||||
};
|
||||
advanced = {
|
||||
channel = 11;
|
||||
network_key = "GENERATE";
|
||||
pan_id = "GENERATE";
|
||||
ext_pan_id = "GENERATE";
|
||||
};
|
||||
frontend = {
|
||||
enabled = true;
|
||||
port = 8080;
|
||||
};
|
||||
homeassistant = {
|
||||
enabled = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
recommendedProxySettings = true;
|
||||
virtualHosts."zigbee2mqtt.kilonull.com" = {
|
||||
locations."/".proxyPass = "http://127.0.0.1:8080";
|
||||
}
|
||||
// lib.optionalAttrs (cfg.acmeCertName != "") {
|
||||
forceSSL = true;
|
||||
useACMEHost = cfg.acmeCertName;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
{ ... }:
|
||||
(final: prev: {
|
||||
signal-desktop-bin = prev.signal-desktop-bin.overrideAttrs (oldAttrs: {
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ prev.makeWrapper ];
|
||||
postInstall = oldAttrs.postInstall or "" + ''
|
||||
wrapProgram $out/bin/signal-desktop \
|
||||
--add-flags "--enable-features=UseOzonePlatform --ozone-platform=wayland"
|
||||
'';
|
||||
});
|
||||
})
|
||||
|
|
@ -2,8 +2,6 @@ let
|
|||
# Remember to pass '--identity identities/me.txt` when using this key
|
||||
users.me = "age1yubikey1qdwgvfqrcqmyw56ux7azuvqr6f8nanszu27nztvxmn4utmplgxctzt90g25";
|
||||
|
||||
tmp = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICJ7IsNxP/wa3X8isEp8Js7yVgk3gX2ud7EClvZClDpS";
|
||||
|
||||
machines = {
|
||||
gospel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGDzjXVoQEfO9JIcFbp56EvQ0oBdr9Cmhxp4z0ih+ZEZ";
|
||||
node = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIETLBnc8kJokmFiA28BaSYpeE7flY1W0SM5C1pWv/tOv";
|
||||
|
|
@ -72,14 +70,4 @@ in
|
|||
machines.pi4
|
||||
machines.gospel
|
||||
];
|
||||
"zigbee2mqtt_mqtt.age".publicKeys = [
|
||||
users.me
|
||||
tmp
|
||||
machines.pi4
|
||||
];
|
||||
"zigbee2mqtt_creds.age".publicKeys = [
|
||||
users.me
|
||||
tmp
|
||||
machines.node
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
age-encryption.org/v1
|
||||
-> piv-p256 UIEGzg Ai9Ksp5u8wvOwiHy2wyH97mm6Pf0rcbuB4R8wotlG6xR
|
||||
REDbwR5Kqc2Y10j9HnPlHEqOORVMnlhTH/JySz7nVDo
|
||||
-> ssh-ed25519 PZKfOQ N2nxHXlO0ZvqbSQLVT1l0ivTxGgkMxsuuO7pMMHzyC8
|
||||
5fSbG09zq6VrFxW4lCQHczvYF8ldfPenl1uEbQZq1g8
|
||||
-> ssh-ed25519 Yk7ehg vtLVcIkOX3SwD64gm9Jlgg+pDpdR920/Aldck5v+oTk
|
||||
J8n4fgLOZ8LA4CFuT3O8+U1b9d7RFlG3P87PMrX3aok
|
||||
--- X/MHaeT+EReR45PXmvXG1p3bFIip2OBva4/X2/GRhxM
|
||||
€ˆs aÜ)ŽŸdùã®OèöýT›8k7ù…ý§àâ ö
h04V¹uûºB/‹U¿Óö5W“>‡Ÿ¸¼à©SäÂh©õØp
2§ ¹G5 hlÌl—ë
|
||||
Binary file not shown.
|
|
@ -66,7 +66,6 @@
|
|||
signal-desktop-bin
|
||||
];
|
||||
|
||||
programs.adb.enable = true;
|
||||
programs.light.enable = true;
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
|
|
|
|||
|
|
@ -62,11 +62,6 @@
|
|||
acmeCertName = "kilonull.com";
|
||||
};
|
||||
|
||||
services.zigbee2mqtt = {
|
||||
enable = true;
|
||||
acmeCertName = "kilonull.com";
|
||||
};
|
||||
|
||||
security.acme = {
|
||||
enable = true;
|
||||
domainName = "kilonull.com";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue