julian/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Fix recursion on self
Some checks failed
Update Nix Flake / update-flake (push) Failing after 12s
Details

Browse Source
This commit is contained in:
Julian Mutter
2026-03-23 21:57:18 +01:00
parent 8896788bfd
commit 64392b695e
7 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
features-nixos/global/sops.nix
View File

@@ -1,5 +1,5 @@
{ {
self, pwd,
inputs, inputs,
config, config,
... ...
@@ -19,5 +19,5 @@ in {
generateKey = false; # TODO: building should not work without secrets!? generateKey = false; # TODO: building should not work without secrets!?
}; };
sops.defaultSopsFile = "${self}/hosts/secrets-common.yaml"; sops.defaultSopsFile = "${pwd}/hosts/secrets-common.yaml";
} }

6
features-nixos/users/julian/default.nix
View File

@@ -1,5 +1,5 @@
{ {
self, pwd,
pkgs, pkgs,
config, config,
lib, lib,
@@ -41,11 +41,11 @@ in {
}; };
sops.secrets.julian-password = { sops.secrets.julian-password = {
sopsFile = ../../secrets.yaml; sopsFile = "${pwd}/hosts/secrets-common.yaml";
neededForUsers = true; neededForUsers = true;
}; };
home-manager.users.julian = import "${self}/homes/julian/${config.networking.hostName}.nix"; home-manager.users.julian = import "${pwd}/homes/julian/${config.networking.hostName}.nix";
security.pam.services.swaylock = {}; # Make swaylock unlocking work security.pam.services.swaylock = {}; # Make swaylock unlocking work
} }

10
flake.nix
View File

@@ -76,10 +76,6 @@
import nixpkgs { import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
config.permittedInsecurePackages = [
"olm-3.2.16"
];
warn-dirty = false;
} }
); );
in { in {
@@ -89,7 +85,6 @@
homeManagerModules = import ./modules/home-manager; homeManagerModules = import ./modules/home-manager;
overlays = import ./overlays {inherit inputs outputs;}; overlays = import ./overlays {inherit inputs outputs;};
# hydraJobs = import ./hydra.nix { inherit inputs outputs; }; # TODO add hydra jobs here?
packages = forEachSystem (pkgs: import ./packages {inherit pkgs;}); packages = forEachSystem (pkgs: import ./packages {inherit pkgs;});
devShells = forEachSystem (pkgs: import ./shell.nix {inherit pkgs;}); devShells = forEachSystem (pkgs: import ./shell.nix {inherit pkgs;});
@@ -103,18 +98,21 @@
]; ];
specialArgs = { specialArgs = {
inherit inputs outputs; inherit inputs outputs;
pwd = "${self}";
}; };
}; };
kardorf = lib.nixosSystem { kardorf = lib.nixosSystem {
modules = [./hosts/kardorf]; modules = [./hosts/kardorf];
specialArgs = { specialArgs = {
inherit inputs outputs; inherit inputs outputs;
pwd = "${self}";
}; };
}; };
builder = lib.nixosSystem { builder = lib.nixosSystem {
modules = [./hosts/builder]; modules = [./hosts/builder];
specialArgs = { specialArgs = {
inherit inputs outputs; inherit inputs outputs;
pwd = "${self}";
}; };
}; };
}; };
@@ -129,6 +127,7 @@
pkgs = pkgsFor.x86_64-linux; pkgs = pkgsFor.x86_64-linux;
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs outputs; inherit inputs outputs;
pwd = "${self}";
}; };
}; };
"julian@quickstart" = lib.homeManagerConfiguration { "julian@quickstart" = lib.homeManagerConfiguration {
@@ -139,6 +138,7 @@
pkgs = pkgsFor.x86_64-linux; pkgs = pkgsFor.x86_64-linux;
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs outputs; inherit inputs outputs;
pwd = "${self}";
}; };
}; };
}; };

34
hosts/aspi/default.nix
View File

@@ -1,28 +1,28 @@
{self, ...}: { {pwd, ...}: {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
"${self}/features-nixos/global" "${pwd}/features-nixos/global"
"${self}/features-nixos/users/julian" "${pwd}/features-nixos/users/julian"
"${self}/features-nixos/optional/binarycaches.nix" "${pwd}/features-nixos/optional/binarycaches.nix"
"${self}/features-nixos/optional/remote-builder.nix" "${pwd}/features-nixos/optional/remote-builder.nix"
"${self}/features-nixos/optional/boot-efi.nix" "${pwd}/features-nixos/optional/boot-efi.nix"
"${self}/features-nixos/optional/greetd.nix" "${pwd}/features-nixos/optional/greetd.nix"
"${self}/features-nixos/optional/authentication.nix" "${pwd}/features-nixos/optional/authentication.nix"
"${self}/features-nixos/optional/pcmanfm.nix" "${pwd}/features-nixos/optional/pcmanfm.nix"
"${self}/features-nixos/optional/pipewire.nix" "${pwd}/features-nixos/optional/pipewire.nix"
"${self}/features-nixos/optional/gamemode.nix" "${pwd}/features-nixos/optional/gamemode.nix"
"${self}/features-nixos/optional/virtualbox.nix" "${pwd}/features-nixos/optional/virtualbox.nix"
"${self}/features-nixos/optional/podman.nix" "${pwd}/features-nixos/optional/podman.nix"
"${self}/features-nixos/optional/wireguard.nix" "${pwd}/features-nixos/optional/wireguard.nix"
"${self}/features-nixos/optional/wireshark.nix" "${pwd}/features-nixos/optional/wireshark.nix"
"${self}/features-nixos/optional/flatpak.nix" "${pwd}/features-nixos/optional/flatpak.nix"
"${self}/features-nixos/optional/avahi.nix" "${pwd}/features-nixos/optional/avahi.nix"
]; ];
networking.hostName = "aspi"; networking.hostName = "aspi";

14
hosts/builder/default.nix
View File

@@ -2,7 +2,7 @@
# or # or
# deploy .#builder # deploy .#builder
{ {
self, pwd,
config, config,
pkgs, pkgs,
... ...
@@ -10,11 +10,11 @@
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
"${self}/features-nixos/global/fish.nix" # fish for admin "${pwd}/features-nixos/global/fish.nix" # fish for admin
"${self}/features-nixos/global/locale.nix" "${pwd}/features-nixos/global/locale.nix"
"${self}/features-nixos/global/nix.nix" "${pwd}/features-nixos/global/nix.nix"
"${self}/features-nixos/global/sops.nix" "${pwd}/features-nixos/global/sops.nix"
"${self}/features-nixos/global/root.nix" "${pwd}/features-nixos/global/root.nix"
]; ];
networking.hostName = "builder"; networking.hostName = "builder";
@@ -177,7 +177,7 @@
minimumDiskFreeEvaluator = 4; # in GB minimumDiskFreeEvaluator = 4; # in GB
}; };
# add builder itself as build machine so system emulation is properly supported # add builder itpwd as build machine so system emulation is properly supported
# nix.distributedBuilds = true; # nix.distributedBuilds = true;
nix.buildMachines = [ nix.buildMachines = [
{ {

32
hosts/kardorf/default.nix
View File

@@ -1,31 +1,31 @@
{ {
self, pwd,
pkgs, pkgs,
... ...
}: { }: {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
"${self}/features-nixos/global" "${pwd}/features-nixos/global"
"${self}/features-nixos/users/julian" "${pwd}/features-nixos/users/julian"
"${self}/features-nixos/users/wolfi" "${pwd}/features-nixos/users/wolfi"
"${self}/features-nixos/optional/binarycaches.nix" "${pwd}/features-nixos/optional/binarycaches.nix"
"${self}/features-nixos/optional/remote-builder.nix" "${pwd}/features-nixos/optional/remote-builder.nix"
"${self}/features-nixos/optional/boot-efi.nix" "${pwd}/features-nixos/optional/boot-efi.nix"
"${self}/features-nixos/optional/greetd.nix" "${pwd}/features-nixos/optional/greetd.nix"
"${self}/features-nixos/optional/authentication.nix" "${pwd}/features-nixos/optional/authentication.nix"
"${self}/features-nixos/optional/pcmanfm.nix" "${pwd}/features-nixos/optional/pcmanfm.nix"
"${self}/features-nixos/optional/pipewire.nix" "${pwd}/features-nixos/optional/pipewire.nix"
"${self}/features-nixos/optional/openssh.nix" "${pwd}/features-nixos/optional/openssh.nix"
"${self}/features-nixos/optional/virtualbox.nix" "${pwd}/features-nixos/optional/virtualbox.nix"
"${self}/features-nixos/optional/podman.nix" "${pwd}/features-nixos/optional/podman.nix"
"${self}/features-nixos/optional/wireshark.nix" "${pwd}/features-nixos/optional/wireshark.nix"
"${self}/features-nixos/optional/flatpak.nix" "${pwd}/features-nixos/optional/flatpak.nix"
]; ];
networking.hostName = "kardorf"; networking.hostName = "kardorf";

2
overlays/default.nix
View File

@@ -22,7 +22,7 @@
}; };
# Adds my custom packages, available as pkgs.frajul.xyz # Adds my custom packages, available as pkgs.frajul.xyz
my-pkgs = final: prev: {frajul = import ../pkgs {pkgs = final;};}; frajul-pkgs = final: prev: {frajul = import ../packages {pkgs = final;};};
nixpkgs-stable-unstable = final: prev: { nixpkgs-stable-unstable = final: prev: {
unstable = import inputs.nixpkgs-unstable { unstable = import inputs.nixpkgs-unstable {