about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--awesome/.config/awesome/rc.lua28
-rw-r--r--nix/configuration.nix3
-rw-r--r--nix/devel.nix8
-rw-r--r--nix/games.nix2
4 files changed, 22 insertions, 19 deletions
diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
index 4574167..357a6be 100644
--- a/awesome/.config/awesome/rc.lua
+++ b/awesome/.config/awesome/rc.lua
@@ -60,7 +60,9 @@ local calcurse = terminal .. " -e calcurse"
 local aerc = terminal .. " -e aerc"
 local amfora = terminal .. " -e amfora"
 local emacs = "emacs"
+local senpai = terminal .. " -e senpai"
 local slock_suspend = "slock systemctl --ignore-inhibitors suspend"
+local weechat = terminal .. " -e weechat"
 
 -- Audacious media player
 local play_pause = "playerctl play-pause"
@@ -499,7 +501,7 @@ local globalkeys = awful.util.table.join(
               end
             end,
             {description = "add fake screens", group = "screen"}),
-  awful.key({modkey}, "u", awful.client.urgent.jumpto,
+  awful.key({modkey, "Shift"}, "u", awful.client.urgent.jumpto,
             {description = "jump to urgent client", group = "client"}),
   awful.key({modkey}, "Tab",
             function ()
@@ -519,6 +521,8 @@ local globalkeys = awful.util.table.join(
             {description = "open Emacs", group = "launcher"}),
   awful.key({modkey}, "e", spawner(aerc),
             {description = "open aerc", group = "launcher"}),
+  awful.key({modkey}, "u", spawner(weechat),
+            {description = "open weechat", group = "launcher"}),
   awful.key({modkey}, "c", spawner(calcurse),
             {description = "open calcurse", group = "launcher"}),
   awful.key({modkey}, "a", spawner"liferea",
@@ -531,6 +535,10 @@ local globalkeys = awful.util.table.join(
             {description = "open Firefox", group = "launcher"}),
   awful.key({modkey, "Shift"}, "f", spawner"torbrowser-launcher",
             {description = "open Tor Browser", group = "launcher"}),
+  awful.key({modkey}, "o", function ()
+              awful.spawn.with_shell("mpv --ytdl-format=b $(xclip -out -selection clipboard)")
+            end,
+            {description = "open URL with mpv", group = "launcher"}),
   awful.key({modkey}, "t", spawner"transmission-gtk",
             {description = "open Transmission", group = "launcher"}),
   awful.key({modkey, "Shift"}, "t", spawner"thunderbird",
@@ -547,12 +555,12 @@ local globalkeys = awful.util.table.join(
             {description = "lock screen", group = "launcher"}),
   awful.key({modkey, "Shift"}, "s", spawner(slock_suspend),
             {description = "lock screen then suspend", group = "launcher"}),
-  awful.key({modkey}, "m", spawner"nheko -p halogen",
+  awful.key({modkey}, "i", spawner(senpai),
+            {description = "open senpai", group = "launcher"}),
+  awful.key({modkey, "Shift"}, "m", spawner"nheko -p halogen",
             {description = "open Nheko for Halogen City", group = "launcher"}),
-  awful.key({modkey, "Shift"}, "m", spawner"nheko -p loang",
+  awful.key({modkey}, "m", spawner"nheko -p loang",
             {description = "open Nheko for loang network", group = "launcher"}),
-  awful.key({modkey, "Shift"}, "m", spawner"tootle",
-            {description = "open Tootle", group = "launcher"}),
   awful.key({modkey, "Shift"}, "-", spawner"audacious",
             {description = "Audacious: jump-to-song", group = "multimedia"}),
   awful.key({modkey}, "=", spawner(play_pause),
@@ -766,7 +774,9 @@ awful.rules.rules = {
 
   -- Add titlebars to normal clients and dialogs
   {rule_any = {type = {"normal", "dialog"}},
-   properties = {titlebars_enabled = true}}
+   properties = {
+     titlebars_enabled = function(c) return not c.requests_no_titlebar end,
+   }}
 
   -- Set Firefox to always map on the tag named "2" on screen 1.
   -- {rule = {class = "Firefox"},
@@ -835,12 +845,6 @@ client.connect_signal(
       },
       layout = wibox.layout.align.horizontal
     }
-
-    -- Show titlebar if client is floating, hide otherwise.
-    --if not c.floating and
-    --   awful.layout.get(c.screen) ~= awful.layout.suit.floating then
-    --  awful.titlebar.hide(c)
-    --end
   end
 )
 
diff --git a/nix/configuration.nix b/nix/configuration.nix
index e77fc68..83e0682 100644
--- a/nix/configuration.nix
+++ b/nix/configuration.nix
@@ -144,8 +144,7 @@
       oathToolkit isync stow tor w3m wget yt-dlp
       imv mpv pavucontrol sent yacreader
       ffmpeg mkvtoolnix mediainfo simplescreenrecorder sox
-      # darktable
-      gimp imagemagick pdftk
+      darktable gimp imagemagick pdftk
     ];
     wordlist.enable = true;
   };
diff --git a/nix/devel.nix b/nix/devel.nix
index a74ad73..28311f8 100644
--- a/nix/devel.nix
+++ b/nix/devel.nix
@@ -2,15 +2,15 @@
 
 {
   environment.systemPackages = with pkgs; [
-    bat fd jq ripgrep vim_configurable vimpager-latest
-    exa gitAndTools.gitFull minicom man-pages man-pages-posix rlwrap
-    gcc go guile_3_0 lua rakudo zig
+    bat comma fd jq ripgrep vim_configurable
     bintools gdb gnumake pkg-config
+    exa gitAndTools.gitFull minicom rlwrap
+    gcc go guile_3_0 lua rakudo zig
+    man-pages man-pages-posix stdman
     texlive.combined.scheme-full
     (python3.withPackages (pypkgs: with pypkgs; [ flit rsskey ]))
   ];
 
-  programs.mtr.enable = true;
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
diff --git a/nix/games.nix b/nix/games.nix
index 827631d..7b90d75 100644
--- a/nix/games.nix
+++ b/nix/games.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
-    _20kly hedgewars scorched3d zeroad # strategy
+    _20kly hedgewars scorched3d # strategy
     astromenace chromium-bsu # scrolling
     taisei # shmup
     bastet moon-buggy n2048 ttyper # text