jahanson/mochi
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: jahanson:218d68e1c136813b000eb91f41810443c8414f01
Branches Tags
jahanson:main
jahanson:talos-pxe-bootstrap
jahanson:update_flake_lock_action
jahanson:renovate/lock-file-maintenance
..
compare: jahanson:43ff961b4120e34bccb9b324b8286bf26514e991
Branches Tags
jahanson:main
jahanson:talos-pxe-bootstrap
jahanson:update_flake_lock_action
jahanson:renovate/lock-file-maintenance

No commits in common. "218d68e1c136813b000eb91f41810443c8414f01" and "43ff961b4120e34bccb9b324b8286bf26514e991" have entirely different histories.
218d68e1c1 ... 43ff961b41

8 changed files with 14 additions and 20 deletions
Show stats Expand all files Collapse all files

2
nixos/modules/nixos/editor/default.nix
View file

@ -56,7 +56,7 @@ in
# Enable vscode & addons # Enable vscode & addons
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(vscode-with-extensions.override { (vscode-with-extensions.override {
inherit (unstable) vscode; vscode = unstable.vscode;
# Merge all the extension packages together. # Merge all the extension packages together.
vscodeExtensions = vscodeExtensions =
vscodeCommunityExtensionsPackages ++ nixpkgsExtensionsPackages ++ marketplaceExtensionsPackages; vscodeCommunityExtensionsPackages ++ nixpkgsExtensionsPackages ++ marketplaceExtensionsPackages;

2
nixos/modules/nixos/services/bind/default.nix
View file

@ -26,7 +26,7 @@ in
services.bind = { services.bind = {
enable = true; enable = true;
inherit (cfg) package; inherit (cfg) package;
inherit (cfg) extraConfig; extraConfig = cfg.extraConfig;
}; };
# Clean up journal files # Clean up journal files

2
nixos/modules/nixos/services/haproxy/default.nix
View file

@ -32,7 +32,7 @@ in
services.haproxy = { services.haproxy = {
enable = true; enable = true;
inherit (cfg) package; inherit (cfg) package;
inherit (cfg) config; config = cfg.config;
}; };
}; };
} }

6
nixos/modules/nixos/system/borg/default.nix
View file

@ -27,9 +27,9 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services.borgbackup.jobs."borgbackup" = { services.borgbackup.jobs."borgbackup" = {
inherit (cfg) paths; paths = cfg.paths;
inherit (cfg) exclude; exclude = cfg.exclude;
inherit (cfg) repo; repo = cfg.repo;
encryption = { encryption = {
mode = "repokey-blake2"; mode = "repokey-blake2";
passCommand = "cat ${cfg.repoKeyPath}"; passCommand = "cat ${cfg.repoKeyPath}";

4
nixos/overlays/go/default.nix
View file

@ -2,7 +2,7 @@
let let
finalVersion = "1.22.5"; finalVersion = "1.22.5";
in in
final: prev: { (final: prev: {
go_1_22 = prev.go_1_22.overrideAttrs (oldAttrs: { go_1_22 = prev.go_1_22.overrideAttrs (oldAttrs: {
version = finalVersion; version = finalVersion;
src = prev.fetchurl { src = prev.fetchurl {
@ -10,4 +10,4 @@ final: prev: {
hash = "sha256-rJxyPyJJaa7mJLw0/TTJ4T8qIS11xxyAfeZEu0bhEvY="; hash = "sha256-rJxyPyJJaa7mJLw0/TTJ4T8qIS11xxyAfeZEu0bhEvY=";
}; };
}); });
} })

4
nixos/overlays/talosctl/default.nix
View file

@ -2,7 +2,7 @@
let let
finalVersion = "1.7.5"; finalVersion = "1.7.5";
in in
final: prev: { (final: prev: {
talosctl = prev.talosctl.overrideAttrs (oldAttrs: { talosctl = prev.talosctl.overrideAttrs (oldAttrs: {
version = finalVersion; version = finalVersion;
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
@ -16,4 +16,4 @@ final: prev: {
updateScript = ./update.sh; updateScript = ./update.sh;
}; };
}); });
} })

8
nixos/overlays/warp-terminal/default.nix
View file

@ -2,12 +2,12 @@
let let
versions = lib.importJSON ./versions.json; versions = lib.importJSON ./versions.json;
in in
final: prev: { (final: prev: {
warp-terminal = prev.warp-terminal.overrideAttrs (oldAttrs: { warp-terminal = prev.warp-terminal.overrideAttrs (oldAttrs: {
inherit (versions.linux) version; version = versions.linux.version;
src = prev.fetchurl { src = prev.fetchurl {
url = "https://releases.warp.dev/stable/v${versions.linux.version}/warp-terminal-v${versions.linux.version}-1-x86_64.pkg.tar.zst"; url = "https://releases.warp.dev/stable/v${versions.linux.version}/warp-terminal-v${versions.linux.version}-1-x86_64.pkg.tar.zst";
inherit (versions.linux) hash; hash = versions.linux.hash;
}; };
}); });
} })

6
statix.toml
View file

@ -1,6 +0,0 @@
disabled = [
"empty_pattern"
]
nix_version = '2.4'
ignore = ['.direnv']