steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

chore: bump and reconfigure treefmt-nix, include just fmt

Browse source
This commit is contained in:
steveej 2025-02-14 16:46:28 +01:00
parent e658e27576
commit c0daa9e6e9
13 changed files with 419 additions and 407 deletions
Download patch file Download diff file Expand all files Collapse all files

10
nix/devShells.nix
View file

@ -93,11 +93,11 @@
self.nixosConfigurations.sj-srv1.config.containers.webserver.config.services.kanidm.serverSettings.origin;
shellHook = builtins.concatStringsSep "\n" [
(self.inputs.nixago.lib.${pkgs.system}.make {
data = self'.formatter.settings;
output = "treefmt.toml";
format = "toml";
}).shellHook
# (self.inputs.nixago.lib.${pkgs.system}.make {
# data = self'.formatter.settings;
# output = "treefmt.toml";
# format = "toml";
# }).shellHook
];
};
}

15
nix/home-manager/programs/firefox.nix
View file

@ -162,7 +162,10 @@ let
"devtools.debugger.remote-enabled" = true;
# disable translations for some languages
"browser.translations.neverTranslateLanguages" = ["en" "de"];
"browser.translations.neverTranslateLanguages" = [
"en"
"de"
];
"browser.translations.automaticallyPopup" = false;
# enable pipewire (and libcamera) sources
@ -300,12 +303,14 @@ let
in
{
nixpkgs.overlays = [
repoFlake.inputs.nur.overlay
repoFlake.inputs.nur.overlay
];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"youtube-recommended-videos"
];
nixpkgs.config.allowUnfreePredicate =
pkg:
builtins.elem (lib.getName pkg) [
"youtube-recommended-videos"
];
programs.librewolf = {
enable = false;

11
nix/os/devices/router0-dmz0/flake.nix
View file

@ -13,12 +13,11 @@
srvos.url = "github:numtide/srvos";
srvos.inputs.nixpkgs.follows = "nixpkgs";
nixos-sbc.url =
"github:nakato/nixos-sbc"
# "github:steveej-forks/nakato_nixos-sbc//bpi-r3_kernel-6.12"
# "github:steveej-forks/nakato_nixos-sbc//bpi-r3_kernel-6.13"
# "github:steveej-forks/nakato_nixos-sbc/kernel-6.9_and_cross-compile"
# "github:steveej-forks/nakato_nixos-sbc/kernel-6.10_and_cross-compile"
nixos-sbc.url = "github:nakato/nixos-sbc"
# "github:steveej-forks/nakato_nixos-sbc//bpi-r3_kernel-6.12"
# "github:steveej-forks/nakato_nixos-sbc//bpi-r3_kernel-6.13"
# "github:steveej-forks/nakato_nixos-sbc/kernel-6.9_and_cross-compile"
# "github:steveej-forks/nakato_nixos-sbc/kernel-6.10_and_cross-compile"
# "git+file:///home/steveej/src/others/nakato_nixos-sbc/"
;
nixos-sbc.inputs.nixpkgs.follows = "nixpkgs";

1
nix/os/devices/steveej-x13s/configuration.nix
View file

@ -6,7 +6,6 @@
config,
nodeName,
system,
packages',
...
}:
{

9
nix/os/devices/steveej-x13s/flake.nix
View file

@ -15,8 +15,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nixos-x13s.url =
"git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?ref=bump"
nixos-x13s.url = "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?ref=bump"
# 6.13-rc2
# "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?ref=bump&rev=c95058f8aa1b361df3874429c5dc0f694f9cba78"
# 6.11.0
@ -89,8 +88,10 @@
inherit mkNixosConfiguration;
};
overlays.default = _final: _previous: {
};
overlays.default =
_final: _previous:
{
};
nixosConfigurations = {
native = mkNixosConfiguration { system = nativeSystem; };

2
nix/os/profiles/install-medium/iso/Justfile
View file

@ -1,2 +1,2 @@
build:
nix-build '<nixpkgs/nixos>' -A config.system.build.isoImage -I nixos-config=iso.nix
nix-build '<nixpkgs/nixos>' -A config.system.build.isoImage -I nixos-config=iso.nix