diff --git a/config.nix b/config.nix index ab20347..0d6aca9 100644 --- a/config.nix +++ b/config.nix @@ -185,11 +185,11 @@ in { home.file = { # ".background-image".source = ./art/37333571_p0_master1200.jpg; ".config/mpv/input.conf".text = import ./dot/mpv.nix; - ".config/xfce4/terminal/terminalrc".text = import ./dot/terminal.nix; ".config/zathura/zathurarc".text = "set selection-clipboard clipboard"; ".ghc/ghci.conf".text = import ./dot/ghci.nix { inherit pkgs; }; ".ssh/config".text = import ./dot/ssh.nix { inherit lib; }; ".stack/config.yaml".text = import ./dot/stack.nix { user = config.constants.user; }; + ".Xresources".text = import ./dot/xresources.nix; ".zshrc".text = "# nothing to see here"; }; }; diff --git a/configs/graphics.nix b/configs/graphics.nix index 53c7287..7774cdf 100644 --- a/configs/graphics.nix +++ b/configs/graphics.nix @@ -289,9 +289,8 @@ in { ${pkgs.dropbox-cli}/bin/dropbox start & ${pkgs.seafile-client}/bin/seafile-applet & ''; - desktopManager.xterm.enable = false; - # desktopManager.wallpaper.mode = "fill"; - windowManager.default = "i3"; + desktopManager.xterm.enable = true; + windowManager.default = "i3"; windowManager.i3 = { enable = true; configFile = pkgs.writeText "i3.conf" i3_conf; diff --git a/configs/packages.nix b/configs/packages.nix index b3a56f9..fb11816 100644 --- a/configs/packages.nix +++ b/configs/packages.nix @@ -53,7 +53,6 @@ with pkgs; whois xclip xfce.ristretto - xfce.terminal xfce.thunar xfce.tumbler xorg.xbacklight diff --git a/dot/terminal.nix b/dot/terminal.nix deleted file mode 100644 index 7c8981c..0000000 --- a/dot/terminal.nix +++ /dev/null @@ -1,26 +0,0 @@ -with import ../theme.nix; -'' -[Configuration] -BackgroundDarkness=0.9 -BackgroundMode=TERMINAL_BACKGROUND_TRANSPARENT -ColorBackground=${veryDark} -ColorCursor=${gray.light} -ColorForeground=${gray.light} -ColorPalette=${builtins.concatStringsSep ";" colorPalette} -FontName=${terminalFont.regular.name} ${toString terminalFont.size} -MiscAlwaysShowTabs=FALSE -MiscBell=TRUE -MiscBordersDefault=FALSE -MiscConfirmClose=FALSE -MiscCursorBlinks=TRUE -MiscCursorShape=TERMINAL_CURSOR_SHAPE_IBEAM -MiscHighlightUrls=TRUE -MiscMenubarDefault=FALSE -MiscMiddleClickOpensUri=TRUE -MiscMouseAutohide=FALSE -MiscMouseWheelZoom=TRUE -MiscRewrapOnResize=TRUE -MiscToolbarDefault=FALSE -ScrollingBar=TERMINAL_SCROLLBAR_NONE -TitleMode=TERMINAL_TITLE_HIDE -'' diff --git a/dot/xresources.nix b/dot/xresources.nix new file mode 100644 index 0000000..958e9de --- /dev/null +++ b/dot/xresources.nix @@ -0,0 +1,13 @@ +'' +*XTerm.termName: xterm-256color +*XTerm.vt100.locale: true +*XTerm.vt100.saveLines: 4096 +*XTerm.vt100.geometry: 80x32 +*XTerm.vt100.reverseVideo: true +*XTerm.vt100.faceName: Source Code Pro for Powerline:size=10:antialias=true +*XTerm.vt100.font: 7x13 +*xterm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48 +*XTerm.vt100.translations: #override \n\ + Ctrl Shift C: copy-selection(CLIPBOARD) \n\ + Ctrl Shift V: insert-selection(CLIPBOARD) +'' diff --git a/options.nix b/options.nix index d574dcc..094a7af 100644 --- a/options.nix +++ b/options.nix @@ -14,7 +14,7 @@ let }; in { options.defaultApplications = mapAttrs (const stringOption) { - terminal = "${pkgs.xfce.terminal}/bin/xfce4-terminal"; + terminal = "${pkgs.xterm}/bin/xterm"; browser = "${pkgs.chromium}/bin/chromium"; fileManager = "${pkgs.xfce.thunar}/bin/thunar"; locker = "${pkgs.i3lock}/bin/i3lock -e -c ${strings.removePrefix "#" gray.dark}";