From 9cfe4734c9f081a8c341cae4ac4c2a140e38ffe0 Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Sat, 7 May 2022 15:45:08 +0200 Subject: [PATCH] moved capibara to sway again --- home/alacritty/capibara.nix | 4 ++-- home/capibara.nix | 4 ++-- home/desktop-sway/sway.nix | 35 ++++++++++++++++++++--------------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/home/alacritty/capibara.nix b/home/alacritty/capibara.nix index 3ff3497..be4689d 100644 --- a/home/alacritty/capibara.nix +++ b/home/alacritty/capibara.nix @@ -2,6 +2,6 @@ { imports = [ ./nixos.nix ]; - # programs.alacritty.settings.font.size = 9; - programs.alacritty.settings.font.size = 7; + programs.alacritty.settings.font.size = 9; + # programs.alacritty.settings.font.size = 7; } diff --git a/home/capibara.nix b/home/capibara.nix index 5b91da2..d46cfc3 100644 --- a/home/capibara.nix +++ b/home/capibara.nix @@ -2,6 +2,6 @@ { imports = - # [ ./nixos-common.nix ./desktop-sway ./alacritty/capibara.nix ./theming ]; - [ ./nixos-common.nix ./desktop-xmonad/capibara.nix ./alacritty/capibara.nix ./theming ]; + [ ./nixos-common.nix ./desktop-sway ./alacritty/capibara.nix ./theming ]; + # [ ./nixos-common.nix ./desktop-xmonad/capibara.nix ./alacritty/capibara.nix ./theming ]; } diff --git a/home/desktop-sway/sway.nix b/home/desktop-sway/sway.nix index dfcad3e..48e25ee 100644 --- a/home/desktop-sway/sway.nix +++ b/home/desktop-sway/sway.nix @@ -7,23 +7,23 @@ let playerctl = "${pkgs.playerctl}/bin/playerctl"; wallpapers = "${config.home.homeDirectory}/Images/wallpapers/enabled"; - # todo: do it properly like in https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/security/pass/rofi-pass.nix - tessenSrc = builtins.fetchTarball { - url = - "https://github.com/ayushnix/tessen/releases/download/v1.3.1/tessen-1.3.1.tar.gz"; - }; + # # todo: do it properly like in https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/security/pass/rofi-pass.nix + # tessenSrc = builtins.fetchTarball { + # url = + # "https://github.com/ayushnix/tessen/releases/download/v1.3.1/tessen-1.3.1.tar.gz"; + # }; - tessen = pkgs.runCommandLocal "tessen" { - nativeBuildInputs = [ pkgs.makeWrapper ]; - } '' - install -m755 ${tessenSrc}/tessen -D $out/bin/tessen - patchShebangs $out/bin/tessen - wrapProgram $out/bin/tessen \ - --prefix PATH: ${pkgs.lib.makeBinPath [ pkgs.bash ]} - ''; + # tessen = pkgs.runCommandLocal "tessen" { + # nativeBuildInputs = [ pkgs.makeWrapper ]; + # } '' + # install -m755 ${tessenSrc}/tessen -D $out/bin/tessen + # patchShebangs $out/bin/tessen + # wrapProgram $out/bin/tessen \ + # --prefix PATH: ${pkgs.lib.makeBinPath [ pkgs.bash ]} + # ''; in { - home.packages = [ tessen ]; + # home.packages = [ tessen ]; wayland.windowManager.sway = { enable = true; wrapperFeatures.gtk = true; @@ -119,7 +119,7 @@ in { "${cfg.modifier}+space" = "layout toggle all"; "${cfg.modifier}+Shift+space" = "layout default"; - "${cfg.modifier}+p" = "exec ${tessen}/bin/tessen"; + # "${cfg.modifier}+p" = "exec ${tessen}/bin/tessen"; "XF86AudioRaiseVolume" = "exec ${pactl} set-sink-volume @DEFAULT_SINK@ +5%"; @@ -162,6 +162,11 @@ in { bars = [ ]; + startup = [{ + command = "${pkgs.autotiling}/bin/autotiling"; + always = true; + }]; + }; }; }