Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Partially support copy/paste feature #43

Merged
merged 1 commit into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions modules/app-launchers/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
package = [pkgs.chromium];
};
terminal = {
name = "Foot";
path = "${pkgs.foot}/bin/foot ${extraArgs}";
icon = "${pkgs.foot}/share/icons/hicolor/48x48/apps/foot.png";
package = [pkgs.foot];
name = "Terminal";
path = "${pkgs.terminator}/bin/terminator ${extraArgs}";
icon = "${pkgs.terminator}/share/icons/hicolor/48x48/apps/terminator.png";
package = [pkgs.terminator];
};
nmLauncher = {
name = "nmLauncher";
Expand Down
1 change: 1 addition & 0 deletions modules/custom-packages/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ _: {
(import ./registration-agent)
(import ./squeekboard)
(import ./sway-scripts)
(import ./terminator)
];
}
22 changes: 22 additions & 0 deletions modules/custom-packages/terminator/config.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/terminatorlib/config.py b/terminatorlib/config.py
index 008d1cfa..c2be42cf 100644
--- a/terminatorlib/config.py
+++ b/terminatorlib/config.py
@@ -230,7 +230,7 @@ DEFAULTS = {
'cursor_color_default' : True,
'term' : 'xterm-256color',
'colorterm' : 'truecolor',
- 'font' : 'Mono 10',
+ 'font' : 'Hack 12',
'foreground_color' : '#aaaaaa',
'show_titlebar' : True,
'scrollbar_position' : "right",
@@ -248,7 +248,7 @@ DEFAULTS = {
'login_shell' : False,
'use_custom_command' : False,
'custom_command' : '',
- 'use_system_font' : True,
+ 'use_system_font' : False,
'use_theme_colors' : False,
'bold_is_bright' : False,
'cell_height' : 1.0,
7 changes: 7 additions & 0 deletions modules/custom-packages/terminator/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Copyright 2022-2024 TII (SSRC) and the Ghaf contributors
# SPDX-License-Identifier: Apache-2.0
(final: _prev: {
terminator = _prev.terminator.overrideAttrs (old : {
patches = [ ./config.patch ];
});
})
1 change: 1 addition & 0 deletions modules/graphics/fonts.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ in {
lib.lists.optionals sway.enable [
font-awesome_5
font-awesome
hack-font
];
};
}
3 changes: 2 additions & 1 deletion modules/graphics/sway/config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set $down j
set $up k
set $right l
# Your preferred terminal emulator
set $term foot
set $term terminator
# Your preferred application launcher
# Note: pass the final command to swaymsg so that the resulting window can be opened
# on the original workspace that the command was run on.
Expand Down Expand Up @@ -198,5 +198,6 @@ bindsym $mod+c exec grim -g "$(slurp)" /tmp/$(date +'%H:%M:%S.png')
# start with sway
exec dbus-sway-environment
exec configure-gtk
exec wl-paste -t text --watch clipman store
exec_always nwg-panel
exec_always lisgd
3 changes: 2 additions & 1 deletion modules/graphics/sway/sway.nix
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ in
grim # screenshot functionality
slurp # screenshot functionality
wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout
clipman
mako # notification system developed by swaywm maintainer
wdisplays # tool to configure displays
wl-mirror # mirror displays
Expand Down Expand Up @@ -108,7 +109,7 @@ in
enable = true;
wrapperFeatures.gtk = true;
extraPackages = with pkgs; [
foot
terminator
xwayland
mako
kanshi
Expand Down
Loading