tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: tristan:7a80125c4cd6c7cb10113c3b0b4564996e52ab1c
Branches Tags
tristan:main
..
compare: tristan:a8e2a3aeff5d60a564ec490b395a7d032cf3ef77
Branches Tags
tristan:main

No commits in common. "7a80125c4cd6c7cb10113c3b0b4564996e52ab1c" and "a8e2a3aeff5d60a564ec490b395a7d032cf3ef77" have entirely different histories.
7a80125c4c ... a8e2a3aeff

5 changed files with 56 additions and 77 deletions
Show stats Expand all files Collapse all files

121
flake.lock generated
View file

@ -151,11 +151,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744664754, "lastModified": 1743711701,
"narHash": "sha256-xfHUAfPVYp+zD0sOg9KMNEHBj8O06G7xHgDgNQ2Q1lw=", "narHash": "sha256-8gNZoO5wAF/cArOqtjMh6dESs1xrTV4h9XFl5m/CHqA=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "1039f51626c6079da063cda3116e7ae0daf2f909", "rev": "1e9e28d19c4f92a7f43c9ff5eabfab0e332e7f22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,11 +227,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744145203, "lastModified": 1743598667,
"narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -334,11 +334,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1744618085, "lastModified": 1742452566,
"narHash": "sha256-+VdhZsIiIDtyOL88c4U/Os1PsCMLOCyScIeWL4hxJRM=", "narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "a85d390a5607188dca2dbc39b5b37571651d69ce", "rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -708,11 +708,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744648917, "lastModified": 1743660830,
"narHash": "sha256-xtBc0YMCP/x3+3iqnfdd4d9qEHvxQsGHamhhlegsGFE=", "narHash": "sha256-ezJqPIuB25iMJeugwHKWnB1DjMvrdpkrPxE3TCULjGk=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "66c4c9dccd26330ebb0e91aa6ba89ca8835dfdc5", "rev": "c7ade1c8fe2bdb70d38b3b9a97b874dcaf33b755",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -828,22 +828,6 @@
"type": "github" "type": "github"
} }
}, },
"md-roam": {
"flake": false,
"locked": {
"lastModified": 1740768673,
"narHash": "sha256-Ouh2T37vLfBmQywz1afO89uhJJFl4Sip3PAiYzI54oM=",
"owner": "nobiot",
"repo": "md-roam",
"rev": "56f503491b081f4ed52586139d318690c0717766",
"type": "github"
},
"original": {
"owner": "nobiot",
"repo": "md-roam",
"type": "github"
}
},
"nano-emacs": { "nano-emacs": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -873,11 +857,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744704014, "lastModified": 1742038403,
"narHash": "sha256-UGq8nYSq/feyP0bUjd88jHXA7wJMaSPbtRByp7ZOD30=", "narHash": "sha256-mzZdujmFWC+wHRvm0tKUlXL0LLz3YI3EDUCnFCtzgxY=",
"owner": "thiagokokada", "owner": "thiagokokada",
"repo": "nix-alien", "repo": "nix-alien",
"rev": "9b92bd3b3d54e02aa0b1881af435802567c2dca9", "rev": "876d83ac35fc52145674282f87898824182edc48",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -899,7 +883,6 @@
], ],
"hs-to-coq": "hs-to-coq", "hs-to-coq": "hs-to-coq",
"lean4-mode": "lean4-mode", "lean4-mode": "lean4-mode",
"md-roam": "md-roam",
"nano-emacs": "nano-emacs", "nano-emacs": "nano-emacs",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -913,11 +896,11 @@
"ultra-scroll": "ultra-scroll" "ultra-scroll": "ultra-scroll"
}, },
"locked": { "locked": {
"lastModified": 1744143621, "lastModified": 1743642111,
"narHash": "sha256-IfebEj0cWl/AXfL96S1i2uz3VJRwQJOAM6grJM5SR8k=", "narHash": "sha256-bPWLPoukSroQdeCEZPGuhPJ3G/aQXIpAc+vAuHMp4Pc=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "01911b9097b751d48f9b9b283ac9645d0d0eb0d3", "rev": "550643c6622b04223520f73d32918c7d17f7a120",
"revCount": 64, "revCount": 63,
"type": "git", "type": "git",
"url": "https://codeberg.org/heraplem/nix-emacs-extra" "url": "https://codeberg.org/heraplem/nix-emacs-extra"
}, },
@ -956,11 +939,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744518957, "lastModified": 1743306489,
"narHash": "sha256-RLBSWQfTL0v+7uyskC5kP6slLK1jvIuhaAh8QvB75m4=", "narHash": "sha256-LROaIjSLo347cwcHRfSpqzEOa2FoLSeJwU4dOrGm55E=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "4fc9ea78c962904f4ea11046f3db37c62e8a02fd", "rev": "b3696bfb6c24aa61428839a99e8b40c53ac3a82d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1021,11 +1004,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1744633460, "lastModified": 1743420942,
"narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9a049b4a421076d27fee3eec664a18b2066824cb", "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1041,11 +1024,11 @@
"nixos-unstable": "nixos-unstable" "nixos-unstable": "nixos-unstable"
}, },
"locked": { "locked": {
"lastModified": 1744247568, "lastModified": 1743642538,
"narHash": "sha256-u2k94yjX9RZhvUgKP3sdfra8cAJpRFe6IO8HVjAbsDA=", "narHash": "sha256-3XqdzKyVmpD2a6ogHeEOMjE/k+QrZRaw25TphLDDNb4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-images", "repo": "nixos-images",
"rev": "55f83f47dde5a4457cfefc76c54463e570a67f3c", "rev": "f14aab87fcac7a8e00ff5af83bc8645154d3919a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1056,10 +1039,10 @@
}, },
"nixos-stable": { "nixos-stable": {
"locked": { "locked": {
"lastModified": 1744168086, "lastModified": 1743576891,
"narHash": "sha256-S9M4HddBCxbbX1CKSyDYgZ8NCVyHcbKnBfoUXeRu2jQ=", "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=",
"ref": "nixos-24.11", "ref": "nixos-24.11",
"rev": "60e405b241edb6f0573f3d9f944617fe33ac4a73", "rev": "44a69ed688786e98a101f02b712c313f1ade37ab",
"shallow": true, "shallow": true,
"type": "git", "type": "git",
"url": "https://github.com/NixOS/nixpkgs" "url": "https://github.com/NixOS/nixpkgs"
@ -1073,10 +1056,10 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1744096231, "lastModified": 1743568003,
"narHash": "sha256-kUfx3FKU1Etnua3EaKvpeuXs7zoFiAcli1gBwkPvGSs=", "narHash": "sha256-ZID5T65E8ruHqWRcdvZLsczWDOAWIE7om+vQOREwiX0=",
"ref": "nixpkgs-unstable", "ref": "nixpkgs-unstable",
"rev": "b2b0718004cc9a5bca610326de0a82e6ea75920b", "rev": "b7ba7f9f45c5cd0d8625e9e217c28f8eb6a19a76",
"shallow": true, "shallow": true,
"type": "git", "type": "git",
"url": "https://github.com/NixOS/nixpkgs" "url": "https://github.com/NixOS/nixpkgs"
@ -1150,11 +1133,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1744440957, "lastModified": 1743576891,
"narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "rev": "44a69ed688786e98a101f02b712c313f1ade37ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1198,11 +1181,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1744463964, "lastModified": 1743583204,
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1241,11 +1224,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744782863, "lastModified": 1743719676,
"narHash": "sha256-NBvSCE2MXjK7yCLEMsZ+lrImbuoukLGsJYrWCxemGNM=", "narHash": "sha256-8m//1A4NY/6DsWCicCr6xqFZ+H8ZiZ/qbm67gv6nhNg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e561993c7848eaa7288e16219c62c8d5bbbe81d8", "rev": "38a990eb85757350938e08a7ee6cd5ca0bd9a9e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1436,11 +1419,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1744539868, "lastModified": 1742296961,
"narHash": "sha256-NPUnfDAwLD69aKetxjC7lV5ysrvs1IKC0Sy4Zai10Mw=", "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "8365cf853e791c93fa8bc924f031f11949bb1a3c", "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1655,11 +1638,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744707583, "lastModified": 1743677901,
"narHash": "sha256-IPFcShGro/UUp8BmwMBkq+6KscPlWQevZi9qqIwVUWg=", "narHash": "sha256-eWZln+k+L/VHO69tUTzEmgeDWNQNKIpSUa9nqQgBrSE=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "49d05555ccdd2592300099d6a657cc33571f4fe0", "rev": "57dabe2a6255bd6165b2437ff6c2d1f6ee78421a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1711,11 +1694,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1744616059, "lastModified": 1743696590,
"narHash": "sha256-iXsQ//LwnGhQT3vSzslwkSUPuypbfsaGr+hgda5RU2g=", "narHash": "sha256-ydcWFtnW8rzol6Dpp8wplJZ025nbaEGjr1gYwrr2Hog=",
"owner": "winapps-org", "owner": "winapps-org",
"repo": "winapps", "repo": "winapps",
"rev": "3677c878654cc71e396ba6b8a22ba7ac7ebb68e4", "rev": "e5929a134db28cbc28de9e349795f0213798be06",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
home-mods/shell/default.nix
View file

@ -10,7 +10,7 @@ let
doomemacsSrc = builtins.fetchGit { doomemacsSrc = builtins.fetchGit {
url = "https://github.com/doomemacs/doomemacs"; url = "https://github.com/doomemacs/doomemacs";
ref = "master"; ref = "master";
rev = "c6f749e67c13342007f6aeaa4a81e6fdb00f529f"; rev = "466490c252d06f42a9c165f361de74a6e6abad8d";
}; };
neofetchThemesSrc = builtins.fetchGit { neofetchThemesSrc = builtins.fetchGit {
url = "https://github.com/Chick2D/neofetch-themes"; url = "https://github.com/Chick2D/neofetch-themes";

4
os-mods/amdgpu/default.nix
View file

@ -18,9 +18,9 @@
]; ];
chaotic.mesa-git = { chaotic.mesa-git = {
enable = true; enable = false;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
mesa_git.opencl mesa_git.openclmesa
libva-vdpau-driver libva-vdpau-driver
obs-studio-plugins.obs-vaapi # TODO check if obs is enabled obs-studio-plugins.obs-vaapi # TODO check if obs is enabled
gst_all_1.gstreamer gst_all_1.gstreamer

2
os-mods/desktop/gaming.nix
View file

@ -54,7 +54,7 @@
]; ];
# hardware.xone.enable = true; # USB only, not needed ATM, and incompatible with recent kernels, bluetooth FTW # hardware.xone.enable = true; # USB only, not needed ATM, and incompatible with recent kernels, bluetooth FTW
hardware.xpadneo.enable = true; # Wireless # Needed to up to nixos-small to fix # hardware.xpadneo.enable = true; # Wireless # Needed to up to nixos-small to fix
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
hardware.steam-hardware.enable = true; hardware.steam-hardware.enable = true;
} }

4
systems/nixos-fw16/default.nix
View file

@ -212,10 +212,6 @@
192.168.0.180 vewasmb.oekonzept.de 192.168.0.180 vewasmb.oekonzept.de
192.168.0.91 puppet.oekonzept.de 192.168.0.91 puppet.oekonzept.de
100.64.0.1 oekonzept.net 100.64.0.1 oekonzept.net
100.64.0.1 draw.oekonzept.net
100.64.0.1 bw.oekonzept.net
100.64.0.1 passwords.oekonzept.net
100.64.0.1 bitwarden.oekonzept.net
100.64.0.1 camt.oekonzept.net 100.64.0.1 camt.oekonzept.net
100.64.0.1 camt-cbg.oekonzept.net 100.64.0.1 camt-cbg.oekonzept.net
100.64.0.1 camt-eth.oekonzept.net 100.64.0.1 camt-eth.oekonzept.net