mirror of
https://github.com/kmein/niveum
synced 2026-03-16 10:11:08 +01:00
chore: scardanelli -> zaatar
This commit is contained in:
@@ -31,8 +31,6 @@
|
||||
devices = {
|
||||
homeros.id =
|
||||
"HSOL72W-MMN346W-C3WCWCH-OTRKJYG-MY2WWV6-P7JUHN7-5WYYYRV-ZMH4KAA";
|
||||
scardanelli.id =
|
||||
"7CZYHEX-3CSFDQU-PEEMYHG-6XGQ2ZD-KGVUWH5-GFRB2XK-FP57ERX-7APZUQU";
|
||||
rilke.id =
|
||||
"NYNNHXP-7JMSTXG-SVNOPWD-RWXCCCL-CBOVBEI-X4QPLF4-NJA5G2P-RSGYRQQ";
|
||||
wilde.id =
|
||||
@@ -44,7 +42,7 @@
|
||||
let syncthing-dir = "${config.users.users.me.home}/cloud/syncthing";
|
||||
in {
|
||||
"${syncthing-dir}/common".devices =
|
||||
[ "homeros" "scardanelli" "wilde" ];
|
||||
[ "homeros" "wilde" ];
|
||||
"${syncthing-dir}/library".devices = lib.attrNames devices;
|
||||
"${syncthing-dir}/mundoiu".devices = lib.attrNames devices;
|
||||
"${syncthing-dir}/music".devices = lib.attrNames devices;
|
||||
|
||||
@@ -68,9 +68,7 @@ in {
|
||||
};
|
||||
writeDashBin = pkgs.writers.writeDashBin;
|
||||
writeDash = pkgs.writers.writeDash;
|
||||
gfs-fonts = pkgs.callPackage <niveum/packages/gfs-fonts.nix> {
|
||||
scardanelli = config.networking.hostName == "scardanelli";
|
||||
};
|
||||
gfs-fonts = pkgs.callPackage <niveum/packages/gfs-fonts.nix> {};
|
||||
iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> { };
|
||||
ix = pkgs.callPackage <niveum/packages/ix.nix> { };
|
||||
};
|
||||
|
||||
@@ -19,17 +19,11 @@ let
|
||||
})
|
||||
(zoteroStyle {
|
||||
name = "din-1505-2";
|
||||
sha256 = if scardanelli then
|
||||
"1pvy1b7qm13mnph7z365rrz1j082bl2y8ih73rhzd0zd6dz1jyjq"
|
||||
else
|
||||
"150kbnxl1r4g1s40khdavv5s6ah10ws135r9k883f6srk78sz6zi";
|
||||
sha256 = "150kbnxl1r4g1s40khdavv5s6ah10ws135r9k883f6srk78sz6zi";
|
||||
})
|
||||
(zoteroStyle {
|
||||
name = "apa";
|
||||
sha256 = if scardanelli then
|
||||
"0g8vhp7gnd315h5b60r3zqp49kaq3fkxqnz2v7j2a0zp6s3cisdk"
|
||||
else
|
||||
"1rg41mblmqifba1azb6481dwxhsbl606kf6ysqkqd786f9l9dcf8";
|
||||
sha256 = "1rg41mblmqifba1azb6481dwxhsbl606kf6ysqkqd786f9l9dcf8";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -38,7 +32,6 @@ let
|
||||
name = "dic/${name}";
|
||||
inherit path;
|
||||
}) dicts);
|
||||
scardanelli = config.networking.hostName == "scardanelli";
|
||||
in {
|
||||
environment.variables.STARDICT_DATA_DIR = toString (makeStardictDataDir [
|
||||
{
|
||||
|
||||
@@ -19,9 +19,9 @@ in {
|
||||
hostname = "ssh.github.com";
|
||||
port = 443;
|
||||
};
|
||||
scardanelli = {
|
||||
hostname = "scardanelli.r";
|
||||
user = "kfm";
|
||||
zaatar = {
|
||||
hostname = "zaatar.r";
|
||||
user = "kiosk";
|
||||
port = sshPort;
|
||||
};
|
||||
homeros = {
|
||||
|
||||
@@ -35,9 +35,9 @@ let
|
||||
};
|
||||
inherit (pkgs.krops) writeDeploy;
|
||||
in {
|
||||
scardanelli = writeDeploy "deploy-scardanelli" (regularSystem {
|
||||
path = systems/scardanelli;
|
||||
name = "scardanelli";
|
||||
zaatar = writeDeploy "deploy-zaatar" (regularSystem {
|
||||
path = systems/zaatar;
|
||||
name = "zaatar";
|
||||
address = "192.168.178.21";
|
||||
});
|
||||
homeros = writeDeploy "deploy-homeros" (regularSystem {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
localAddresses = {
|
||||
toum = "192.168.178.24";
|
||||
scardanelli = "192.168.178.21";
|
||||
zaatar = "192.168.178.21";
|
||||
homeros = "192.168.178.22";
|
||||
wilde = "192.168.178.32";
|
||||
android = "192.168.178.35";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ fetchzip, symlinkJoin, lib, scardanelli ? false }:
|
||||
{ fetchzip, symlinkJoin, lib }:
|
||||
let
|
||||
gfs-font = name: sha256:
|
||||
fetchzip {
|
||||
@@ -22,27 +22,15 @@ in symlinkJoin {
|
||||
GFS_Decker = "016v1j5n9ph4i2cpmlk26pcxhp3q2fjwlaryppd5akl84dfkpncl";
|
||||
GFS_Didot = "0ysvrp527wm0wxfp6wmlgmxfx7ysr5mwpmjmqp1h605cy44jblfm";
|
||||
GFS_Didot_Classic = "0n5awqksvday3l3d85yhwmbmfj9bcpxivy4wpd4zrkgl7b85af2c";
|
||||
GFS_Didot_Display = if scardanelli then
|
||||
"0n2di2zyc76w6f8mc6hfilc2ir6igks7ldjp9fkw1gjp06330fi7"
|
||||
else
|
||||
"0gg5xb8jic646gz9p05ry62nk7w0k546fxp5p4vvnawmckql2dj1";
|
||||
GFS_Didot_Display = "0gg5xb8jic646gz9p05ry62nk7w0k546fxp5p4vvnawmckql2dj1";
|
||||
GFS_Elpis = "02l7wd3nbn1kpv7ghxh19k4dbvd49ijyxd6gq83gcr9vlmxcq2s2";
|
||||
GFS_Gazis = "0x9iwj6pinaykrds0iw6552hf256d0dr41sipdb1jnnlr2d3bf9w";
|
||||
GFS_Goschen = "1jvbn33wzq2yj0aygwy9pd2msg3wkmdp0npjzazadrmfjpnpkcy9";
|
||||
GFS_NeoHellenic = "1ixm2frdc6i5lbn9h0h4gdsvsw2k4hny75q8ig4kgs28ac3dbzq3";
|
||||
GFS_Olga = "0f05ng02na84x9x6yhskxqwxwyabjisyl8a0k3fiah60i620p39d";
|
||||
GFS_Orpheus = if scardanelli then
|
||||
"18n6fag4pyr8jdwnsz0vixf47jz4ym8mjmppc1w3k7v27cg1z9dz"
|
||||
else
|
||||
"1rvjpvk1fx55vyp3dyxcbww1a24rm7xv5faqs735yf6lqzpkqnax";
|
||||
GFS_Orpheus_Classic = if scardanelli then
|
||||
"1rqy1kf7slw56zfhbv264yzarjisnqbqydj4f7hghiknhnmdakps"
|
||||
else
|
||||
"0d2yzwg6albmgl1d0xhsfrmxj79r42wp712rpry567nv1ry42k0a";
|
||||
GFS_Orpheus_Sans = if scardanelli then
|
||||
"02rh7z8c3h3xyfi52rn47z4finizx636d05bg5g23v0l0mqs6nkg"
|
||||
else
|
||||
"1rdlm2kmkvi4y3ii68ik8k3w3183vvb3q2pnk04lbb0ggg9w5jdb";
|
||||
GFS_Orpheus = "1rvjpvk1fx55vyp3dyxcbww1a24rm7xv5faqs735yf6lqzpkqnax";
|
||||
GFS_Orpheus_Classic = "0d2yzwg6albmgl1d0xhsfrmxj79r42wp712rpry567nv1ry42k0a";
|
||||
GFS_Orpheus_Sans = "1rdlm2kmkvi4y3ii68ik8k3w3183vvb3q2pnk04lbb0ggg9w5jdb";
|
||||
GFS_Philostratos = "0zh3d0cn6b2fjbwnvmg379z20zh7w626w2bnj19xcazjvqkwhzx1";
|
||||
GFS_Porson = "0r3snwgxkdx7h34sg3s0hr8fac3rnpllq62bk44m266hj6a80a5k";
|
||||
GFS_Pyrsos = "0y0dv7y3n01bbhhnczflx1zcc7by56cffmr2xqixj2rd1nvchx0j";
|
||||
|
||||
@@ -60,7 +60,7 @@ in {
|
||||
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
networking.hostName = "scardanelli";
|
||||
networking.hostName = "zaatar";
|
||||
|
||||
networking.retiolum = {
|
||||
ipv4 = "10.243.2.2";
|
||||
Reference in New Issue
Block a user