mirror of
https://github.com/kmein/niveum
synced 2026-03-16 10:11:08 +01:00
Compare commits
1 Commits
e99103226d
...
tahina
| Author | SHA1 | Date | |
|---|---|---|---|
| 2e96539faa |
@@ -23,15 +23,15 @@
|
|||||||
cslDirectory = pkgs.linkFarm "citation-styles" [
|
cslDirectory = pkgs.linkFarm "citation-styles" [
|
||||||
(zoteroStyle {
|
(zoteroStyle {
|
||||||
name = "chicago-author-date-de";
|
name = "chicago-author-date-de";
|
||||||
sha256 = "0fz0xn46rkciblr34a7x2v60j0lbq9l3fmzi43iphph27m0czn6s";
|
sha256 = "sha256-ddMYk4A9DJQhx9ldkmF7PhwKuc7wUSr26uHHGAze9Ps=";
|
||||||
})
|
})
|
||||||
(zoteroStyle {
|
(zoteroStyle {
|
||||||
name = "din-1505-2";
|
name = "din-1505-2";
|
||||||
sha256 = "1pvy1b7qm13mnph7z365rrz1j082bl2y8ih73rhzd0zd6dz1jyjq";
|
sha256 = "sha256-bXZbB850fek8J6wMVFL32ndI7F4wiKKr1qUC71ezreE=";
|
||||||
})
|
})
|
||||||
(zoteroStyle {
|
(zoteroStyle {
|
||||||
name = "apa";
|
name = "apa";
|
||||||
sha256 = "1878vxp0y0h05yzaghnd51n981623mxskw3lsdyzmffqhihvv111";
|
sha256 = "sha256-yq4fW6hQknycLjaj5fPbXLrQlGBp5myXiOSHBU90jEc=";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
11
flake.nix
11
flake.nix
@@ -108,11 +108,7 @@
|
|||||||
in
|
in
|
||||||
toString (krops.packages.${system}.writeDeploy "deploy-${name}" {
|
toString (krops.packages.${system}.writeDeploy "deploy-${name}" {
|
||||||
source = krops.lib.evalSource [(source name)];
|
source = krops.lib.evalSource [(source name)];
|
||||||
target = "root@${host}:${
|
target = "root@${host}:${toString sshPort}";
|
||||||
if host == "130.61.203.118"
|
|
||||||
then "22"
|
|
||||||
else toString sshPort
|
|
||||||
}";
|
|
||||||
});
|
});
|
||||||
in {
|
in {
|
||||||
apps.${system} = let
|
apps.${system} = let
|
||||||
@@ -123,10 +119,7 @@
|
|||||||
type = "app";
|
type = "app";
|
||||||
program = deployScriptFor {
|
program = deployScriptFor {
|
||||||
inherit name;
|
inherit name;
|
||||||
host =
|
host = "${name}.r";
|
||||||
if name == "tahina"
|
|
||||||
then "130.61.203.118"
|
|
||||||
else "${name}.r";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ rec {
|
|||||||
manakish.id = "AJVBWR2-VFFAGZF-7ZF5JAX-T63GMOG-NZ446WK-MC5E6WK-6X6Q2HE-QQA2JQ3";
|
manakish.id = "AJVBWR2-VFFAGZF-7ZF5JAX-T63GMOG-NZ446WK-MC5E6WK-6X6Q2HE-QQA2JQ3";
|
||||||
toum.id = "CBJQXFF-FMFGWFU-2J6FMPR-SRDTSGX-7NHOYOH-CQCABKF-KQJMRJC-SDE24Q4";
|
toum.id = "CBJQXFF-FMFGWFU-2J6FMPR-SRDTSGX-7NHOYOH-CQCABKF-KQJMRJC-SDE24Q4";
|
||||||
zaatar.id = "CGHO6LK-ZJBAXBD-UWI7AH3-BXYARE6-EUIM7PE-O2FUCOM-VCCRNCM-IG34WQ7";
|
zaatar.id = "CGHO6LK-ZJBAXBD-UWI7AH3-BXYARE6-EUIM7PE-O2FUCOM-VCCRNCM-IG34WQ7";
|
||||||
|
tahina.id = "UKJ2CBO-EQPKQL4-3QLRUSG-SSYR6AB-CCCUTKU-CLPYR7N-RUI5A6Y-JTL5NA4";
|
||||||
};
|
};
|
||||||
|
|
||||||
ignorePaths = [
|
ignorePaths = [
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
}: let
|
}: let
|
||||||
streams-tsv = pkgs.fetchurl {
|
streams-tsv = pkgs.fetchurl {
|
||||||
url = "https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/iptv/kodi/kodi_tv.m3u";
|
url = "https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/iptv/kodi/kodi_tv.m3u";
|
||||||
sha256 = "1cw1gmb16vwh6qfw0z3wjjfgn0zg2qplnddqzva5b0xx2g2appla";
|
sha256 = "sha256-gbHV37Yo+D3TYfDXZyb9IX8aRsguZ3qG2SYlY8NsTL0=";
|
||||||
postFetch = ''
|
postFetch = ''
|
||||||
${pkgs.gnused}/bin/sed '/#EXTM3U/d;/#EXTINF/s/.*,//g' $out | ${pkgs.coreutils}/bin/paste -d'\t' - - > $out.tmp
|
${pkgs.gnused}/bin/sed '/#EXTM3U/d;/#EXTINF/s/.*,//g' $out | ${pkgs.coreutils}/bin/paste -d'\t' - - > $out.tmp
|
||||||
mv $out.tmp $out
|
mv $out.tmp $out
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
{
|
{
|
||||||
lib,
|
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
@@ -8,22 +7,63 @@
|
|||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
<niveum/configs/monitoring.nix>
|
<niveum/configs/battery.nix>
|
||||||
<niveum/configs/nix.nix>
|
|
||||||
<niveum/configs/save-space.nix>
|
|
||||||
<niveum/configs/spacetime.nix>
|
<niveum/configs/spacetime.nix>
|
||||||
<niveum/configs/sshd.nix>
|
|
||||||
<niveum/modules/retiolum.nix>
|
<niveum/modules/retiolum.nix>
|
||||||
|
<niveum/configs/sshd.nix>
|
||||||
|
{
|
||||||
|
console.keyMap = "de";
|
||||||
|
i18n.defaultLocale = "de_DE.UTF-8";
|
||||||
|
services.xserver = {
|
||||||
|
layout = "de";
|
||||||
|
libinput.enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{
|
||||||
|
nix.nixPath = ["/var/src"];
|
||||||
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
nix.nixPath = ["/var/src"];
|
users.users.xenos = {
|
||||||
|
name = "xenos";
|
||||||
networking = {
|
password = "xenos";
|
||||||
hostName = "tahina";
|
isNormalUser = true;
|
||||||
retiolum = retiolumAddresses.tahina;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
system.stateVersion = "22.05";
|
services.xserver = {
|
||||||
|
enable = true;
|
||||||
|
desktopManager.pantheon.enable = true;
|
||||||
|
displayManager = {
|
||||||
|
lightdm = {
|
||||||
|
enable = true;
|
||||||
|
greeters.pantheon.enable = true;
|
||||||
|
};
|
||||||
|
autoLogin = {
|
||||||
|
enable = true;
|
||||||
|
user = "xenos";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
boot.plymouth.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = [pkgs.vim pkgs.git pkgs.tmux pkgs.python3];
|
environment.systemPackages = [
|
||||||
|
pkgs.libreoffice
|
||||||
|
pkgs.gimp
|
||||||
|
pkgs.inkscape
|
||||||
|
pkgs.firefox
|
||||||
|
pkgs.audacity
|
||||||
|
pkgs.pidgin
|
||||||
|
];
|
||||||
|
|
||||||
|
networking = {
|
||||||
|
useDHCP = false;
|
||||||
|
interfaces = {
|
||||||
|
enp0s25.useDHCP = true;
|
||||||
|
wlo1.useDHCP = true;
|
||||||
|
};
|
||||||
|
retiolum = retiolumAddresses.tahina;
|
||||||
|
hostName = "tahina";
|
||||||
|
};
|
||||||
|
|
||||||
|
system.stateVersion = "21.11";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,27 +6,37 @@
|
|||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
(modulesPath + "/profiles/qemu-guest.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.loader.grub.enable = true;
|
boot = {
|
||||||
boot.loader.grub.version = 2;
|
loader = {
|
||||||
boot.loader.grub.device = "/dev/sda";
|
systemd-boot = {
|
||||||
|
enable = true;
|
||||||
boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod"];
|
consoleMode = "max";
|
||||||
boot.initrd.kernelModules = [];
|
};
|
||||||
boot.kernelModules = ["kvm-amd"];
|
efi.canTouchEfiVariables = true;
|
||||||
boot.extraModulePackages = [];
|
};
|
||||||
|
initrd = {
|
||||||
|
availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "firewire_ohci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci"];
|
||||||
|
kernelModules = ["dm-snapshot"];
|
||||||
|
luks.devices.luksmap.device = "/dev/disk/by-uuid/b7d66981-8cb7-4aad-a595-ee6574b312cf";
|
||||||
|
};
|
||||||
|
kernelModules = ["kvm-intel"];
|
||||||
|
extraModulePackages = [];
|
||||||
|
};
|
||||||
|
|
||||||
fileSystems."/" = {
|
fileSystems."/" = {
|
||||||
device = "/dev/disk/by-uuid/d36baa44-9359-45d1-af5f-dbac52c6d75e";
|
device = "/dev/disk/by-uuid/e9a8bd34-61eb-4317-888d-bd7d6248a906";
|
||||||
fsType = "ext4";
|
fsType = "xfs";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot" = {
|
||||||
|
device = "/dev/disk/by-uuid/9B2F-31E1";
|
||||||
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [];
|
swapDevices = [];
|
||||||
|
|
||||||
networking.useDHCP = lib.mkDefault false;
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
networking.interfaces.ens3.useDHCP = lib.mkDefault true;
|
|
||||||
|
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user