mirror of
https://github.com/kmein/niveum
synced 2026-03-18 02:51:08 +01:00
chore: nixfmt
This commit is contained in:
@@ -2,11 +2,14 @@
|
||||
let
|
||||
inherit (import <niveum/lib> { inherit pkgs; }) writeTOML;
|
||||
sshKey = {
|
||||
homeros = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDn13Y6CznabMvKJPIrr/dj1TX4boe8F98yc3FDElJeprQo2RXlDzjg/po9/lHTHaoC5yQUjlRg/AnI4vizYkn2sqJebAeSPahmpS+l0eFnjZgsqds2cCFqSPB6Qc5YEkGRhN4aq/ABz0jdFJLBYOYGxuuXowYxyNrqrItxDR7tF7upG+kVjYiDoP/qFm8C7zv6Zy8aoehNbzf8HlIJd0ITbMr/vUftNsQ8C84QmbZljReHmchPgE8GUfVLTlCORkhndbvNX3jXo+75y7JOIZZ6193FZHM4seg/VSDWYLJtpnhttD1w6qmiLrlimqbJB9ihoXq2eDmQ+4zo6hxQ6pFH6P0xQClJ0hxVWn6hEM3rkMwoMfbq4v54gKJsYxcGdnwjAX6d9DQv/QVjmVZffKWsGGoC7uz7bdmc0akVKi+GLSPOx8sJwXqvyvFStfqLaweVcuikUqQ72JLK7pZyliA7na6KuQ1PE3LTpfSr0lbBJ73xtS2rU1nF/Oe5zwA4LX5s/QeDVmS86D8acUrSCO62pBB3Yv8go0KR4mEvfxLiUWV6gR2uTeIPXvo4ouYFZqyABAGybjUATlGCXJaeHd/y/VWkpIB8ocqNESlRMCEe4TrYjw91AEmYBL6kWIeop3dyhovm3dTB3fQvC97kbL16wuXBrOcN4lEc+56ShhmvdQ== kieran.meinhardt@gmail.com";
|
||||
scardanelli = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC19H0FhSNWcfBRPKzbTVSMJikIWZl0CoM8zCm+/3fdMgoaLRpeZWe/AfDK6b4qOjk/sez/J0JUFCGr+JbMwjsduoazsuQowu9L9DLP9Q5UkJje4BD7MHznaeu9/XfVng/MvyaEWArA/VUJeKQesHe76tR511/+n3+bdzlIh8Zw/3wfFxmg1OTNA99/vLkXrQzHDTuV/yj1pxykL4xFtN0OIssW1IKncJeKtkO/OHGT55ypz52Daj6bNKqvxiTuzeEhv5M+5ppyIPcRf1uj/7IaPKttCgZAntEqBTIR9MbyXFeAZVayzaFnLl2okeam5XreeZbj+Y1h2ZjxiIuWoab3MLndSekVfLtfa63gtcWIf8CIvZO2wJoH8v73y0U78JsfWVaTM09ZCfFlHHA/bWqZ6laAjW+mWLO/c77DcYkB3IBzaMVNfc6mfTcGFIC+biWeYpKgA0zC6rByUPbmbIoMueP9zqJwqUaM90Nwd6559inBB107/BK3Ktb3b+37mMCstetIPB9e4EFpGMjhmnL/G81jS53ACWLXJYzt7mKU/fEsiW93MtaB+Le46OEC18y/4G8F7p/nnH7i0kO74ukxbnc4PlpiM7iWT6ra2Cyy+nzEgdXCNXywIxr05TbCQDwX6/NY8k7Hokgdfyz+1Pq3sX0yCcWRPaoB26YF12KYFQ== kieran.meinhardt@gmail.com";
|
||||
wilde = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk kfm@wilde";
|
||||
homeros =
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDn13Y6CznabMvKJPIrr/dj1TX4boe8F98yc3FDElJeprQo2RXlDzjg/po9/lHTHaoC5yQUjlRg/AnI4vizYkn2sqJebAeSPahmpS+l0eFnjZgsqds2cCFqSPB6Qc5YEkGRhN4aq/ABz0jdFJLBYOYGxuuXowYxyNrqrItxDR7tF7upG+kVjYiDoP/qFm8C7zv6Zy8aoehNbzf8HlIJd0ITbMr/vUftNsQ8C84QmbZljReHmchPgE8GUfVLTlCORkhndbvNX3jXo+75y7JOIZZ6193FZHM4seg/VSDWYLJtpnhttD1w6qmiLrlimqbJB9ihoXq2eDmQ+4zo6hxQ6pFH6P0xQClJ0hxVWn6hEM3rkMwoMfbq4v54gKJsYxcGdnwjAX6d9DQv/QVjmVZffKWsGGoC7uz7bdmc0akVKi+GLSPOx8sJwXqvyvFStfqLaweVcuikUqQ72JLK7pZyliA7na6KuQ1PE3LTpfSr0lbBJ73xtS2rU1nF/Oe5zwA4LX5s/QeDVmS86D8acUrSCO62pBB3Yv8go0KR4mEvfxLiUWV6gR2uTeIPXvo4ouYFZqyABAGybjUATlGCXJaeHd/y/VWkpIB8ocqNESlRMCEe4TrYjw91AEmYBL6kWIeop3dyhovm3dTB3fQvC97kbL16wuXBrOcN4lEc+56ShhmvdQ== kieran.meinhardt@gmail.com";
|
||||
scardanelli =
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC19H0FhSNWcfBRPKzbTVSMJikIWZl0CoM8zCm+/3fdMgoaLRpeZWe/AfDK6b4qOjk/sez/J0JUFCGr+JbMwjsduoazsuQowu9L9DLP9Q5UkJje4BD7MHznaeu9/XfVng/MvyaEWArA/VUJeKQesHe76tR511/+n3+bdzlIh8Zw/3wfFxmg1OTNA99/vLkXrQzHDTuV/yj1pxykL4xFtN0OIssW1IKncJeKtkO/OHGT55ypz52Daj6bNKqvxiTuzeEhv5M+5ppyIPcRf1uj/7IaPKttCgZAntEqBTIR9MbyXFeAZVayzaFnLl2okeam5XreeZbj+Y1h2ZjxiIuWoab3MLndSekVfLtfa63gtcWIf8CIvZO2wJoH8v73y0U78JsfWVaTM09ZCfFlHHA/bWqZ6laAjW+mWLO/c77DcYkB3IBzaMVNfc6mfTcGFIC+biWeYpKgA0zC6rByUPbmbIoMueP9zqJwqUaM90Nwd6559inBB107/BK3Ktb3b+37mMCstetIPB9e4EFpGMjhmnL/G81jS53ACWLXJYzt7mKU/fEsiW93MtaB+Le46OEC18y/4G8F7p/nnH7i0kO74ukxbnc4PlpiM7iWT6ra2Cyy+nzEgdXCNXywIxr05TbCQDwX6/NY8k7Hokgdfyz+1Pq3sX0yCcWRPaoB26YF12KYFQ== kieran.meinhardt@gmail.com";
|
||||
wilde =
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk kfm@wilde";
|
||||
};
|
||||
unstable = import <nixos-unstable> {};
|
||||
unstable = import <nixos-unstable> { };
|
||||
wtf-config = pkgs.writeText "config.yml" (builtins.toJSON {
|
||||
wtf = {
|
||||
colors = {
|
||||
@@ -18,8 +21,8 @@ let
|
||||
};
|
||||
};
|
||||
grid = {
|
||||
columns = [40 54];
|
||||
rows = [10 20];
|
||||
columns = [ 40 54 ];
|
||||
rows = [ 10 20 ];
|
||||
};
|
||||
refreshInterval = 1;
|
||||
mods = {
|
||||
@@ -107,34 +110,32 @@ in {
|
||||
}));
|
||||
};
|
||||
}
|
||||
{
|
||||
services.keybase.enable = true;
|
||||
}
|
||||
{ services.keybase.enable = true; }
|
||||
{
|
||||
environment.systemPackages = [ pkgs.wtf ];
|
||||
|
||||
systemd.services.wtf = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
script = "${pkgs.tmux}/bin/tmux new-session -d '${pkgs.wtf}/bin/wtf --config=${wtf-config}'";
|
||||
script =
|
||||
"${pkgs.tmux}/bin/tmux new-session -d '${pkgs.wtf}/bin/wtf --config=${wtf-config}'";
|
||||
serviceConfig.Type = "oneshot";
|
||||
};
|
||||
}
|
||||
/*
|
||||
{
|
||||
imports = [ <stockholm/krebs/3modules/urlwatch.nix> ];
|
||||
/* {
|
||||
imports = [ <stockholm/krebs/3modules/urlwatch.nix> ];
|
||||
|
||||
krebs.urlwatch = {
|
||||
enable = true;
|
||||
onCalendar = "*-*-* 05:00:00";
|
||||
sendmail.enable = false;
|
||||
telegram = {
|
||||
enable = true;
|
||||
chatId = [ "18980945" ];
|
||||
botToken = lib.strings.fileContents <secrets/telegram/kmein.token>;
|
||||
};
|
||||
urls = [];
|
||||
};
|
||||
}
|
||||
krebs.urlwatch = {
|
||||
enable = true;
|
||||
onCalendar = "*-*-* 05:00:00";
|
||||
sendmail.enable = false;
|
||||
telegram = {
|
||||
enable = true;
|
||||
chatId = [ "18980945" ];
|
||||
botToken = lib.strings.fileContents <secrets/telegram/kmein.token>;
|
||||
};
|
||||
urls = [];
|
||||
};
|
||||
}
|
||||
*/
|
||||
];
|
||||
|
||||
@@ -147,19 +148,16 @@ in {
|
||||
|
||||
networking.wireless = {
|
||||
enable = false;
|
||||
networks.Aether = { pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a"; };
|
||||
networks.Aether = {
|
||||
pskRaw =
|
||||
"e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a";
|
||||
};
|
||||
};
|
||||
|
||||
environment.variables.TERM = "linux";
|
||||
environment.variables.HTOPRC = toString <niveum/dot/htoprc>;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
vim
|
||||
htop
|
||||
wget
|
||||
reptyr
|
||||
];
|
||||
environment.systemPackages = with pkgs; [ git vim htop wget reptyr ];
|
||||
|
||||
users.mutableUsers = false;
|
||||
users.users.me = {
|
||||
@@ -168,7 +166,8 @@ in {
|
||||
createHome = true;
|
||||
group = "users";
|
||||
extraGroups = [ "wheel" ];
|
||||
hashedPassword = "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
|
||||
hashedPassword =
|
||||
"$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
|
||||
shell = pkgs.bash;
|
||||
};
|
||||
|
||||
@@ -180,17 +179,11 @@ in {
|
||||
passwordAuthentication = false;
|
||||
};
|
||||
|
||||
users.users.root.openssh.authorizedKeys.keys = [
|
||||
sshKey.homeros
|
||||
sshKey.scardanelli
|
||||
sshKey.wilde
|
||||
];
|
||||
users.users.root.openssh.authorizedKeys.keys =
|
||||
[ sshKey.homeros sshKey.scardanelli sshKey.wilde ];
|
||||
|
||||
users.users.me.openssh.authorizedKeys.keys = [
|
||||
sshKey.homeros
|
||||
sshKey.scardanelli
|
||||
sshKey.wilde
|
||||
];
|
||||
users.users.me.openssh.authorizedKeys.keys =
|
||||
[ sshKey.homeros sshKey.scardanelli sshKey.wilde ];
|
||||
|
||||
networking.retiolum = {
|
||||
ipv4 = "10.243.2.3";
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
{ config, pkgs, ... }: {
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.kernelParams = [ "cma=32M" ];
|
||||
|
||||
@@ -10,5 +9,8 @@
|
||||
};
|
||||
};
|
||||
|
||||
swapDevices = [ { device = "/swapfile"; size = 1024; } ];
|
||||
swapDevices = [{
|
||||
device = "/swapfile";
|
||||
size = 1024;
|
||||
}];
|
||||
}
|
||||
|
||||
@@ -6,9 +6,9 @@ let
|
||||
rev = "1971f082ec6e14d392a0dc3ac62e0b1e4187409b";
|
||||
sha256 = "0hipj616vcsa3f62s83jvlx8zx4bmbgl5h2n4w8ba5ngp40lkmb3";
|
||||
};
|
||||
autorenkalender = pkgs.python3Packages.callPackage autorenkalender-package {};
|
||||
in
|
||||
{
|
||||
autorenkalender =
|
||||
pkgs.python3Packages.callPackage autorenkalender-package { };
|
||||
in {
|
||||
niveum.telegramBots.autorenkalender = {
|
||||
enable = true;
|
||||
time = "07:00";
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
telebots =
|
||||
let
|
||||
telebots = let
|
||||
telebots-package = pkgs.fetchFromGitHub {
|
||||
owner = "kmein";
|
||||
repo = "telebots";
|
||||
@@ -9,9 +8,15 @@ let
|
||||
sha256 = "08rp1pcisk4zzhxdlgrlhxa0sbza5qhxa70rjycg4r7fmixkkbz2";
|
||||
};
|
||||
in {
|
||||
reverse = pkgs.python3Packages.callPackage "${telebots-package}/telegram-reverse" {};
|
||||
odyssey = pkgs.python3Packages.callPackage "${telebots-package}/telegram-odyssey" {};
|
||||
betacode = pkgs.python3Packages.callPackage "${telebots-package}/telegram-betacode" {};
|
||||
reverse =
|
||||
pkgs.python3Packages.callPackage "${telebots-package}/telegram-reverse"
|
||||
{ };
|
||||
odyssey =
|
||||
pkgs.python3Packages.callPackage "${telebots-package}/telegram-odyssey"
|
||||
{ };
|
||||
betacode =
|
||||
pkgs.python3Packages.callPackage "${telebots-package}/telegram-betacode"
|
||||
{ };
|
||||
};
|
||||
in {
|
||||
imports = [
|
||||
@@ -24,27 +29,31 @@ in {
|
||||
systemd.services.telegram-odyssey = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
description = "Telegram bot reciting the Odyssey to you";
|
||||
environment.TELEGRAM_ODYSSEY_TOKEN = lib.strings.fileContents <secrets/telegram/odyssey.token>;
|
||||
environment.TELEGRAM_ODYSSEY_TOKEN =
|
||||
lib.strings.fileContents <secrets/telegram/odyssey.token>;
|
||||
enable = true;
|
||||
script = ''${telebots.odyssey}/bin/telegram-odyssey'';
|
||||
script = "${telebots.odyssey}/bin/telegram-odyssey";
|
||||
serviceConfig.Restart = "always";
|
||||
};
|
||||
|
||||
systemd.services.telegram-reverse = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
description = "Telegram bot for reversing things";
|
||||
environment.TELEGRAM_REVERSE_TOKEN = lib.strings.fileContents <secrets/telegram/reverse.token>;
|
||||
environment.TELEGRAM_REVERSE_TOKEN =
|
||||
lib.strings.fileContents <secrets/telegram/reverse.token>;
|
||||
enable = true;
|
||||
script = ''${telebots.reverse}/bin/telegram-reverse'';
|
||||
script = "${telebots.reverse}/bin/telegram-reverse";
|
||||
serviceConfig.Restart = "always";
|
||||
};
|
||||
|
||||
systemd.services.telegram-betacode = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
description = "Telegram bot for converting Ancient Greek betacode into unicode";
|
||||
environment.TELEGRAM_BETACODE_TOKEN = lib.strings.fileContents <secrets/telegram/betacode.token>;
|
||||
description =
|
||||
"Telegram bot for converting Ancient Greek betacode into unicode";
|
||||
environment.TELEGRAM_BETACODE_TOKEN =
|
||||
lib.strings.fileContents <secrets/telegram/betacode.token>;
|
||||
enable = true;
|
||||
script = ''${telebots.betacode}/bin/telegram-betacode'';
|
||||
script = "${telebots.betacode}/bin/telegram-betacode";
|
||||
serviceConfig.Restart = "always";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
let
|
||||
scripts = import <niveum/packages/scripts> { inherit pkgs lib; };
|
||||
inherit (scripts) literature-quote;
|
||||
in
|
||||
{
|
||||
in {
|
||||
niveum.telegramBots.quotebot = {
|
||||
enable = true;
|
||||
time = "08/6:00";
|
||||
|
||||
@@ -1,31 +1,31 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
nachtischsatan-bot = { token }: pkgs.writers.writePython3 "nachtischsatan-bot" {
|
||||
libraries = [ pkgs.python3Packages.python-telegram-bot ];
|
||||
} ''
|
||||
import random
|
||||
import time
|
||||
nachtischsatan-bot = { token }:
|
||||
pkgs.writers.writePython3 "nachtischsatan-bot" {
|
||||
libraries = [ pkgs.python3Packages.python-telegram-bot ];
|
||||
} ''
|
||||
import random
|
||||
import time
|
||||
|
||||
from telegram.ext import Updater, MessageHandler
|
||||
from telegram.ext.filters import Filters
|
||||
from telegram.ext import Updater, MessageHandler
|
||||
from telegram.ext.filters import Filters
|
||||
|
||||
|
||||
def flubber(bot, update):
|
||||
time.sleep(random.randrange(4000) / 1000)
|
||||
update.message.reply_text("*flubberflubber*")
|
||||
def flubber(bot, update):
|
||||
time.sleep(random.randrange(4000) / 1000)
|
||||
update.message.reply_text("*flubberflubber*")
|
||||
|
||||
|
||||
updater = Updater(
|
||||
'${token}'
|
||||
)
|
||||
updater = Updater(
|
||||
'${token}'
|
||||
)
|
||||
|
||||
updater.dispatcher.add_handler(MessageHandler(Filters.all, flubber))
|
||||
updater.dispatcher.add_handler(MessageHandler(Filters.all, flubber))
|
||||
|
||||
updater.start_polling()
|
||||
updater.idle()
|
||||
'';
|
||||
in
|
||||
{
|
||||
updater.start_polling()
|
||||
updater.idle()
|
||||
'';
|
||||
in {
|
||||
systemd.services.telegram-nachtischsatan = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
description = "*flubberflubber*";
|
||||
|
||||
@@ -6,15 +6,15 @@ let
|
||||
rev = "f4201c5419354377a26b7f7873368683efbea417";
|
||||
sha256 = "1ixffmxy3sxy2if7fd44ps451rds14hnz4d0x9nkh8lzshqk6v4y";
|
||||
};
|
||||
telegram-proverb = pkgs.python3Packages.callPackage proverb-bot-package {};
|
||||
in
|
||||
{
|
||||
telegram-proverb = pkgs.python3Packages.callPackage proverb-bot-package { };
|
||||
in {
|
||||
systemd.services.telegram-proverb = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
description = "Telegram bot for generating inspiring but useless proverbs";
|
||||
environment.TELEGRAM_PROVERB_TOKEN = lib.strings.fileContents <secrets/telegram/proverb.token>;
|
||||
environment.TELEGRAM_PROVERB_TOKEN =
|
||||
lib.strings.fileContents <secrets/telegram/proverb.token>;
|
||||
enable = true;
|
||||
script = ''${telegram-proverb}/bin/proverb_bot.py'';
|
||||
script = "${telegram-proverb}/bin/proverb_bot.py";
|
||||
serviceConfig.Restart = "always";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,12 +1,17 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
{
|
||||
{ config, pkgs, lib, ... }: {
|
||||
imports = [
|
||||
<niveum/configs/default.nix>
|
||||
<niveum/configs/kdeconnect.nix>
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
services.xserver.xrandrHeads = [ { output = "HDMI1"; primary = true; } "LVDS1" ];
|
||||
services.xserver.xrandrHeads = [
|
||||
{
|
||||
output = "HDMI1";
|
||||
primary = true;
|
||||
}
|
||||
"LVDS1"
|
||||
];
|
||||
|
||||
environment.systemPackages = [ pkgs.zeroad pkgs.minecraft ];
|
||||
|
||||
|
||||
@@ -1,26 +1,31 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
imports =
|
||||
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
|
||||
];
|
||||
{ config, lib, pkgs, ... }: {
|
||||
imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ehci_pci"
|
||||
"ahci"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
"sr_mod"
|
||||
"rtsx_usb_sdmmc"
|
||||
];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/83544ad3-1d23-4c2d-82bc-fafef13a996f";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/83544ad3-1d23-4c2d-82bc-fafef13a996f";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/8F9E-7556";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/8F9E-7556";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/5ea3a65e-8fdb-45fb-ad32-3759d991a83a"; }
|
||||
];
|
||||
[{ device = "/dev/disk/by-uuid/5ea3a65e-8fdb-45fb-ad32-3759d991a83a"; }];
|
||||
|
||||
# services.xserver.videoDrivers = [ "nvidia" ];
|
||||
|
||||
|
||||
@@ -1,17 +1,13 @@
|
||||
{ config, pkgs, ... }:
|
||||
let
|
||||
sshKey.rilke = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWRcTILWzSzOAWqwBjJC97K9wKm+pfxk15L5AiTUlUMyBzVQsU+d2jUEe1rmp+kjVXL0qgNMI+eBzEAzaafUMdCPeIkMyeiOlXaYxq8NHApcZUSYV9CmzWqePj8Dlu8uexoF3TJi6tj3mmGM8BY50qkwk4mlT/5xLPPnh/HHyFmoZlj6183Z4vJRnK8UZ6x2gevVaE36lP27MikZ/MQ6/PaHJ5TNZy63rQwzKXw6ZQMx4JU22CwyZqPn1wjlGEkpJFOBKtnypURdVBsPydaZd/I7b/13FMwso2hSUoXqeV6iaeno2FWOrB3cAaFogNWKPRkEacKEE5mQOvLGGdG1Xp u0_a138@localhost";
|
||||
sshKey.rilke =
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWRcTILWzSzOAWqwBjJC97K9wKm+pfxk15L5AiTUlUMyBzVQsU+d2jUEe1rmp+kjVXL0qgNMI+eBzEAzaafUMdCPeIkMyeiOlXaYxq8NHApcZUSYV9CmzWqePj8Dlu8uexoF3TJi6tj3mmGM8BY50qkwk4mlT/5xLPPnh/HHyFmoZlj6183Z4vJRnK8UZ6x2gevVaE36lP27MikZ/MQ6/PaHJ5TNZy63rQwzKXw6ZQMx4JU22CwyZqPn1wjlGEkpJFOBKtnypURdVBsPydaZd/I7b/13FMwso2hSUoXqeV6iaeno2FWOrB3cAaFogNWKPRkEacKEE5mQOvLGGdG1Xp u0_a138@localhost";
|
||||
in {
|
||||
imports = [
|
||||
<niveum/configs/default.nix>
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
imports = [ <niveum/configs/default.nix> ./hardware-configuration.nix ];
|
||||
|
||||
services.xserver.xrandrHeads = [ "eDP1" ];
|
||||
|
||||
users.users.me.openssh.authorizedKeys.keys = [
|
||||
sshKey.rilke
|
||||
];
|
||||
users.users.me.openssh.authorizedKeys.keys = [ sshKey.rilke ];
|
||||
|
||||
niveum = {
|
||||
batteryBlocks.default = "BAT1";
|
||||
|
||||
@@ -1,26 +1,23 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
imports =
|
||||
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
|
||||
];
|
||||
{ config, lib, pkgs, ... }: {
|
||||
imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usb_storage" "sd_mod" "sdhci_acpi" "rtsx_usb_sdmmc" ];
|
||||
boot.initrd.availableKernelModules =
|
||||
[ "ahci" "xhci_pci" "usb_storage" "sd_mod" "sdhci_acpi" "rtsx_usb_sdmmc" ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/8bc52e48-58e0-463d-8268-941a5a54cd4a";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/8bc52e48-58e0-463d-8268-941a5a54cd4a";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/6E76-4ED9";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/6E76-4ED9";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/b7728657-9dbd-4377-bbc9-17252b8b88d0"; }
|
||||
];
|
||||
[{ device = "/dev/disk/by-uuid/b7728657-9dbd-4377-bbc9-17252b8b88d0"; }];
|
||||
|
||||
nix.maxJobs = lib.mkDefault 4;
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||
|
||||
@@ -6,7 +6,10 @@
|
||||
./hardware-configuration.nix
|
||||
<stockholm/krebs/2configs/hw/x220.nix>
|
||||
{
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [ tp_smapi acpi_call ];
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [
|
||||
tp_smapi
|
||||
acpi_call
|
||||
];
|
||||
boot.kernelModules = [ "tp_smapi" "acpi_call" ];
|
||||
environment.systemPackages = [ pkgs.tpacpi-bat ];
|
||||
}
|
||||
|
||||
@@ -1,26 +1,23 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
imports =
|
||||
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
|
||||
];
|
||||
{ config, lib, pkgs, ... }: {
|
||||
imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||
boot.initrd.availableKernelModules =
|
||||
[ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/b700a1f4-127e-40d3-a1cf-d194785e915b";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/b700a1f4-127e-40d3-a1cf-d194785e915b";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/4474-04C0";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/4474-04C0";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/d1d62358-dce2-4081-849c-b4a9852c1c1b"; }
|
||||
];
|
||||
[{ device = "/dev/disk/by-uuid/d1d62358-dce2-4081-849c-b4a9852c1c1b"; }];
|
||||
|
||||
nix.maxJobs = lib.mkDefault 4;
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||
|
||||
Reference in New Issue
Block a user