From 6247465a1262f447494342bcf0b39f22b5d0d340 Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Wed, 19 May 2021 16:11:13 +0200 Subject: Updates & tweaks --- machines/x220/configuration.nix | 3 +++ machines/x220/hardware-configuration.nix | 9 +++++++++ modules/larbs.nix | 1 + pkgs/dwm/config.h | 8 ++++---- pkgs/nvim.nix | 2 +- pkgs/st.config.h | 2 +- platforms/linux/gtk.nix | 2 +- programs/nvim.nix | 2 +- 8 files changed, 21 insertions(+), 8 deletions(-) diff --git a/machines/x220/configuration.nix b/machines/x220/configuration.nix index 6bb4e44..28110b6 100644 --- a/machines/x220/configuration.nix +++ b/machines/x220/configuration.nix @@ -40,6 +40,9 @@ in networking = { hostName = "x220"; + firewall.allowedTCPPorts = [ + 6969 # qrcp + ]; networkmanager = { enable = true; diff --git a/machines/x220/hardware-configuration.nix b/machines/x220/hardware-configuration.nix index d2c7fbc..4f7b908 100755 --- a/machines/x220/hardware-configuration.nix +++ b/machines/x220/hardware-configuration.nix @@ -45,6 +45,15 @@ device = "/dev/disk/by-label/docker"; fsType = "ext4"; }; + "/mnt/qnap" = { + device = "//192.168.1.119/Patryk"; + fsType = "cifs"; + options = let + # this line prevents hanging on network split + automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,vers=1.0"; + + in ["${automount_opts},credentials=/etc/nixos/smb-secrets"]; + }; }; swapDevices = [ { device = "/dev/sda2"; } ]; diff --git a/modules/larbs.nix b/modules/larbs.nix index e27c8a3..070f263 100755 --- a/modules/larbs.nix +++ b/modules/larbs.nix @@ -64,6 +64,7 @@ in TERM = "st"; TERMINAL = "st"; BROWSER = "brave"; + GTK_THEME = "Adwaita:dark"; }; services.xserver = { diff --git a/pkgs/dwm/config.h b/pkgs/dwm/config.h index b8d14ac..41928c4 100644 --- a/pkgs/dwm/config.h +++ b/pkgs/dwm/config.h @@ -11,10 +11,10 @@ static const unsigned int systraypinning = 0; /* 0: sloppy systray follows sel static const unsigned int systrayspacing = 2; /* systray spacing */ static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/ static const int showsystray = 1; /* 0 means no systray */ -static const unsigned int gappih = 6; /* horiz inner gap between windows */ -static const unsigned int gappiv = 6; /* vert inner gap between windows */ -static const unsigned int gappoh = 6; /* horiz outer gap between windows and screen edge */ -static const unsigned int gappov = 6; /* vert outer gap between windows and screen edge */ +static const unsigned int gappih = 0; /* horiz inner gap between windows */ +static const unsigned int gappiv = 0; /* vert inner gap between windows */ +static const unsigned int gappoh = 0; /* horiz outer gap between windows and screen edge */ +static const unsigned int gappov = 0; /* vert outer gap between windows and screen edge */ static const int swallowfloating = 0; /* 1 means swallow floating windows by default */ static const int smartgaps = 0; /* 1 means no outer gap when there is only one window */ static const int showbar = 1; /* 0 means no bar */ diff --git a/pkgs/nvim.nix b/pkgs/nvim.nix index 6ce3e7b..9dbf07d 100755 --- a/pkgs/nvim.nix +++ b/pkgs/nvim.nix @@ -122,7 +122,7 @@ pkgs.neovim.override { set expandtab set linebreak set colorcolumn=80 - highlight ColorColumn ctermbg=235 + highlight ColorColumn ctermbg=8 let g:ycm_key_list_select_completion = ['', ''] diff --git a/pkgs/st.config.h b/pkgs/st.config.h index 2f09e39..67b3dc1 100644 --- a/pkgs/st.config.h +++ b/pkgs/st.config.h @@ -7,7 +7,7 @@ */ static char *font = "mono:pixelsize=14:antialias=true:autohint=true"; static char *font2[] = { "JoyPixels:pixelsize=10:antialias=true:autohint=true" }; -static int borderpx = 2; +static int borderpx = 10; /* * What program is execed by st depends of these precedence rules: diff --git a/platforms/linux/gtk.nix b/platforms/linux/gtk.nix index e1712ed..a0d60e4 100644 --- a/platforms/linux/gtk.nix +++ b/platforms/linux/gtk.nix @@ -8,7 +8,7 @@ gtk = { enable = true; - theme.name = "gruvbox-dark-hard"; + theme.name = "Adwaita:dark"; iconTheme.name = "Papirus"; font.name = "Noto Sans 10"; gtk3.extraConfig = { diff --git a/programs/nvim.nix b/programs/nvim.nix index 6ce3e7b..9dbf07d 100644 --- a/programs/nvim.nix +++ b/programs/nvim.nix @@ -122,7 +122,7 @@ pkgs.neovim.override { set expandtab set linebreak set colorcolumn=80 - highlight ColorColumn ctermbg=235 + highlight ColorColumn ctermbg=8 let g:ycm_key_list_select_completion = ['', ''] -- cgit 1.4.1