Merge pull request #130 from DarkKirb/fixup-sway-config

Fix cofnig once more

config/desktop.nix

@@ -116,8 +116,4 @@ in {
     ibus.engines = with pkgs.ibus-engines; [anthy];
   };
   security.polkit.enable = true;
-  security.pam.services.kwallet = {
-    name = "kwallet";
-    enableKwallet = true;
-  };
 }

config/programs/foot.nix

@@ -5,7 +5,7 @@
     settings = {
       main = {
         term = "xterm-256color";
-        font = "FiraCode Nerd Font:size=12";
+        font = "FiraCode Nerd Font:size=6";
         dpi-aware = "yes";
       };
     };

config/programs/sway.nix

@@ -20,7 +20,7 @@
     }
 
     for k in $(seq 0 $((${c}{#win_ids[@]} - 1))); do
-        echo -e "<span weight=\\"bold\\">\\${c}{win_types[$k]}</span> - ${c}{win_names[$k]}"
+        echo -e "<span weight=\"bold\">${c}{win_types[$k]}</span> - ${c}{win_names[$k]}"
     done | rofi -dmenu -markup-rows -i -p window -format i | switch
   '';
   screenshot_then_switch = pkgs.writeScript "screenshotThenSwitch" ''
@@ -109,7 +109,7 @@ in {
       in
         lib.mkOptionDefault {
           "${modifier}+Return" = "exec ${pkgs.foot}/bin/foot";
-          "${modifier}+d" = "exec ${pkgs.rofi}/bin/rofi --show drun";
+          "${modifier}+d" = "exec ${pkgs.rofi}/bin/rofi -show drun";
           "Print" = "mode screenshot";
           "XF86AudioRaiseVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%";
           "XF86AudioLowerVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%";
@@ -158,6 +158,7 @@ in {
     extraConfig = ''
       exec ${configure-gtk}/bin/configure-gtk
       exec ${pkgs.systemd}/bin/systemctl --user import-environment
+      default_border none
       gaps outer 8
       gaps inner 4
     '';

config/programs/theming.nix

@@ -39,7 +39,7 @@ in {
     }
 
     window#waybar {
-      background: tranparent;
+      background: transparent;
       opacity: 0.9;
     }
 

config/programs/waybar.nix

@@ -20,8 +20,6 @@
           "memory"
           "temperature"
           "backlight"
-          "keyboard-state"
-          #          "sway/language"
           "battery"
           "battery#bat2"
           "clock"
@@ -63,8 +61,8 @@
           on-click = "${pkgs.mpc-cli}/bin/mpc toggle";
           on-click-middle = "${pkgs.foot}/bin/foot ${pkgs.ncmpcpp}/bin/ncmpcpp";
           on-click-right = "${pkgs.mpc-cli}/bin/mpc stop";
-          on-scroll-up = "${pkgs.mpc-cli}/bin/mpc seekthrough +00:00:10";
-          on-scroll-down = "${pkgs.mpc-cli}/bin/mpc seekthrough -00:00:10";
+          on-scroll-up = "${pkgs.mpc-cli}/bin/mpc seekthrough +00:00:01";
+          on-scroll-down = "${pkgs.mpc-cli}/bin/mpc seekthrough -00:00:01";
         };
         idle_inhibitor = {
           format = "{icon}";
@@ -78,7 +76,7 @@
         };
         clock = {
           tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
-          format = "{:%Y-%m-%dT%H:%M:%S+01:00}";
+          format = "{:%H:%M}";
         };
         cpu = {
           format = "{usage}% ";

utils/link-input.nix

@@ -1,7 +1,7 @@
 inputs: {lib, ...}: let
   # Taken from https://github.com/gytis-ivaskevicius/flake-utils-plus/blob/master/lib/options.nix
   inherit (lib) filterAttrs mapAttrs';
-  flakes = filterAttrs (name: value: value ? outputs) inputs;
+  flakes = filterAttrs (name: value: (name != "self") && (value ? outputs)) inputs;
   nixRegistry =
     builtins.mapAttrs
     (name: v: {flake = v;})