cleanup, deadnix, format

This commit is contained in:
Grisha Shipunov 2025-05-27 10:17:27 +02:00
parent 6ffe2d49ee
commit 7223ca43a7
5 changed files with 29 additions and 37 deletions

View file

@ -54,7 +54,6 @@
outputs =
inputs@{
authentik-nix,
lanzaboote,
lix-module,
microvm,
@ -79,7 +78,9 @@
"immich"
];
microvm-builder = (nixpkgs-ver: vm-list: builtins.listToAttrs (
microvm-builder = (
nixpkgs-ver: vm-list:
builtins.listToAttrs (
map (vm: {
name = vm;
value = nixpkgs-ver.lib.nixosSystem {
@ -95,8 +96,10 @@
];
};
}) vm-list
));
microvms = (microvm-builder nixpkgs microvm-stable-list)
)
);
microvms =
(microvm-builder nixpkgs microvm-stable-list)
// (microvm-builder nixpkgs-unstable microvm-unstable-list);
in
microvms

View file

@ -1,4 +1,4 @@
{ self, ... }:
{ ... }:
let
proxy-conf = ''
client_max_body_size 50M;

View file

@ -65,9 +65,7 @@
let
editorconf =
if config.services.emacs.defaultEditor then
{
EDITOR = "emacsclient";
}
{ }
else
{
EDITOR = "nvim";

View file

@ -1,6 +1,4 @@
{
lib,
config,
pkgs,
...
}:
@ -14,15 +12,8 @@
};
};
# integrate fzf into shell, >23.05 only
programs =
with lib;
if (toInt (elemAt (splitVersion config.system.nixos.release) 0) >= 23) then
{
fzf = {
programs.fzf = {
keybindings = true;
fuzzyCompletion = true;
};
}
else
{ };
}

View file

@ -12,7 +12,7 @@
environment.systemPackages =
let
xwayland-satellite-git = pkgs.xwayland-satellite.overrideAttrs (
final: prev: {
final: _prev: {
version = "git";
cargoHash = "sha256-MaF2FyR3HvQAKkZKa8OO/5jbO64/Ncv7+JqHda4jN50=";
src = pkgs.fetchFromGitHub {