Compare commits
8 commits
3281b84379
...
f41fc22c78
Author | SHA1 | Date | |
---|---|---|---|
f41fc22c78 | |||
703a811593 | |||
0121d71974 | |||
2c957085dd | |||
f40363797f | |||
880de276da | |||
44b7725e05 | |||
bdf221e01f |
8 changed files with 177 additions and 36 deletions
60
flake.lock
60
flake.lock
|
@ -193,11 +193,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729099656,
|
||||
"narHash": "sha256-VftVIg7UXTy1bq+tzi1aVYOWl7PQ35IpjW88yMYjjpc=",
|
||||
"lastModified": 1729281548,
|
||||
"narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "d7d57edb72e54891fa67a6f058a46b2bb405663b",
|
||||
"rev": "a6a3179ddf396dfc28a078e2f169354d0c137125",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -217,11 +217,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729217131,
|
||||
"narHash": "sha256-/2wBluheB7gOBsZRjJ0mHGb4JHNtdoyFF3OR2xSQ+dc=",
|
||||
"lastModified": 1729476442,
|
||||
"narHash": "sha256-GCrI052UegxjdNRKfV6JSrn4pbJb7SsbuEOXCYxfLm4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "264b4e4a44a67a42bfc161ee48d9139f3abd8ab0",
|
||||
"rev": "5d488eec63742aca43fb57a6f805ef282294f3a4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -517,11 +517,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729174520,
|
||||
"narHash": "sha256-QxCAdgQdeIOaCiE0Sr23s9lD0+T1b/wuz5pSiGwNrCQ=",
|
||||
"lastModified": 1729459288,
|
||||
"narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "e78cbb20276f09c1802e62d2f77fc93ec32da268",
|
||||
"rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -617,11 +617,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1728729581,
|
||||
"narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=",
|
||||
"lastModified": 1729455275,
|
||||
"narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806",
|
||||
"rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -676,11 +676,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1729044727,
|
||||
"narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=",
|
||||
"lastModified": 1729181673,
|
||||
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "dc2e0028d274394f73653c7c90cc63edbb696be1",
|
||||
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -708,11 +708,11 @@
|
|||
},
|
||||
"nixpkgs-stable_4": {
|
||||
"locked": {
|
||||
"lastModified": 1728156290,
|
||||
"narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=",
|
||||
"lastModified": 1729357638,
|
||||
"narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "17ae88b569bb15590549ff478bab6494dde4a907",
|
||||
"rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -724,11 +724,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1728888510,
|
||||
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
|
||||
"lastModified": 1729256560,
|
||||
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
|
||||
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -823,11 +823,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729218602,
|
||||
"narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=",
|
||||
"lastModified": 1729477859,
|
||||
"narHash": "sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94",
|
||||
"rev": "ada8266712449c4c0e6ee6fcbc442b3c217c79e1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -844,11 +844,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728345710,
|
||||
"narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=",
|
||||
"lastModified": 1729394972,
|
||||
"narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b",
|
||||
"rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -926,11 +926,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729077719,
|
||||
"narHash": "sha256-zayHqZO9gA1U85c4CPvVSnLV8/cBgc2yVrSKWaKeBUs=",
|
||||
"lastModified": 1729242555,
|
||||
"narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "5307ba60125bb024d7e52d71d582eafd511f3fee",
|
||||
"rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -261,6 +261,7 @@
|
|||
dnspyre = pkgs.callPackage ./pkgs/dnspyre { };
|
||||
git-repo-go = pkgs.git-repo-go;
|
||||
hassbridge = pkgs.callPackage ./pkgs/hassbridge { };
|
||||
mapshot = pkgs.mapshot;
|
||||
peakperf = pkgs.callPackage ./pkgs/peakperf { };
|
||||
tinyows = pkgs.callPackage ./pkgs/tinyows { };
|
||||
tsui = pkgs.callPackage ./pkgs/tsui { };
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
river = true;
|
||||
wallpaper = ../../wallpapers/river-2560.png;
|
||||
};
|
||||
guix.enable = true;
|
||||
guix.enable = false;
|
||||
networking = {
|
||||
enable = true;
|
||||
};
|
||||
|
@ -309,6 +309,10 @@
|
|||
DHCP = "yes";
|
||||
IPv6AcceptRA = true;
|
||||
};
|
||||
|
||||
dhcpV4Config = {
|
||||
RouteMetric = 64;
|
||||
};
|
||||
};
|
||||
"40-horus0" = {
|
||||
matchConfig = {
|
||||
|
@ -558,6 +562,10 @@
|
|||
barman-passwords = {
|
||||
owner = "barman";
|
||||
};
|
||||
|
||||
factorio-token = {
|
||||
owner = "erwin";
|
||||
};
|
||||
};
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
|
|
|
@ -6,6 +6,7 @@ renovate_env: ENC[AES256_GCM,data:mzeS0FXsycD4hWMzRMgeEgTY+x2QtYtxmhcFCJcjwlD/q5
|
|||
wireguard-horus-privkey: ENC[AES256_GCM,data:JVhdbvNqfdPWFCg24F56Hmu1Tf/EA6BOqa1uPuu8C/FrJhNaGi4S+KYOook=,iv:z8cq4C5vu/QqJ3UZdL1zEH22Ht3rKSbdHgAQbRSk8Kk=,tag:AVBvV8wJqw5jgDRiES89eQ==,type:str]
|
||||
k3s-token: ENC[AES256_GCM,data:agr9ihvrufHJ+zsWUTT7tT6oXwhQfp1VjlzvL/YrjhfsQsWdA2wqQOBG8Fgi6gDlqz+3DwWr3wdy/jclEEwrnA==,iv:zgYrN9CSraugO+LMIpJ2jDvxjCnQ9a3GHj6ffO/K0uY=,tag:6en6lNNvNMyOVf1Rfow6ew==,type:str]
|
||||
barman-passwords: ENC[AES256_GCM,data:M7HCuXsq8kSqoEfbn94/Hdl1tvb93i5oDYOr+QeuDVD33aF/xxuOwDVZM7wz7OcuozV7f6URtMGDy26KaHqekWhn2hFoRi5WHOxjE7M6oYLP6V4F+IGQBeMOHjjzqjQ9ti/BfhGpi3oHf0RK4RxLCmoNzAfWuP6zZnCyKgwyxBVu6lCHG2I08CJ8w2novts8,iv:EMLqvGIb1WK71Aw+LWr7JrQydA89CTTOavsFUZ6M3G8=,tag:PXu0JVzHjbH9wQfijf9V7A==,type:str]
|
||||
factorio-token: ENC[AES256_GCM,data:m18pL2ck9ak7Sr/OQtxuG0rl4oXoFGCFG82Cplt0,iv:fXAkF+k1B4vzTxanPO39r7FvFPRFmpOy3My/zaOfLQE=,tag:JXotTaf4Aba9R11bSwiVbA==,type:str]
|
||||
sops:
|
||||
kms: []
|
||||
gcp_kms: []
|
||||
|
@ -39,8 +40,8 @@ sops:
|
|||
c0dlMkVlRG9LYU00M2M3UGJpUkxDOWsKiwc5oM63ezv1TVng0zQOqILOxuRMU+j7
|
||||
hHl6AWg0iorXJ1IWmGxLINDAK/RQVEFLK6gRjfN7qB+6wdmrKl8seQ==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2024-10-01T18:48:17Z"
|
||||
mac: ENC[AES256_GCM,data:TjNyX17d3PaScsPidp1wTc4DVK2Jl5/QRmlfH3WN/Hs+lsPn9BvFHmuy50Fs9TLfDjTBQ4WdreWw3Tz2SSBw12WO9tt7vt2b8MudLr1EqHP2rGN6u6cxz9xKYSm0v8j+mJFuL3VJvGAKdSvHS0lxo3SooEhONGkrhDwPidhhcks=,iv:9DhtXHJo6JTGJY/nPCAt11x8ZZwv/1B37dSaqFVAOiE=,tag:xfnRBecHFKOY09VTMBh9dw==,type:str]
|
||||
lastmodified: "2024-10-17T10:13:01Z"
|
||||
mac: ENC[AES256_GCM,data:z/e3bOudpTvxgR0l1qMzVq1O7vsxXr7jA4YETzDI6T25bj+A2rIk4YE9PDi3rp0ADsNFy0yclknvzrkPuFlYQ+ylFzD2NJ97hbRzD3jl+NdyPdmUFU4ohkFA/EXWZ1sVWoPOogdk0Od3PUPzKpQwL3gTJB6jxSDDcy+lmRRXgDQ=,iv:BSscMpW1tVkonTIqJKkeUeG1s2ZPx4QUL97Rr+rf+7E=,tag:5RdHeD8SDzfkouM23qnH3Q==,type:str]
|
||||
pgp: []
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.9.0
|
||||
version: 3.9.1
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
_final: prev: {
|
||||
final: prev: {
|
||||
backscrub = prev.pkgs.callPackage ../pkgs/backscrub {
|
||||
inherit (prev.pkgs)
|
||||
gcc
|
||||
|
@ -23,4 +23,37 @@ _final: prev: {
|
|||
peakperf = prev.pkgs.callPackage ../pkgs/peakperf {
|
||||
enableCuda = false; # peakperf needs cuda-samples, which is not available in current CUDA. CUDA 11 is broken due to CVEs in freeimage
|
||||
};
|
||||
mapshot = prev.pkgs.callPackage ../pkgs/mapshot { };
|
||||
|
||||
factorio = prev.factorio.override { versionsJson = ./factorio.json; };
|
||||
|
||||
python312 = prev.python312.override {
|
||||
packageOverrides = _pyfinal: pyprev: {
|
||||
wxpython = pyprev.wxpython.overrideAttrs (_old: {
|
||||
version = "4.2.2";
|
||||
|
||||
src = final.fetchPypi {
|
||||
pname = "wxPython";
|
||||
version = "4.2.2";
|
||||
hash = "sha256-XbywZQ9n/cLFlleVolX/qj17CfsUmqjaLQ2apE444ro=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
python312Packages = final.python312.pkgs;
|
||||
|
||||
python311 = prev.python311.override {
|
||||
packageOverrides = _pyfinal: pyprev: {
|
||||
wxpython = pyprev.wxpython.overrideAttrs (_old: {
|
||||
version = "4.2.2";
|
||||
|
||||
src = final.fetchPypi {
|
||||
pname = "wxPython";
|
||||
version = "4.2.2";
|
||||
hash = "sha256-XbywZQ9n/cLFlleVolX/qj17CfsUmqjaLQ2apE444ro=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
python311Packages = final.python311.pkgs;
|
||||
}
|
||||
|
|
58
overlays/factorio.json
Normal file
58
overlays/factorio.json
Normal file
|
@ -0,0 +1,58 @@
|
|||
{
|
||||
"x86_64-linux": {
|
||||
"alpha": {
|
||||
"experimental": {
|
||||
"name": "factorio_alpha_x64-2.0.7.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "14gsl01j06d0cfii2zsp0njak3hf8kgb9ig9i3prbch507bmfw6q",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.7/alpha/linux64",
|
||||
"version": "2.0.7"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_alpha_x64-2.0.7.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "14gsl01j06d0cfii2zsp0njak3hf8kgb9ig9i3prbch507bmfw6q",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.7/alpha/linux64",
|
||||
"version": "2.0.7"
|
||||
}
|
||||
},
|
||||
"demo": {
|
||||
"experimental": {
|
||||
"name": "factorio_demo_x64-1.1.110.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.110/demo/linux64",
|
||||
"version": "1.1.110"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_demo_x64-1.1.110.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.110/demo/linux64",
|
||||
"version": "1.1.110"
|
||||
}
|
||||
},
|
||||
"headless": {
|
||||
"experimental": {
|
||||
"name": "factorio_headless_x64-2.0.7.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "0qi7vypm4iy3cp9qyl3cvvm606g9g37sa2pls4y7glxiwng4m9p6",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.7/headless/linux64",
|
||||
"version": "2.0.7"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_headless_x64-2.0.7.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "0qi7vypm4iy3cp9qyl3cvvm606g9g37sa2pls4y7glxiwng4m9p6",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.7/headless/linux64",
|
||||
"version": "2.0.7"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
33
pkgs/mapshot/default.nix
Normal file
33
pkgs/mapshot/default.nix
Normal file
|
@ -0,0 +1,33 @@
|
|||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mapshot";
|
||||
version = "0.0.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Palats";
|
||||
repo = "mapshot";
|
||||
rev = version;
|
||||
hash = "sha256-cgNQU9T4xgJbUHI57XjP+UoCLfV+JCm0tvj8xLuI4Qs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3bjEoE4angdBs2bVNINZrkeBl68NsWVRjlKTevLrroM=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Factorio mod to export maps as zoomable html";
|
||||
homepage = "https://github.com/Palats/mapshot";
|
||||
changelog = "https://github.com/Palats/mapshot/blob/${src.rev}/changelog.txt";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
mainProgram = "mapshot";
|
||||
};
|
||||
}
|
|
@ -10,6 +10,11 @@ let
|
|||
cfg = config.eboskma.users.erwin;
|
||||
homeCfg = config.home-manager.users.erwin;
|
||||
bt = config.eboskma.bluetooth;
|
||||
|
||||
downloadFactorio = pkgs.writeShellScriptBin "download-factorio" ''
|
||||
version=$(${pkgs.xh}/bin/xhs factorio.com/api/latest-releases | ${pkgs.jaq}/bin/jaq -r '.stable.alpha')
|
||||
${pkgs.nix}/bin/nix-prefetch-url --name factorio_alpha_x64-''${version}.tar.xz https://factorio.com/get-download/''${version}/alpha/linux64\?username=eboskma\&token=$(cat ${config.sops.secrets.factorio-token.path})
|
||||
'';
|
||||
in
|
||||
{
|
||||
config = mkIf cfg.home {
|
||||
|
@ -203,6 +208,7 @@ in
|
|||
devenv
|
||||
doggo
|
||||
easyeffects
|
||||
factorio
|
||||
fd
|
||||
ffmpeg-full
|
||||
geekbench
|
||||
|
@ -225,7 +231,6 @@ in
|
|||
kicad
|
||||
kubectl
|
||||
kubernetes-helm
|
||||
ladybird
|
||||
libnotify
|
||||
libreoffice-fresh
|
||||
minio-client
|
||||
|
@ -259,6 +264,8 @@ in
|
|||
wl-clipboard
|
||||
zeal
|
||||
zed-editor
|
||||
|
||||
downloadFactorio
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
gstreamer
|
||||
|
|
Loading…
Reference in a new issue