Compare commits

..

No commits in common. "1e49032fbfec10b51c9f627aab286290ac15977c" and "ced545f644d2be67877b3b7a5798b11722a95cfd" have entirely different histories.

2 changed files with 61 additions and 41 deletions

View File

@ -4,47 +4,68 @@
# Nixpkgs / NixOS version to use. # Nixpkgs / NixOS version to use.
inputs.nixpkgs.url = "nixpkgs/nixos-unstable"; inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
outputs = { outputs = { self, nixpkgs }:
self, let
nixpkgs,
}: let
# to work with older version of flakes
lastModifiedDate = self.lastModifiedDate or self.lastModified or "19700101";
# Generate a user-friendly version number. # to work with older version of flakes
version = builtins.substring 0 8 lastModifiedDate; lastModifiedDate = self.lastModifiedDate or self.lastModified or "19700101";
# System types to support. # Generate a user-friendly version number.
supportedSystems = ["x86_64-linux" "aarch64-linux"]; version = builtins.substring 0 8 lastModifiedDate;
# Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'. # System types to support.
forAllSystems = nixpkgs.lib.genAttrs supportedSystems; supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
# Nixpkgs instantiated for supported system types. # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
in {
# Provide some binary packages for selected system types.
packages = forAllSystems (system: let
pkgs = nixpkgsFor.${system};
in {
swaysw = pkgs.buildGoModule {
pname = "swaysw";
inherit version;
src = ./.;
ldFlags = ["-s -w"];
vendorSha256 = null;
}; # Nixpkgs instantiated for supported system types.
}); nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
devShells = forAllSystems (system: let in
pkgs = nixpkgsFor.${system}; {
in {
default = pkgs.mkShell {
buildInputs = with pkgs; [go gopls gotools go-tools wofi];
};
});
defaultPackage = forAllSystems (system: self.packages.${system}.swaysw); # Provide some binary packages for selected system types.
}; packages = forAllSystems (system:
let
pkgs = nixpkgsFor.${system};
in
{
swaysw = pkgs.buildGoModule {
pname = "swaysw";
inherit version;
# In 'nix develop', we don't need a copy of the source tree
# in the Nix store.
src = ./.;
# This hash locks the dependencies of this package. It is
# necessary because of how Go requires network access to resolve
# VCS. See https://www.tweag.io/blog/2021-03-04-gomod2nix/ for
# details. Normally one can build with a fake sha256 and rely on native Go
# mechanisms to tell you what the hash should be or determine what
# it should be "out-of-band" with other tooling (eg. gomod2nix).
# To begin with it is recommended to set this, but one must
# remeber to bump this hash when your dependencies change.
vendorSha256 = null;
#vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
};
});
# Add dependencies that are only needed for development
devShells = forAllSystems (system:
let
pkgs = nixpkgsFor.${system};
in
{
default = pkgs.mkShell {
buildInputs = with pkgs; [ go gopls gotools go-tools wofi ];
};
});
# The default package for 'nix build'. This makes sense if the
# flake provides only one package or there is a clear "main"
# package.
defaultPackage = forAllSystems (system: self.packages.${system}.swaysw);
};
} }

View File

@ -44,7 +44,7 @@ func selectWithWofi(windows string) string {
cmd.Stdin = strings.NewReader(windows) cmd.Stdin = strings.NewReader(windows)
stdout, err := cmd.Output() stdout, err := cmd.Output()
if err != nil { if err != nil {
return "" log.Fatal(err)
} }
return strings.TrimSpace(string(stdout)) return strings.TrimSpace(string(stdout))
} }
@ -82,8 +82,7 @@ func main() {
var windows []window var windows []window
flatten(swaymsg_output, &windows) flatten(swaymsg_output, &windows)
if selected := selectWithWofi(getWindowNames(windows)); selected != "" { selected := selectWithWofi(getWindowNames(windows))
windowId := findWindowId(selected, windows) windowId := findWindowId(selected, windows)
switchToWindow(windowId) switchToWindow(windowId)
}
} }