diff options
| -rwxr-xr-x | machines/base.nix | 10 | ||||
| -rw-r--r-- | modules/dockd.nix | 8 | ||||
| -rw-r--r-- | modules/internet.nix | 22 | ||||
| -rwxr-xr-x | modules/pulseaudio.pa | 6 | ||||
| -rw-r--r-- | pkgs/dwm/config.h | 9 | ||||
| -rw-r--r-- | programs/newsboat/default.nix | 2 | ||||
| -rw-r--r-- | programs/newsboat/urls | 7 |
7 files changed, 41 insertions, 23 deletions
diff --git a/machines/base.nix b/machines/base.nix index 5c545ae..75935ec 100755 --- a/machines/base.nix +++ b/machines/base.nix @@ -36,9 +36,17 @@ }; ## === XDG === - environment.variables = { + environment.variables = rec { XDG_CONFIG_HOME = "$HOME/.config"; + XDG_CACHE_HOME = "$HOME/.cache"; XDG_DATA_HOME = "$HOME/.local/share"; + XDG_RUNTIME_DIR = "/run/user/$UID"; + + # == XDG overrides == + ICEAUTHORITY = "${XDG_CACHE_HOME}/ICEauthority"; + XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority"; + LESSHISTFILE = "${XDG_CACHE_HOME}/lesshist"; + MPLAYER_HOME = "$XDG_CONFIG_HOME/mplayer"; }; ## === Vim configuration === diff --git a/modules/dockd.nix b/modules/dockd.nix index d8a1582..0993e81 100644 --- a/modules/dockd.nix +++ b/modules/dockd.nix @@ -21,15 +21,15 @@ in environment.etc = { "dockd/docked.conf".text = '' [Screen] -height=1180 -width=3940 +height=1080 +width=3840 mm_height=311 mm_width=1041 [CRTC] crtc=63 x=0 -y=100 +y=0 rotation=1 mode=1920x1080 outputs_len=1 @@ -37,7 +37,7 @@ outputs_0=HDMI3 [CRTC] crtc=64 -x=2020 +x=1920 y=0 rotation=1 mode=1920x1080 diff --git a/modules/internet.nix b/modules/internet.nix index dedc269..bb0e554 100644 --- a/modules/internet.nix +++ b/modules/internet.nix @@ -1,15 +1,23 @@ ## Basic rules for interacting with the internet -{ pkgs, ... }: +{ pkgs, lib, ... }: { - networking.nameservers = [ - "1.1.1.1" - "8.8.8.8" - ]; + # networking.nameservers = lib.mkForce [ + # "192.168.1.136" + # "1.1.1.1" + # "8.8.8.8" + # ]; + + environment.etc."resolv.conf".text = '' + nameserver 192.168.1.136 + nameserver 1.1.1.1 + nameserver 8.8.8.8 + options edns0 + ''; networking.extraHosts = pkgs.stdenv.lib.readFile ( pkgs.fetchurl { - url = "https://raw.githubusercontent.com/StevenBlack/hosts/5a5016ab5bf0166e004147cb49ccd0114ed29b72/alternates/fakenews-gambling-porn/hosts"; - sha256 = "1c60fyzxz89bic6ymcvb8fcanyxpzr8v2z5vixxr79d8mj0vjswm"; + url = "https://raw.githubusercontent.com/StevenBlack/hosts/d2be343994aacdec74865ff8d159cf6e46359adf/alternates/fakenews-gambling-porn/hosts"; + sha256 = "1la5rd0znc25q8yd1iwbx22zzqi6941vyzmgar32jx568j856s8j"; } ); } diff --git a/modules/pulseaudio.pa b/modules/pulseaudio.pa index a4c2c0b..deb25e6 100755 --- a/modules/pulseaudio.pa +++ b/modules/pulseaudio.pa @@ -65,9 +65,9 @@ load-module module-bluetooth-discover .endif ### Load several protocols -.ifexists module-esound-protocol-unix.so -load-module module-esound-protocol-unix -.endif +###.ifexists module-esound-protocol-unix.so +###load-module module-esound-protocol-unix +###.endif load-module module-native-protocol-unix ### Network access (may be configured with paprefs, so leave this commented diff --git a/pkgs/dwm/config.h b/pkgs/dwm/config.h index 96c64b6..7a8b085 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 = 20; /* horiz inner gap between windows */ -static const unsigned int gappiv = 10; /* vert inner gap between windows */ -static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */ -static const unsigned int gappov = 20; /* 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 */ @@ -143,6 +143,7 @@ static Key keys[] = { { MODKEY|ShiftMask, XK_q, spawn, SHCMD("sysact") }, { MODKEY, XK_w, spawn, SHCMD("$BROWSER") }, { MODKEY|ShiftMask, XK_w, spawn, SHCMD(TERMINAL " -e sudo nmtui") }, + { MODKEY|ControlMask, XK_w, spawn, SHCMD(TERMINAL " -e w3m") }, { MODKEY, XK_e, spawn, SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook") }, { MODKEY|ShiftMask, XK_e, spawn, SHCMD(TERMINAL " -e abook") }, { MODKEY, XK_r, spawn, SHCMD(TERMINAL " -e lf") }, diff --git a/programs/newsboat/default.nix b/programs/newsboat/default.nix index 703e927..ebd590a 100644 --- a/programs/newsboat/default.nix +++ b/programs/newsboat/default.nix @@ -1,3 +1,3 @@ { - xdg.configFile."newsboat/urls".source = ./urls; + #xdg.configFile."newsboat/urls".source = ./urls; } diff --git a/programs/newsboat/urls b/programs/newsboat/urls index a8475c1..5b48008 100644 --- a/programs/newsboat/urls +++ b/programs/newsboat/urls @@ -1,9 +1,10 @@ ## ZHR zhr "~## ZHR ##" https://azymut.zhr.pl/feed/ "~Azymut ZHR" "zhr" -https://rssbridge.co.uk/?action=display&bridge=Facebook&context=User&u=7pdhbinduga&media_type=all&limit=-1&format=Atom "~7PDH Binduga (FB)" "zhr" -https://rssbridge.co.uk/?action=display&bridge=Facebook&context=User&u=watra7pdh&media_type=all&limit=-1&format=Atom "~7PDH Watra (FB)" "zhr" -https://rssbridge.co.uk/?action=display&bridge=Facebook&context=User&u=19pdhpuszcza&media_type=all&limit=-1&format=Atom "~19PDH Puszcza (FB)" "zhr" +https://feed.eugenemolotov.ru/?action=display&bridge=Facebook&context=User&u=7pdhbinduga&media_type=all&limit=-1&format=Atom "~7PDH Binduga (FB)" "zhr" +https://feed.eugenemolotov.ru/?action=display&bridge=Facebook&context=User&u=watra7pdh&media_type=all&limit=-1&format=Atom "~7PDH Watra (FB)" "zhr" +https://feed.eugenemolotov.ru/?action=display&bridge=Facebook&context=User&u=pikada19pdh&media_type=all&limit=-1&format=Atom "~19PDH Pikada" "zhr" +https://feed.eugenemolotov.ru/?action=display&bridge=Facebook&context=User&u=19pdhpuszcza&media_type=all&limit=-1&format=Atom "~19PDH Puszcza (FB)" "zhr" https://puszcza.netlify.app/rss.xml "~19PDH Puszcza (www)" ## Personal |