diff options
| -rw-r--r-- | home.nix | 2 | ||||
| -rw-r--r-- | modules/slock.nix | 18 | ||||
| -rw-r--r-- | overlays.nix | 8 | ||||
| -rw-r--r-- | platforms/linux/configuration.nix | 8 | ||||
| -rw-r--r-- | platforms/linux/xorg/config.h | 2 | ||||
| -rw-r--r-- | platforms/linux/xorg/slock/slock-dpms-1.4.diff | 10 | ||||
| -rw-r--r-- | programs/newsboat/urls | 5 | ||||
| -rw-r--r-- | programs/zsh/postcomp.zshrc | 1 |
8 files changed, 39 insertions, 15 deletions
diff --git a/home.nix b/home.nix index 9055b0f..acd7a74 100644 --- a/home.nix +++ b/home.nix @@ -87,7 +87,7 @@ in slack-dark signal-desktop pandoc - texlive.combined.scheme-basic + texlive.combined.scheme-medium zathura ] ++ common_packages; diff --git a/modules/slock.nix b/modules/slock.nix index 85c78de..d98e898 100644 --- a/modules/slock.nix +++ b/modules/slock.nix @@ -17,13 +17,17 @@ let in { environment.systemPackages = [ slock ]; security.wrappers.slock.source = "${slock.out}/bin/slock"; - services.xserver.xautolock = { + # services.xserver.xautolock = { + # enable = true; + # locker = "${config.security.wrapperDir}/slock"; + # enableNotifier = true; + # notifier = "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\""; + # killer = "/run/current-system/systemd/bin/systemctl suspend-then-hibernate"; + # killtime = 30; + # extraOptions = [ "-detectsleep" ]; + # }; + programs.xss-lock = { enable = true; - locker = "${config.security.wrapperDir}/slock"; - enableNotifier = true; - notifier = "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\""; - killer = "/run/current-system/systemd/bin/systemctl suspend-then-hibernate"; - killtime = 30; - extraOptions = [ "-detectsleep" ]; + lockerCommand = "${config.security.wrapperDir}/slock"; }; } diff --git a/overlays.nix b/overlays.nix index c2c842e..eb503c9 100644 --- a/overlays.nix +++ b/overlays.nix @@ -18,5 +18,13 @@ sha256 = "08m6w0d2z8n0wlvffgfaglyrydxw895z0hk7x2b41x44zkrc3zx5"; }) { }).brave; + discord = super.discord.overrideAttrs (_: rec { + version = "0.0.13"; + src = super.fetchurl { + url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; + sha256 = "0d5z6cbj9dg3hjw84pyg75f8dwdvi2mqxb9ic8dfqzk064ssiv7y"; + }; + }); + }) ] diff --git a/platforms/linux/configuration.nix b/platforms/linux/configuration.nix index f65f430..1a23c55 100644 --- a/platforms/linux/configuration.nix +++ b/platforms/linux/configuration.nix @@ -66,6 +66,8 @@ in options v4l2loopback exclusive_caps=1 video_nr=9 card_label="obs" ''; + boot.cleanTmpDir = true; + fileSystems = { "/home" = { device = "/dev/disk/by-label/home"; @@ -269,6 +271,12 @@ in services.xserver.displayManager.startx.enable = true; services.xserver.layout = "pl"; # services.xserver.xkbOptions = "eurosign:e"; + services.xserver.deviceSection = '' + Option "TearFree" "true" + ''; + services.xserver.wacom = { + enable = true; + }; # Enable touchpad support. services.xserver.libinput = { diff --git a/platforms/linux/xorg/config.h b/platforms/linux/xorg/config.h index 5807cdf..96c64b6 100644 --- a/platforms/linux/xorg/config.h +++ b/platforms/linux/xorg/config.h @@ -191,7 +191,7 @@ static Key keys[] = { { MODKEY, XK_x, incrgaps, {.i = -3 } }, /* { MODKEY|ShiftMask, XK_x, spawn, SHCMD("") }, */ { MODKEY, XK_c, spawn, SHCMD("Discord") }, - /* { MODKEY|ShiftMask, XK_c, spawn, SHCMD("") }, */ + { MODKEY|ShiftMask, XK_c, spawn, SHCMD("caffeine") }, /* V is automatically bound above in STACKKEYS */ { MODKEY, XK_b, togglebar, {0} }, { MODKEY|ShiftMask, XK_b, spawn, SHCMD("y2mpv") }, diff --git a/platforms/linux/xorg/slock/slock-dpms-1.4.diff b/platforms/linux/xorg/slock/slock-dpms-1.4.diff index 027bbf7..a3548ff 100644 --- a/platforms/linux/xorg/slock/slock-dpms-1.4.diff +++ b/platforms/linux/xorg/slock/slock-dpms-1.4.diff @@ -3,12 +3,12 @@ index 9855e21..d01bd38 100644 --- a/config.def.h +++ b/config.def.h @@ -10,3 +10,6 @@ static const char *colorname[NUMCOLS] = { - + /* treat a cleared input like a wrong password (color) */ static const int failonclear = 1; + +/* time in seconds before the monitor shuts down */ -+static const int monitortime = 5; ++static const int monitortime = 20; diff --git a/slock.c b/slock.c index d2f0886..f65a43b 100644 --- a/slock.c @@ -26,13 +26,13 @@ index d2f0886..f65a43b 100644 Display *dpy; int s, nlocks, nscreens; + CARD16 standby, suspend, off; - + ARGBEGIN { case 'v': @@ -366,6 +368,20 @@ main(int argc, char **argv) { if (nlocks != nscreens) return 1; - + + /* DPMS magic to disable the monitor */ + if (!DPMSCapable(dpy)) + die("slock: DPMSCapable failed\n"); @@ -53,7 +53,7 @@ index d2f0886..f65a43b 100644 @@ -383,5 +399,9 @@ main(int argc, char **argv) { /* everything is now blank. Wait for the correct password */ readpw(dpy, &rr, locks, nscreens, hash); - + + /* reset DPMS values to inital ones */ + DPMSSetTimeouts(dpy, standby, suspend, off); + XSync(dpy, 0); diff --git a/programs/newsboat/urls b/programs/newsboat/urls index 70a53f9..bf38b1e 100644 --- a/programs/newsboat/urls +++ b/programs/newsboat/urls @@ -23,7 +23,8 @@ https://weekly.nixos.org/feeds/all.rss.xml "~NixOS Weekly" "tech" https://christine.website/blog.rss "~Christine Dodrill" "tech" https://portal.mozz.us/gemini/makeworld.gq/gemlog/atom.xml?raw=1 "~makeworld" "tech" https://portal.mozz.us/gemini/gemini.marmaladefoo.com/cgi-bin/atom-feed.cgi%3Flukee?raw=1 "~Luke Emmet" -https://proxy.vulpes.one/gemini/otrn.org/atom.xml +https://proxy.vulpes.one/gemini/sunshinegardens.org/~abrahms/atom.xml +https://justin.abrah.ms/feed.xml ## Youtube @@ -37,6 +38,8 @@ https://www.youtube.com/feeds/videos.xml?channel_id=UCpPndhUatYo4NLn3fleQ2Fw "~H https://www.youtube.com/feeds/videos.xml?channel_id=UCMGoHTJH-ZjsKLfpWON8Q1g "~Earthship" "yt" https://www.youtube.com/feeds/videos.xml?channel_id=UCFzGyNKXPAglNq28qWYTDFA "~Kai Hendry" "yt" https://www.youtube.com/feeds/videos.xml?channel_id=UCTdPpKcVp03tjGhMWyKtIFQ "~Tin Can Bros" "yt" +https://www.youtube.com/feeds/videos.xml?channel_id=UCnZx--LpG2spgmlxOcC-DRA +https://www.youtube.com/feeds/videos.xml?channel_id=UCYO_jab_esuFRV4b17AJtAw ## Luke Smith luke "~## LUKE SMITH ##" diff --git a/programs/zsh/postcomp.zshrc b/programs/zsh/postcomp.zshrc index 178240f..e6f50b4 100644 --- a/programs/zsh/postcomp.zshrc +++ b/programs/zsh/postcomp.zshrc @@ -7,6 +7,7 @@ bindkey -M menuselect 'h' vi-backward-char bindkey -M menuselect 'k' vi-up-line-or-history bindkey -M menuselect 'l' vi-forward-char bindkey -M menuselect 'j' vi-down-line-or-history +bindkey '^R' history-incremental-search-backward bindkey -v '^?' backward-delete-char # Change cursor shape for different vi modes. |