~sumner/home-manager-config

c63d78e4c5de4c910cec3a220b07ea98c57d114f — Sumner Evans 8 months ago 007101e
a couple more fixes
3 files changed, 21 insertions(+), 5 deletions(-)

M programs/default.nix
M services/window-manager/common.nix
M services/window-manager/wayland.nix
M programs/default.nix => programs/default.nix +1 -0
@@ 63,6 63,7 @@ in
    vdirsyncer
    watchexec
    wget
    xdg_utils
    youtube-dl
    zip


M services/window-manager/common.nix => services/window-manager/common.nix +8 -1
@@ 54,6 54,7 @@
      enable = true;
      config = rec {
        inherit fonts;
        focus.forceWrapping = true;
        gaps.inner = gapSize;
        modifier = config.windowManager.modKey;
        terminal = config.home.sessionVariables.TERMINAL;


@@ 117,12 118,18 @@
          F4 = "exec ${menucalc}/bin/= -- -lines 3"; # menu-calc
          F3 = "exec ${pkgs.rofi-pass}/bin/rofi-pass -- -i";

          # MOVEMENT
          # FOCUS
          "${modifier}+${left}" = "focus left";
          "${modifier}+${down}" = "focus down";
          "${modifier}+${up}" = "focus up";
          "${modifier}+${right}" = "focus right";

          # MOVEMENT
          "${modifier}+Shift+${left}" = "move left";
          "${modifier}+Shift+${down}" = "move down";
          "${modifier}+Shift+${up}" = "move up";
          "${modifier}+Shift+${right}" = "move right";

          # SPLIT IN HORIZONTAL/VERTICAL ORIENTATION
          "${modifier}+semicolon" = "split h";
          "${modifier}+v" = "split v";

M services/window-manager/wayland.nix => services/window-manager/wayland.nix +12 -4
@@ 2,6 2,7 @@
  cfg = config.wayland;
  common = import ./common.nix { inherit config lib pkgs; };
  clipmanHistpath = ''--histpath="${config.xdg.cacheHome}/clipman.json"'';
  clipmanCmd = "${pkgs.clipman}/bin/clipman";
in
{
  options = {


@@ 22,13 23,13 @@ in
    wayland.windowManager.sway = mkMerge [
      common.i3SwayConfig
      {
        wrapperFeatures.gtk = true;
        config.startup = let
          wlpaste = "${pkgs.wl-clipboard}/bin/wl-paste";
          clipman = "${pkgs.clipman}/bin/clipman";
        in
          [
            { command = "${wlpaste} -t text --watch ${clipman} store ${clipmanHistpath}"; }
            { command = "${wlpaste} -p -t text --watch ${clipman} store -P ${clipmanHistpath}"; }
            { command = "${wlpaste} -t text --watch ${clipmanCmd} store ${clipmanHistpath}"; }
            { command = "${wlpaste} -p -t text --watch ${clipmanCmd} store -P ${clipmanHistpath}"; }
            { command = "${pkgs.mako}/bin/mako"; }
          ];



@@ 51,7 52,7 @@ in
        in
          {
            # Popup Clipboard Manager
            "${modifier}+c" = "exec ${pkgs.clipman}/bin/clipman pick -t rofi ${clipmanHistpath}";
            "${modifier}+c" = "exec ${clipmanCmd} pick -t rofi ${clipmanHistpath}";

            # Lock screen
            "${modifier}+Shift+x" = "exec ${swaylockCmd}";


@@ 76,6 77,13 @@ in

    home.packages = with pkgs; [
      clipman
      glib
      grim
      slurp
      v4l-utils
      wf-recorder
      wl-clipboard # clipboard management
      # TODO use wofi?
    ];

    # Gammastep