phundrak/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(flake): update flake lock, remove devenv input

Browse Source
This commit is contained in:
Lucien Cartier-Tilet
2026-03-29 13:32:19 +02:00
parent 3525ca37bf
commit b321172044
4 changed files with 168 additions and 943 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.envrc
View File

@@ -1,11 +1,7 @@
# -*- mode: sh; -*- # -*- mode: sh; -*-
if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
fi
watch_file flake.nix watch_file flake.nix
watch_file flake.lock watch_file flake.lock
if ! use flake . --no-pure-eval if ! use flake . --no-pure-eval
then then
echo "devenv could not be built. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2 echo "dev shell could not be built. The environment was not loaded. Make the necessary changes to flake.nix and hit enter to try again." >&2
fi fi

894
flake.lock generated
View File

File diff suppressed because it is too large Load Diff

206
flake.nix
View File

@@ -3,11 +3,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
devenv = {
url = "github:cachix/devenv";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
@@ -82,119 +78,101 @@
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
flake-utils,
home-manager, home-manager,
devenv,
srvos, srvos,
... ...
} @ inputs: let } @ inputs:
inherit (self) outputs; flake-utils.lib.eachDefaultSystem (
system = "x86_64-linux"; system: let
pkgs = nixpkgs.legacyPackages.${system}; inherit (self) outputs;
in { pkgs = nixpkgs.legacyPackages.${system};
formatter.${system} = pkgs.alejandra; in {
formatter = pkgs.alejandra;
devShells.default = pkgs.mkShell {
buildInputs = [pkgs.nh];
};
packages.${system} = { packages = {
devenv-up = self.devShells.${system}.default.config.procfileScript; homeConfigurations = let
devenv-test = self.devShells.${system}.default.config.test; extraSpecialArgs = {inherit inputs outputs system;};
}; pkgs = nixpkgs.legacyPackages.x86_64-linux;
defaultUserModules = [
devShells.${system}.default = devenv.lib.mkShell { inputs.sops-nix.homeManagerModules.sops
inherit inputs pkgs; inputs.spicetify.homeManagerModules.default
modules = [ inputs.caelestia-shell.homeManagerModules.default
( ];
{pkgs, ...}: { withUserModules = modules: nixpkgs.lib.lists.flatten (defaultUserModules ++ [modules]);
packages = [pkgs.nh]; in {
git-hooks.hooks = { "phundrak@alys" = home-manager.lib.homeManagerConfiguration {
alejandra.enable = true; inherit extraSpecialArgs pkgs;
commitizen.enable = true; modules = withUserModules ./users/phundrak/host/alys.nix;
detect-private-keys.enable = true;
end-of-file-fixer.enable = true;
deadnix.enable = true;
ripsecrets.enable = true;
statix.enable = true;
}; };
} "creug@elcafe" = home-manager.lib.homeManagerConfiguration {
) inherit extraSpecialArgs pkgs;
]; modules = withUserModules ./users/creug/host/elcafe.nix;
}; };
"phundrak@elcafe" = home-manager.lib.homeManagerConfiguration {
inherit extraSpecialArgs pkgs;
modules = withUserModules ./users/phundrak/host/elcafe.nix;
};
"phundrak@gampo" = home-manager.lib.homeManagerConfiguration {
inherit extraSpecialArgs pkgs;
modules = withUserModules ./users/phundrak/host/marpa.nix;
};
"phundrak@marpa" = home-manager.lib.homeManagerConfiguration {
inherit extraSpecialArgs pkgs;
modules = withUserModules ./users/phundrak/host/marpa.nix;
};
"phundrak@NaroMk3" = home-manager.lib.homeManagerConfiguration {
inherit extraSpecialArgs pkgs;
modules = withUserModules ./users/phundrak/host/naromk3.nix;
};
"phundrak@tilo" = home-manager.lib.homeManagerConfiguration {
inherit extraSpecialArgs pkgs;
modules = withUserModules ./users/phundrak/host/tilo.nix;
};
};
homeConfigurations = let nixosConfigurations = let
extraSpecialArgs = {inherit inputs outputs system;}; specialArgs = {inherit inputs outputs;};
pkgs = nixpkgs.legacyPackages.x86_64-linux; defaultSystemModules = [
defaultUserModules = [ inputs.sops-nix.nixosModules.sops
inputs.sops-nix.homeManagerModules.sops inputs.copyparty.nixosModules.default
inputs.spicetify.homeManagerModules.default ];
inputs.caelestia-shell.homeManagerModules.default withSystemModules = modules: nixpkgs.lib.lists.flatten (defaultSystemModules ++ [modules]);
]; in {
withUserModules = modules: nixpkgs.lib.lists.flatten (defaultUserModules ++ [modules]); alys = nixpkgs.lib.nixosSystem {
in { inherit specialArgs;
"phundrak@alys" = home-manager.lib.homeManagerConfiguration { modules = withSystemModules ./hosts/alys/configuration.nix;
inherit extraSpecialArgs pkgs; };
modules = withUserModules ./users/phundrak/host/alys.nix; elcafe = nixpkgs.lib.nixosSystem {
}; inherit specialArgs;
"creug@elcafe" = home-manager.lib.homeManagerConfiguration { modules = withSystemModules ./hosts/elcafe/configuration.nix;
inherit extraSpecialArgs pkgs; };
modules = withUserModules ./users/creug/host/elcafe.nix; gampo = nixpkgs.lib.nixosSystem {
}; inherit specialArgs;
"phundrak@elcafe" = home-manager.lib.homeManagerConfiguration { modules = withSystemModules ./hosts/gampo/configuration.nix;
inherit extraSpecialArgs pkgs; };
modules = withUserModules ./users/phundrak/host/elcafe.nix; marpa = nixpkgs.lib.nixosSystem {
}; inherit specialArgs;
"phundrak@gampo" = home-manager.lib.homeManagerConfiguration { modules = withSystemModules ./hosts/marpa/configuration.nix;
inherit extraSpecialArgs pkgs; };
modules = withUserModules ./users/phundrak/host/marpa.nix; NaroMk3 = nixpkgs.lib.nixosSystem {
}; inherit specialArgs;
"phundrak@marpa" = home-manager.lib.homeManagerConfiguration { modules = withSystemModules [
inherit extraSpecialArgs pkgs; srvos.nixosModules.server
modules = withUserModules ./users/phundrak/host/marpa.nix; srvos.nixosModules.hardware-hetzner-cloud
}; srvos.nixosModules.mixins-terminfo
"phundrak@NaroMk3" = home-manager.lib.homeManagerConfiguration { ./hosts/naromk3/configuration.nix
inherit extraSpecialArgs pkgs; ];
modules = withUserModules ./users/phundrak/host/naromk3.nix; };
}; tilo = nixpkgs.lib.nixosSystem {
"phundrak@tilo" = home-manager.lib.homeManagerConfiguration { inherit specialArgs;
inherit extraSpecialArgs pkgs; modules = withSystemModules ./hosts/tilo/configuration.nix;
modules = withUserModules ./users/phundrak/host/tilo.nix; };
}; };
}; };
}
nixosConfigurations = let );
specialArgs = {inherit inputs outputs;};
defaultSystemModules = [
inputs.sops-nix.nixosModules.sops
inputs.copyparty.nixosModules.default
];
withSystemModules = modules: nixpkgs.lib.lists.flatten (defaultSystemModules ++ [modules]);
in {
alys = nixpkgs.lib.nixosSystem {
inherit specialArgs;
modules = withSystemModules ./hosts/alys/configuration.nix;
};
elcafe = nixpkgs.lib.nixosSystem {
inherit specialArgs;
modules = withSystemModules ./hosts/elcafe/configuration.nix;
};
gampo = nixpkgs.lib.nixosSystem {
inherit specialArgs;
modules = withSystemModules ./hosts/gampo/configuration.nix;
};
marpa = nixpkgs.lib.nixosSystem {
inherit specialArgs;
modules = withSystemModules ./hosts/marpa/configuration.nix;
};
NaroMk3 = nixpkgs.lib.nixosSystem {
inherit specialArgs;
modules = withSystemModules [
srvos.nixosModules.server
srvos.nixosModules.hardware-hetzner-cloud
srvos.nixosModules.mixins-terminfo
./hosts/naromk3/configuration.nix
];
};
tilo = nixpkgs.lib.nixosSystem {
inherit specialArgs;
modules = withSystemModules ./hosts/tilo/configuration.nix;
};
};
};
} }

5
users/modules/dev/vcs/git.nix
View File

@@ -128,7 +128,10 @@ in {
"dist/" "dist/"
]; ];
signing = { signing = {
format = if cfg.publicKeyFile != null then "ssh" else "openpgp"; format =
if cfg.publicKeyFile != null
then "ssh"
else "openpgp";
key = cfg.publicKeyFile; key = cfg.publicKeyFile;
signByDefault = true; signByDefault = true;
}; };