workout: fix 20.03 update
This commit is contained in:
Ingolf Wagner
parent
7f6be89cf7
commit
67b59d050c
13 changed files with 24 additions and 32 deletions
|
|
@ -57,8 +57,8 @@
|
|||
configuration.fireqos = {
|
||||
enable = true;
|
||||
interface = "eth0";
|
||||
input = 30000;
|
||||
output = 2000;
|
||||
input = 45000;
|
||||
output = 8000;
|
||||
balance = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ in {
|
|||
};
|
||||
|
||||
# nextcloud setup
|
||||
later.services.nextcloud = {
|
||||
services.nextcloud = {
|
||||
enable = true;
|
||||
autoUpdateApps.enable = true;
|
||||
nginx.enable = true;
|
||||
|
|
|
|||
|
|
@ -27,11 +27,12 @@ in {
|
|||
|
||||
# lvm volume group
|
||||
# ----------------
|
||||
boot.initrd.luks.devices = [{
|
||||
name = "vg";
|
||||
device = "/dev/sda2";
|
||||
preLVM = true;
|
||||
}];
|
||||
boot.initrd.luks.devices = {
|
||||
vg = {
|
||||
device = "/dev/sda2";
|
||||
preLVM = true;
|
||||
};
|
||||
};
|
||||
|
||||
# NTFS support
|
||||
# ------------
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
imports = [
|
||||
|
||||
./later/syncthing.nix
|
||||
./later/nextcloud.nix
|
||||
#./later/nextcloud.nix
|
||||
|
||||
./services/castget.nix
|
||||
./services/home-assistant.nix
|
||||
|
|
|
|||
|
|
@ -14,10 +14,7 @@ in {
|
|||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
powerOnBoot = true;
|
||||
extraConfig = ''
|
||||
[General]
|
||||
AutoConnect=true
|
||||
'';
|
||||
config.General.AutoConnect = true;
|
||||
};
|
||||
|
||||
services.blueman.enable = true;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ in {
|
|||
|
||||
fonts = {
|
||||
|
||||
enableCoreFonts = true;
|
||||
enableFontDir = true;
|
||||
enableGhostscriptFonts = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -32,10 +32,8 @@ in {
|
|||
|
||||
# window-manager : Xmonad
|
||||
# -----------------------
|
||||
desktopManager = {
|
||||
default = "none";
|
||||
xterm.enable = false;
|
||||
};
|
||||
desktopManager = { xterm.enable = false; };
|
||||
displayManager.defaultSession = "none+xmonad";
|
||||
displayManager.lightdm = {
|
||||
enable = true;
|
||||
autoLogin.enable = true;
|
||||
|
|
@ -44,7 +42,6 @@ in {
|
|||
windowManager = {
|
||||
xmonad.enable = true;
|
||||
xmonad.enableContribAndExtras = true;
|
||||
default = "xmonad";
|
||||
};
|
||||
|
||||
# mouse/touchpad
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "1vflkrld7qiikykna2ygw6cv8vn07x458pkrsrxm8imhm579076r";
|
||||
};
|
||||
|
||||
cargoSha256 = "07pwds279qc54g5fza805ah2m8jhrdzng7vb1bi24a9ra9ci8s29";
|
||||
verifyCargoDeps = true;
|
||||
cargoSha256 = "10s1h1xya2gl5wj9cj104z50d9awv8z2mbply22lpzwzqyxrrxd9";
|
||||
#verifyCargoDeps = true;
|
||||
|
||||
buildInputs = [ cairo ];
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description =
|
||||
"An image generator unsing entropy and a JSON as configuration.";
|
||||
homepage = "https://git.ingolf-wagner.de/palo/image-generator2";
|
||||
license = licenses.gplv3;
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.mrVanDalo ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec {
|
|||
};
|
||||
|
||||
cargoSha256 = "1ijnh2ank9slmfglw4yhnycl11x26m94m2hiq3hcasmbs6c39zj5";
|
||||
verifyCargoDeps = true;
|
||||
#verifyCargoDeps = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description =
|
||||
"A fast line-oriented regex search tool, similar to ag and ack";
|
||||
homepage = "https://github.com/mrvandalo/taskwarrior-hooks";
|
||||
license = licenses.gplv3;
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.mrVanDalo ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with stdenv.lib; {
|
||||
description = "tools I use in my shell scripts which should be fast";
|
||||
homepage = "https://git.ingolf-wagner.de/palo/terminal-tools";
|
||||
license = licenses.gplv3;
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.mrVanDalo ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ let
|
|||
#home-manager.file = toString ~/dev/home-manager;
|
||||
home-manager.git = {
|
||||
url = "https://github.com/rycee/home-manager.git";
|
||||
ref = "024d1aa227978fe2dae2fb3e56bab9a7237c2401";
|
||||
ref = "a378bccd609c159fa8d421233b9c5eae04f02042";
|
||||
};
|
||||
|
||||
background-image-generators.git = {
|
||||
|
|
|
|||
|
|
@ -46,11 +46,9 @@
|
|||
#time.timeZone = lib.mkDefault "Asia/Singapore";
|
||||
#time.timeZone = lib.mkDefault "Asia/Makassar";
|
||||
|
||||
i18n = {
|
||||
consoleFont = "Lat2-Terminus16";
|
||||
consoleKeyMap = "us";
|
||||
defaultLocale = "en_US.UTF-8";
|
||||
};
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
console.font = "Lat2-Terminus16";
|
||||
console.keyMap = "us";
|
||||
|
||||
# swappiness
|
||||
# ----------
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ let
|
|||
nixStartAlbert = "${pkgs.albert}/bin/albert"
|
||||
nixStartCopyq = "${pkgs.copyq}/bin/copyq"
|
||||
nixShowCopyq = "${pkgs.copyq}/bin/copyq show"
|
||||
nixStartTerminal = "${pkgs.rxvt_unicode_with-plugins}/bin/urxvtc"
|
||||
nixStartTerminal = "${pkgs.rxvt_unicode}/bin/urxvtc"
|
||||
nixAlsaRaiseVolume = "${pkgs.alsaUtils}/bin/amixer set Master 5%+"
|
||||
nixAlsaLowerVolume = "${pkgs.alsaUtils}/bin/amixer set Master 5%-"
|
||||
nixAlsaMute = "${pkgs.alsaUtils}/bin/amixer set Master toggle"
|
||||
|
|
|
|||
Loading…
Reference in a new issue