Merge branch 'master' of ssh://narwhal/nix-config

feat/kile-v2
Ricard Illa 2022-05-11 19:59:53 +02:00
commit 138496cb9d
No known key found for this signature in database
GPG Key ID: F69A672B72E54902
3 changed files with 24 additions and 19 deletions

View File

@ -2,6 +2,6 @@
{ {
imports = [ ./nixos.nix ]; imports = [ ./nixos.nix ];
# programs.alacritty.settings.font.size = 9; programs.alacritty.settings.font.size = 9;
programs.alacritty.settings.font.size = 7; # programs.alacritty.settings.font.size = 7;
} }

View File

@ -2,6 +2,6 @@
{ {
imports = imports =
# [ ./nixos-common.nix ./desktop-sway ./alacritty/capibara.nix ./theming ]; [ ./nixos-common.nix ./desktop-sway ./alacritty/capibara.nix ./theming ];
[ ./nixos-common.nix ./desktop-xmonad/capibara.nix ./alacritty/capibara.nix ./theming ]; # [ ./nixos-common.nix ./desktop-xmonad/capibara.nix ./alacritty/capibara.nix ./theming ];
} }

View File

@ -7,23 +7,23 @@ let
playerctl = "${pkgs.playerctl}/bin/playerctl"; playerctl = "${pkgs.playerctl}/bin/playerctl";
wallpapers = "${config.home.homeDirectory}/Images/wallpapers/enabled"; 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 # # todo: do it properly like in https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/security/pass/rofi-pass.nix
tessenSrc = builtins.fetchTarball { # tessenSrc = builtins.fetchTarball {
url = # url =
"https://github.com/ayushnix/tessen/releases/download/v1.3.1/tessen-1.3.1.tar.gz"; # "https://github.com/ayushnix/tessen/releases/download/v1.3.1/tessen-1.3.1.tar.gz";
}; # };
tessen = pkgs.runCommandLocal "tessen" { # tessen = pkgs.runCommandLocal "tessen" {
nativeBuildInputs = [ pkgs.makeWrapper ]; # nativeBuildInputs = [ pkgs.makeWrapper ];
} '' # } ''
install -m755 ${tessenSrc}/tessen -D $out/bin/tessen # install -m755 ${tessenSrc}/tessen -D $out/bin/tessen
patchShebangs $out/bin/tessen # patchShebangs $out/bin/tessen
wrapProgram $out/bin/tessen \ # wrapProgram $out/bin/tessen \
--prefix PATH: ${pkgs.lib.makeBinPath [ pkgs.bash ]} # --prefix PATH: ${pkgs.lib.makeBinPath [ pkgs.bash ]}
''; # '';
in { in {
home.packages = [ tessen ]; # home.packages = [ tessen ];
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;
@ -119,7 +119,7 @@ in {
"${cfg.modifier}+space" = "layout toggle all"; "${cfg.modifier}+space" = "layout toggle all";
"${cfg.modifier}+Shift+space" = "layout default"; "${cfg.modifier}+Shift+space" = "layout default";
"${cfg.modifier}+p" = "exec ${tessen}/bin/tessen"; # "${cfg.modifier}+p" = "exec ${tessen}/bin/tessen";
"XF86AudioRaiseVolume" = "XF86AudioRaiseVolume" =
"exec ${pactl} set-sink-volume @DEFAULT_SINK@ +5%"; "exec ${pactl} set-sink-volume @DEFAULT_SINK@ +5%";
@ -162,6 +162,11 @@ in {
bars = [ ]; bars = [ ];
startup = [{
command = "${pkgs.autotiling}/bin/autotiling";
always = true;
}];
}; };
}; };
} }