Skip to content
This repository was archived by the owner on Mar 3, 2023. It is now read-only.

Commit 5c387b4

Browse files
committed
Use as few i3wm variables as possible, in the i3config, and replace them with nix variables instead.
Expose rofi, not ust rofi -show run
1 parent 674ffcb commit 5c387b4

File tree

4 files changed

+10
-13
lines changed

4 files changed

+10
-13
lines changed

i3config-extra-example.nix

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
{ pkgs, ...}:
1+
{ pkgs, rofi, terminal, ...}:
22
''
33
set $mod Mod1
44
55
floating_modifier $mod
66
7-
bindsym $mod+o exec $launcher
8-
bindsym $mod+t exec $term
7+
bindsym $mod+o exec ${rofi} -show run
8+
bindsym $mod+p exec ${rofi} -show ssh
9+
bindsym $mod+t exec ${terminal}
910
bindsym $mod+Shift+q kill
1011
1112
# change focus
@@ -118,6 +119,6 @@ bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcu
118119
bindsym $mod+Control+l exec ${pkgs.i3lock-fancy}/bin/i3lock-fancy
119120
focus_follows_mouse no
120121
121-
exec --no-startup-id telegram-desktop
122-
exec --no-startup-id pidgin
122+
exec --no-startup-id ${pkgs.tdesktop}/bin/telegram-desktop
123+
exec --no-startup-id ${pkgs.pidgin}/bin/pidgin
123124
''

i3wm/i3config.nix

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
{ config-extra, terminal, launcher, conky, pkgs, config, wallpaper }:
1+
{ config-extra, terminal, rofi, conky, pkgs, config, wallpaper }:
22
let colors = import ../colors.nix; in
33
with colors;
44
''
5-
set $term ${terminal}
6-
set $launcher ${launcher}
7-
85
set $workspace1 1
96
set $workspace2 2
107
set $workspace3 3
@@ -64,6 +61,6 @@ ${
6461
exec --no-startup-id ${pkgs.feh}/bin/feh --bg-fill ${wallpaper}
6562
exec --no-startup-id ${conky}
6663
67-
${import config-extra {inherit pkgs terminal launcher config wallpaper;}}
64+
${import config-extra {inherit pkgs terminal rofi config wallpaper;}}
6865
6966
''

rice.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ let
1818
import ./i3wm/i3config.nix {
1919
config-extra = i3-config-extra;
2020
terminal = urxvt;
21-
launcher = rofi;
22-
inherit pkgs conky config wallpaper;
21+
inherit rofi pkgs conky config wallpaper;
2322
};
2423

2524
i3-config-file =

rofi/rofi.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let
1313

1414
roficmd =
1515
''
16-
${pkgs.coreutils}/bin/env XENVIRONMENT=${rofi-config-file} ${pkgs.rofi}/bin/rofi -display-run λ -show run
16+
${pkgs.coreutils}/bin/env XENVIRONMENT=${rofi-config-file} ${pkgs.rofi}/bin/rofi -display-run λ $@
1717
'';
1818

1919
in

0 commit comments

Comments
 (0)