Now it actually builds

This commit is contained in:
Christopher Mühl 2026-01-06 01:49:00 +01:00
parent d976ee0035
commit 308ec3fb32
No known key found for this signature in database
GPG key ID: 925AC7D69955293F
13 changed files with 72 additions and 377 deletions

View file

@ -1,7 +1,4 @@
# ++ 42_Mo: Molybdenum
#
# MacBook Pro work environment
{self, ...}: {
{...}: {
system.stateVersion = 5;
elements = {

View file

@ -7,7 +7,7 @@
#!/usr/bin/env bash
ORG="hausgold"
OUTPUT_FILE="/home/christopher/.gh/$ORG-repos"
OUTPUT_FILE="/home/toph/.gh/$ORG-repos"
TOKEN=$(cat ${config.age.secrets.repoUpdatePAT.path})
API_URL="https://api.github.com/orgs/$ORG/repos"

View file

@ -26,13 +26,13 @@
bold_font = "family='MonaspiceNe Nerd Font' style='Bold'";
};
home.file.".local/share/fonts" = {
# This includes FontAwesome and other proprietary fonts which are licensed,
# so I have to download them from a private repository
source = builtins.fetchGit {
url = "git@github.com:padarom/fonts.git";
rev = "2defdedf6642865648c8e57b3851a77ac0ae2d7b";
};
recursive = true;
};
# home.file.".local/share/fonts" = {
# # This includes FontAwesome and other proprietary fonts which are licensed,
# # so I have to download them from a private repository
# source = builtins.fetchGit {
# url = "git@github.com:padarom/fonts.git";
# rev = "2defdedf6642865648c8e57b3851a77ac0ae2d7b";
# };
# recursive = true;
# };
}

View file

@ -24,7 +24,7 @@
]
++ (import ./config.nix all);
#.kitty.enable = true;
elements.kitty.enable = true;
services = {
activitywatch = {

View file

@ -4,7 +4,7 @@
...
}: {
home.packages = with pkgs; [
inputs.affinity-nix.packages.${pkgs.stdenv.hostPlatform.system}.v3 # adobe suite replacement
#inputs.affinity-nix.packages.${pkgs.stdenv.hostPlatform.system}.v3 # adobe suite replacement
gmic # greyc's magic
krita

View file

@ -29,7 +29,7 @@
enable = true;
settings = {
PasswordAuthentication = false;
AllowUsers = ["christopher"];
AllowUsers = ["toph"];
};
};

View file

@ -47,7 +47,7 @@
};
programs = {
weylus.users = ["christopher"];
weylus.users = ["toph"];
dconf.enable = true;
@ -67,7 +67,7 @@
enable = true;
# Certain features, including CLI integration and system authentication support,
# require enabling PolKit integration on some desktop environments (e.g. Plasma).
polkitPolicyOwners = ["christopher"];
polkitPolicyOwners = ["toph"];
};
};

388
flake.lock generated
View file

@ -1,31 +1,5 @@
{
"nodes": {
"affinity-nix": {
"inputs": {
"elemental-wine-source": "elemental-wine-source",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"git-hooks": "git-hooks",
"nixpkgs": "nixpkgs_2",
"nixpkgs-wine": "nixpkgs-wine",
"on-linux": "on-linux",
"plugin-loader": "plugin-loader",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1763155533,
"narHash": "sha256-/oz0XxqBTOe9Bk7MsPYs73+Ajto051/WneYbyg/+5nU=",
"owner": "mrshmllow",
"repo": "affinity-nix",
"rev": "fe613cf7ee29d5344dfdead3fc779b45fb578015",
"type": "github"
},
"original": {
"owner": "mrshmllow",
"repo": "affinity-nix",
"type": "github"
}
},
"agenix": {
"inputs": {
"darwin": "darwin",
@ -52,12 +26,12 @@
"agenix-rekey": {
"inputs": {
"devshell": "devshell",
"flake-parts": "flake-parts_2",
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
],
"pre-commit-hooks": "pre-commit-hooks",
"treefmt-nix": "treefmt-nix_2"
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1749289693,
@ -143,8 +117,8 @@
},
"community-solid-server": {
"inputs": {
"flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_4"
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1767157894,
@ -205,8 +179,8 @@
},
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat_4",
"nixpkgs": "nixpkgs_5",
"flake-compat": "flake-compat_2",
"nixpkgs": "nixpkgs_2",
"utils": "utils"
},
"locked": {
@ -279,25 +253,6 @@
"type": "github"
}
},
"elemental-wine-source": {
"flake": false,
"locked": {
"host": "gitlab.winehq.org",
"lastModified": 1722747031,
"narHash": "sha256-XVhz9p2kgFBoJ376vg8OaFXxcMEjAe9AK1hk0I1rb1Q=",
"owner": "ElementalWarrior",
"repo": "wine",
"rev": "a7c9b19e1a26cf49c63a7c19189a3e2bbe2c6ac2",
"type": "gitlab"
},
"original": {
"host": "gitlab.winehq.org",
"owner": "ElementalWarrior",
"ref": "affinity-photo3-wine9.13-part3",
"repo": "wine",
"type": "gitlab"
}
},
"firefox-gnome-theme": {
"flake": false,
"locked": {
@ -315,35 +270,6 @@
}
},
"flake-compat": {
"locked": {
"lastModified": 1751685974,
"narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
"rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/flake-compat/archive/549f2762aebeff29a2e5ece7a7dc0f955281a1d1.tar.gz?rev=549f2762aebeff29a2e5ece7a7dc0f955281a1d1"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -359,7 +285,7 @@
"type": "github"
}
},
"flake-compat_4": {
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1733328505,
@ -376,24 +302,6 @@
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1760948891,
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"agenix-rekey",
@ -414,9 +322,9 @@
"type": "github"
}
},
"flake-parts_3": {
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1765835352,
@ -432,9 +340,9 @@
"type": "github"
}
},
"flake-parts_4": {
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1767602221,
@ -450,7 +358,7 @@
"type": "github"
}
},
"flake-parts_5": {
"flake-parts_4": {
"inputs": {
"nixpkgs-lib": [
"nur",
@ -471,7 +379,7 @@
"type": "github"
}
},
"flake-parts_6": {
"flake-parts_5": {
"inputs": {
"nixpkgs-lib": [
"stylix",
@ -492,9 +400,9 @@
"type": "github"
}
},
"flake-parts_7": {
"flake-parts_6": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_4"
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
"lastModified": 1765835352,
@ -528,24 +436,6 @@
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flatpak": {
"locked": {
"lastModified": 1739444422,
@ -581,7 +471,7 @@
"git-global-log": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_6"
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1766486364,
@ -597,49 +487,7 @@
"type": "github"
}
},
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat_2",
"gitignore": "gitignore",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1760663237,
"narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"affinity-nix",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"gitignore_2": {
"inputs": {
"nixpkgs": [
"agenix-rekey",
@ -739,7 +587,7 @@
},
"musnix": {
"inputs": {
"nixpkgs": "nixpkgs_7"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1756852730,
@ -759,7 +607,7 @@
"inputs": {
"niri-stable": "niri-stable",
"niri-unstable": "niri-unstable",
"nixpkgs": "nixpkgs_8",
"nixpkgs": "nixpkgs_5",
"nixpkgs-stable": "nixpkgs-stable",
"xwayland-satellite-stable": "xwayland-satellite-stable",
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
@ -813,27 +661,27 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1759070547,
"narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=",
"lastModified": 1767051569,
"narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "647e5c14cbd5067f44ac86b74f014962df460840",
"rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1754788789,
"narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
"lastModified": 1765674936,
"narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
"rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
"type": "github"
},
"original": {
@ -872,21 +720,6 @@
"type": "github"
}
},
"nixpkgs-lib_4": {
"locked": {
"lastModified": 1765674936,
"narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1764831616,
@ -903,71 +736,7 @@
"type": "github"
}
},
"nixpkgs-wine": {
"locked": {
"lastModified": 1735834308,
"narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6df24922a1400241dae323af55f30e4318a6ca65",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6df24922a1400241dae323af55f30e4318a6ca65",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1761672384,
"narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1761236834,
"narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1767051569,
"narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1743014863,
"narHash": "sha256-jAIUqsiN2r3hCuHji80U7NNEafpIMBXiwKlSrjWMlpg=",
@ -983,7 +752,7 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_3": {
"locked": {
"lastModified": 1766309749,
"narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
@ -999,7 +768,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"nixpkgs_4": {
"locked": {
"lastModified": 1756542300,
"narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
@ -1015,7 +784,7 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_5": {
"locked": {
"lastModified": 1764667669,
"narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
@ -1031,7 +800,7 @@
"type": "github"
}
},
"nixpkgs_9": {
"nixpkgs_6": {
"locked": {
"lastModified": 1764983851,
"narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=",
@ -1069,7 +838,7 @@
},
"nur": {
"inputs": {
"flake-parts": "flake-parts_5",
"flake-parts": "flake-parts_4",
"nixpkgs": [
"nixpkgs"
]
@ -1113,58 +882,10 @@
"type": "github"
}
},
"on-linux": {
"flake": false,
"locked": {
"lastModified": 1761925232,
"narHash": "sha256-OaSqV9bTTpui4QtmiFszOaInJEyAmL469VQL6lU0lwA=",
"owner": "seapear",
"repo": "AffinityOnLinux",
"rev": "3cb7cdf8bfc56b630d91355e416616ba3835453c",
"type": "github"
},
"original": {
"owner": "seapear",
"repo": "AffinityOnLinux",
"type": "github"
}
},
"ovos": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"dirtyRev": "60887a8ec4d6a49e95f3eed9bfe64ca5e47f907b-dirty",
"dirtyShortRev": "60887a8-dirty",
"lastModified": 1766532301,
"narHash": "sha256-U5Yisb+8bYqacQfW1I4JYf6jsquSPsJqZL+sdHcGAN4=",
"type": "git",
"url": "file:///home/christopher/workspaces/mine/ovos-flake"
},
"original": {
"type": "git",
"url": "file:///home/christopher/workspaces/mine/ovos-flake"
}
},
"plugin-loader": {
"flake": false,
"locked": {
"narHash": "sha256-CCqT6TQHG7HqvxsnP/EC9Mg6A3KfNg5i/vGXW0exTxU=",
"type": "file",
"url": "https://github.com/noahc3/AffinityPluginLoader/releases/latest/download/affinitypluginloader-plus-winefix.tar.xz"
},
"original": {
"type": "file",
"url": "https://github.com/noahc3/AffinityPluginLoader/releases/latest/download/affinitypluginloader-plus-winefix.tar.xz"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_3",
"gitignore": "gitignore_2",
"flake-compat": "flake-compat",
"gitignore": "gitignore",
"nixpkgs": [
"agenix-rekey",
"nixpkgs"
@ -1186,7 +907,6 @@
},
"root": {
"inputs": {
"affinity-nix": "affinity-nix",
"agenix": "agenix",
"agenix-rekey": "agenix-rekey",
"community-solid-server": "community-solid-server",
@ -1194,17 +914,16 @@
"deploy-rs": "deploy-rs",
"disko": "disko",
"easy-hosts": "easy-hosts",
"flake-parts": "flake-parts_4",
"flake-parts": "flake-parts_3",
"flatpak": "flatpak",
"git-global-log": "git-global-log",
"home-manager": "home-manager_2",
"master": "master",
"musnix": "musnix",
"niri": "niri",
"nixpkgs": "nixpkgs_9",
"nixpkgs": "nixpkgs_6",
"noctalia": "noctalia",
"nur": "nur",
"ovos": "ovos",
"stylix": "stylix",
"unstable": "unstable",
"waka-victoriametrics": "waka-victoriametrics"
@ -1217,13 +936,13 @@
"base16-helix": "base16-helix",
"base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-parts": "flake-parts_6",
"flake-parts": "flake-parts_5",
"gnome-shell": "gnome-shell",
"nixpkgs": [
"nixpkgs"
],
"nur": "nur_2",
"systems": "systems_5",
"systems": "systems_4",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
@ -1304,21 +1023,6 @@
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-foot": {
"flake": false,
"locked": {
@ -1401,24 +1105,6 @@
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1761311587,
"narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"agenix-rekey",
@ -1475,7 +1161,7 @@
},
"waka-victoriametrics": {
"inputs": {
"flake-parts": "flake-parts_7",
"flake-parts": "flake-parts_6",
"nixpkgs": [
"nixpkgs"
]

View file

@ -47,7 +47,7 @@
inputs.nixpkgs.follows = "unstable";
};
affinity-nix.url = "github:mrshmllow/affinity-nix";
# affinity-nix.url = "github:mrshmllow/affinity-nix";
musnix.url = "github:musnix/musnix";
flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
git-global-log.url = "github:tophcodes/git-global-log";
@ -60,10 +60,10 @@
};
# Custom
ovos = {
url = "git+file:///home/christopher/workspaces/mine/ovos-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
# ovos = {
# url = "git+file:///home/christopher/workspaces/mine/ovos-flake";
# inputs.nixpkgs.follows = "nixpkgs";
# };
waka-victoriametrics = {
url = "git+file:///home/christopher/workspaces/mine/waka-victoriametrics";
inputs.nixpkgs.follows = "nixpkgs";

View file

@ -1,4 +1,4 @@
{
{ pkgs, ... }: {
# the `modules/generic` folder is generic only across nixos and darwin, not
# across home manager. home modules are in `modules/home`
imports = [
@ -6,4 +6,13 @@
./profiles.nix
./secrets.nix
];
environment.systemPackages = with pkgs; [
pre-commit
git
gitleaks
just
nh
age
];
}

View file

@ -5,7 +5,7 @@
];
home = {
stateVersion = "23.11";
stateVersion = "25.11";
enableNixpkgsReleaseCheck = false;
};

View file

@ -1,6 +1,8 @@
{...}: {
imports = [
./secrets.nix
./common
./gui
];
# no need to ever change this

View file

@ -27,6 +27,7 @@
users = {
users.toph = {
isNormalUser = true;
initialPassword = "wheel";
# hashedPasswordFile = config.age.secrets.tophPassword.path;
shell = pkgs.fish;