summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorGrigory Shipunov2022-06-11 23:28:31 +0200
committerGrigory Shipunov2022-06-11 23:28:31 +0200
commitf422ad701ce41373e7a293160faf5a19eeea19fa (patch)
tree411df2ce3e39385a9bae2c3010f4e090e92fad5b /modules
parent3924624e7516464d2f24cd19b62c02072436850c (diff)
nixpkgs-fmt
Diffstat (limited to 'modules')
-rw-r--r--modules/basic-tools.nix12
-rw-r--r--modules/binary-caches.nix4
-rw-r--r--modules/chromium.nix2
-rw-r--r--modules/dvb-dump-nfs-automount.nix2
-rw-r--r--modules/entertainment.nix3
-rw-r--r--modules/graphical.nix10
-rw-r--r--modules/tlp.nix4
-rw-r--r--modules/wireguard.nix10
8 files changed, 30 insertions, 17 deletions
diff --git a/modules/basic-tools.nix b/modules/basic-tools.nix
index 1500f82..e42d162 100644
--- a/modules/basic-tools.nix
+++ b/modules/basic-tools.nix
@@ -62,8 +62,8 @@
ls = "exa";
ll = "exa -l";
l = "exa -al";
- ssh="TERM=xterm-256color ssh";
- mutt="neomutt";
+ ssh = "TERM=xterm-256color ssh";
+ mutt = "neomutt";
};
users.defaultUserShell = pkgs.zsh;
@@ -75,10 +75,10 @@
bindkey -e
'';
promptInit = ''
- source /run/current-system/sw/share/zsh/plugins/liquidprompt/liquidprompt
-if [[ -n "$IN_NIX_SHELL" ]]; then
- prompt_tag "(nix-shell)"
-fi
+ source /run/current-system/sw/share/zsh/plugins/liquidprompt/liquidprompt
+ if [[ -n "$IN_NIX_SHELL" ]]; then
+ prompt_tag "(nix-shell)"
+ fi
'';
};
diff --git a/modules/binary-caches.nix b/modules/binary-caches.nix
index 7b6a5bd..373e653 100644
--- a/modules/binary-caches.nix
+++ b/modules/binary-caches.nix
@@ -1,5 +1,9 @@
{ pkgs, lib, ... }: {
nix = {
+ extraOptions = ''
+ builders-use-substitutes = true
+ '';
+
registry.microvm = {
from = {
type = "indirect";
diff --git a/modules/chromium.nix b/modules/chromium.nix
index 412ec59..dd3ac49 100644
--- a/modules/chromium.nix
+++ b/modules/chromium.nix
@@ -1,4 +1,4 @@
-{config, pkgs, ... }:
+{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
diff --git a/modules/dvb-dump-nfs-automount.nix b/modules/dvb-dump-nfs-automount.nix
index 9032402..2dce2ea 100644
--- a/modules/dvb-dump-nfs-automount.nix
+++ b/modules/dvb-dump-nfs-automount.nix
@@ -16,7 +16,7 @@
systemd.automounts = [{
wantedBy = [ "multi-user.target" ];
requires = [ "wg-quick-wg-dvb.service" ];
- automountConfig= {
+ automountConfig = {
TimeoutIdleSec = "600";
};
where = "/mnt/dvb";
diff --git a/modules/entertainment.nix b/modules/entertainment.nix
new file mode 100644
index 0000000..92d3e93
--- /dev/null
+++ b/modules/entertainment.nix
@@ -0,0 +1,3 @@
+{ pkgs, ... }
+{
+}
diff --git a/modules/graphical.nix b/modules/graphical.nix
index 729cb1d..9c86493 100644
--- a/modules/graphical.nix
+++ b/modules/graphical.nix
@@ -80,8 +80,8 @@
zeroconf.discovery.enable = true;
extraClientConf = ''
autospawn=yes
- '';
- };
+ '';
+ };
services.pipewire = {
enable = true;
@@ -133,5 +133,11 @@
programs.bash.vteIntegration = true;
services.upower.enable = true;
+ services.udisks2.enable = true;
+ environment.shellAliases = {
+ mnt = "udisksctl mount -b";
+ umnt = "udisksctl unmount -b";
+ };
+
qt5.platformTheme = "gnome";
}
diff --git a/modules/tlp.nix b/modules/tlp.nix
index 4310e74..2a498ab 100644
--- a/modules/tlp.nix
+++ b/modules/tlp.nix
@@ -3,10 +3,10 @@
{
powerManagement.cpuFreqGovernor = null;
services.power-profiles-daemon.enable = false;
- services.tlp ={
+ services.tlp = {
enable = true;
settings = {
- USB_BLACKLIST="1d50:604b 1d50:6089 1d50:cc15 1fc9:000c";
+ USB_BLACKLIST = "1d50:604b 1d50:6089 1d50:cc15 1fc9:000c";
};
};
}
diff --git a/modules/wireguard.nix b/modules/wireguard.nix
index d989570..17be0d0 100644
--- a/modules/wireguard.nix
+++ b/modules/wireguard.nix
@@ -3,8 +3,8 @@
{
networking.wg-quick.interfaces = {
wg-zw = {
- privateKeyFile=config.sops.secrets."wg/wg-zw-seckey".path;
- address = ["172.20.76.226" ];
+ privateKeyFile = config.sops.secrets."wg/wg-zw-seckey".path;
+ address = [ "172.20.76.226" ];
dns = [ "172.20.73.8" ];
peers = [
{
@@ -15,7 +15,7 @@
];
};
wg-dvb = {
- privateKeyFile=config.sops.secrets."wg/wg-dvb-seckey".path;
+ privateKeyFile = config.sops.secrets."wg/wg-dvb-seckey".path;
address = [ "10.13.37.3/32" ];
peers = [
@@ -29,11 +29,11 @@
};
mlwd-nl = {
- privateKeyFile=config.sops.secrets."wg/mlwd-nl-seckey".path;
+ privateKeyFile = config.sops.secrets."wg/mlwd-nl-seckey".path;
address = [ "10.65.79.164/32" "fc00:bbbb:bbbb:bb01::2:4fa3/128" ];
dns = [ "193.138.218.74" ];
- peers = [ {
+ peers = [{
publicKey = "StMPmol1+QQQQCJyAkm7t+l/QYTKe5CzXUhw0I6VX14=";
allowedIPs = [ "0.0.0.0/0" "::0/0" ];
endpoint = "92.60.40.194:51820";