palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

workout: fix 20.03 update

Browse source
This commit is contained in:
Ingolf Wagner 2020-05-16 02:25:06 +02:00
parent 7f6be89cf7
commit 67b59d050c
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
13 changed files with 24 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configs/workhorse/configuration.nix
View file

@ -57,8 +57,8 @@
configuration.fireqos = { configuration.fireqos = {
enable = true; enable = true;
interface = "eth0"; interface = "eth0";
input = 30000; input = 45000;
output = 2000; output = 8000;
balance = false; balance = false;
}; };

2
configs/workhorse/nextcloud.nix
View file

@ -145,7 +145,7 @@ in {
}; };
# nextcloud setup # nextcloud setup
later.services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
autoUpdateApps.enable = true; autoUpdateApps.enable = true;
nginx.enable = true; nginx.enable = true;

11
configs/workout/hardware-configuration.nix
View file

@ -27,11 +27,12 @@ in {
# lvm volume group # lvm volume group
# ---------------- # ----------------
boot.initrd.luks.devices = [{ boot.initrd.luks.devices = {
name = "vg"; vg = {
device = "/dev/sda2"; device = "/dev/sda2";
preLVM = true; preLVM = true;
}]; };
};
# NTFS support # NTFS support
# ------------ # ------------

2
modules/default.nix
View file

@ -3,7 +3,7 @@
imports = [ imports = [
./later/syncthing.nix ./later/syncthing.nix
./later/nextcloud.nix #./later/nextcloud.nix
./services/castget.nix ./services/castget.nix
./services/home-assistant.nix ./services/home-assistant.nix

5
modules/system/bluetooth.nix
View file

@ -14,10 +14,7 @@ in {
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;
powerOnBoot = true; powerOnBoot = true;
extraConfig = '' config.General.AutoConnect = true;
[General]
AutoConnect=true
'';
}; };
services.blueman.enable = true; services.blueman.enable = true;

1
modules/system/font.nix
View file

@ -23,7 +23,6 @@ in {
fonts = { fonts = {
enableCoreFonts = true;
enableFontDir = true; enableFontDir = true;
enableGhostscriptFonts = true; enableGhostscriptFonts = true;

7
modules/system/x11.nix
View file

@ -32,10 +32,8 @@ in {
# window-manager : Xmonad # window-manager : Xmonad
# ----------------------- # -----------------------
desktopManager = { desktopManager = { xterm.enable = false; };
default = "none"; displayManager.defaultSession = "none+xmonad";
xterm.enable = false;
};
displayManager.lightdm = { displayManager.lightdm = {
enable = true; enable = true;
autoLogin.enable = true; autoLogin.enable = true;
@ -44,7 +42,6 @@ in {
windowManager = { windowManager = {
xmonad.enable = true; xmonad.enable = true;
xmonad.enableContribAndExtras = true; xmonad.enableContribAndExtras = true;
default = "xmonad";
}; };
# mouse/touchpad # mouse/touchpad

6
pkgs/image-generator/default.nix
View file

@ -10,8 +10,8 @@ rustPlatform.buildRustPackage rec {
sha256 = "1vflkrld7qiikykna2ygw6cv8vn07x458pkrsrxm8imhm579076r"; sha256 = "1vflkrld7qiikykna2ygw6cv8vn07x458pkrsrxm8imhm579076r";
}; };
cargoSha256 = "07pwds279qc54g5fza805ah2m8jhrdzng7vb1bi24a9ra9ci8s29"; cargoSha256 = "10s1h1xya2gl5wj9cj104z50d9awv8z2mbply22lpzwzqyxrrxd9";
verifyCargoDeps = true; #verifyCargoDeps = true;
buildInputs = [ cairo ]; buildInputs = [ cairo ];
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
description = description =
"An image generator unsing entropy and a JSON as configuration."; "An image generator unsing entropy and a JSON as configuration.";
homepage = "https://git.ingolf-wagner.de/palo/image-generator2"; homepage = "https://git.ingolf-wagner.de/palo/image-generator2";
license = licenses.gplv3; license = licenses.gpl3;
maintainers = [ maintainers.mrVanDalo ]; maintainers = [ maintainers.mrVanDalo ];
platforms = platforms.all; platforms = platforms.all;
}; };

4
pkgs/taskwarrior-hooks/default.nix
View file

@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec {
}; };
cargoSha256 = "1ijnh2ank9slmfglw4yhnycl11x26m94m2hiq3hcasmbs6c39zj5"; cargoSha256 = "1ijnh2ank9slmfglw4yhnycl11x26m94m2hiq3hcasmbs6c39zj5";
verifyCargoDeps = true; #verifyCargoDeps = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = description =
"A fast line-oriented regex search tool, similar to ag and ack"; "A fast line-oriented regex search tool, similar to ag and ack";
homepage = "https://github.com/mrvandalo/taskwarrior-hooks"; homepage = "https://github.com/mrvandalo/taskwarrior-hooks";
license = licenses.gplv3; license = licenses.gpl3;
maintainers = [ maintainers.mrVanDalo ]; maintainers = [ maintainers.mrVanDalo ];
platforms = platforms.all; platforms = platforms.all;
}; };

2
pkgs/terminal-tools/default.nix
View file

@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "tools I use in my shell scripts which should be fast"; description = "tools I use in my shell scripts which should be fast";
homepage = "https://git.ingolf-wagner.de/palo/terminal-tools"; homepage = "https://git.ingolf-wagner.de/palo/terminal-tools";
license = licenses.gplv3; license = licenses.gpl3;
maintainers = [ maintainers.mrVanDalo ]; maintainers = [ maintainers.mrVanDalo ];
platforms = platforms.all; platforms = platforms.all;
}; };

2
shell.nix
View file

@ -101,7 +101,7 @@ let
#home-manager.file = toString ~/dev/home-manager; #home-manager.file = toString ~/dev/home-manager;
home-manager.git = { home-manager.git = {
url = "https://github.com/rycee/home-manager.git"; url = "https://github.com/rycee/home-manager.git";
ref = "024d1aa227978fe2dae2fb3e56bab9a7237c2401"; ref = "a378bccd609c159fa8d421233b9c5eae04f02042";
}; };
background-image-generators.git = { background-image-generators.git = {

8
system/all/default.nix
View file

@ -46,11 +46,9 @@
#time.timeZone = lib.mkDefault "Asia/Singapore"; #time.timeZone = lib.mkDefault "Asia/Singapore";
#time.timeZone = lib.mkDefault "Asia/Makassar"; #time.timeZone = lib.mkDefault "Asia/Makassar";
i18n = { i18n.defaultLocale = "en_US.UTF-8";
consoleFont = "Lat2-Terminus16"; console.font = "Lat2-Terminus16";
consoleKeyMap = "us"; console.keyMap = "us";
defaultLocale = "en_US.UTF-8";
};
# swappiness # swappiness
# ---------- # ----------

2
system/desktop/home-manager/xmonad.nix
View file

@ -27,7 +27,7 @@ let
nixStartAlbert = "${pkgs.albert}/bin/albert" nixStartAlbert = "${pkgs.albert}/bin/albert"
nixStartCopyq = "${pkgs.copyq}/bin/copyq" nixStartCopyq = "${pkgs.copyq}/bin/copyq"
nixShowCopyq = "${pkgs.copyq}/bin/copyq show" 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%+" nixAlsaRaiseVolume = "${pkgs.alsaUtils}/bin/amixer set Master 5%+"
nixAlsaLowerVolume = "${pkgs.alsaUtils}/bin/amixer set Master 5%-" nixAlsaLowerVolume = "${pkgs.alsaUtils}/bin/amixer set Master 5%-"
nixAlsaMute = "${pkgs.alsaUtils}/bin/amixer set Master toggle" nixAlsaMute = "${pkgs.alsaUtils}/bin/amixer set Master toggle"