From 1b67156339cd67a4f48acec2bee04713df7b89a9 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Fri, 7 Jun 2024 23:19:55 +0200 Subject: [PATCH] Update deps --- flake.lock | 14 ++++----- home/programs/aerospace.nix | 61 +++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 7 deletions(-) create mode 100644 home/programs/aerospace.nix diff --git a/flake.lock b/flake.lock index 7adf507..0fe4e5a 100644 --- a/flake.lock +++ b/flake.lock @@ -244,11 +244,11 @@ ] }, "locked": { - "lastModified": 1717725670, - "narHash": "sha256-nURdNRUrr2MX+OvSs3PsM/Bi7rH4e8McxIp9/kmvZY0=", + "lastModified": 1717763180, + "narHash": "sha256-ssOv3kUI77iiDavYFdKsy9VINHespE84iUXWBNuDT3s=", "ref": "refs/heads/master", - "rev": "3eccd578f35a374b21a3cd571529d9d71ca3b96f", - "revCount": 844, + "rev": "3365694f924f27b62fd2520a75d695c8dffe2c84", + "revCount": 845, "type": "git", "url": "https://git.kempkens.io/daniel/nix-overlay" }, @@ -295,11 +295,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1717696284, - "narHash": "sha256-fTVayDBrX3FjXUjhRMHVGGRBC9IUCpHJzJQrAzu+iI0=", + "lastModified": 1717737457, + "narHash": "sha256-hqHp0W7ibfdu5DFc6EG3S3c+GSAbti7VUldFXSf/WiI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a73df7dc951cdc1dd7060340a524f0124cec4986", + "rev": "bf3faad723ca984fc4ea95c1cee1d975a8ca2a28", "type": "github" }, "original": { diff --git a/home/programs/aerospace.nix b/home/programs/aerospace.nix new file mode 100644 index 0000000..de622f8 --- /dev/null +++ b/home/programs/aerospace.nix @@ -0,0 +1,61 @@ +{ pkgs, lib, ... }: + +let + settingsFormat = pkgs.formats.toml { }; + + settings = { + start-at-login = true; + + enable-normalization-flatten-containers = false; + enable-normalization-opposite-orientation-for-nested-containers = false; + + default-root-container-layout = "tiles"; + default-root-container-orientation = "auto"; + + gaps = { + inner = { + horizontal = 10; + vertical = 10; + }; + + outer = { + left = 10; + bottom = 10; + top = 10; + right = 10; + }; + }; + + key-mapping = { + preset = "qwerty"; + }; + + mode.main.binding = + let + meh = "ctrl-alt-shift"; + in + { + "${meh}-h" = "move left"; + "${meh}-j" = "move down"; + "${meh}-k" = "move up"; + "${meh}-l" = "move right"; + + "${meh}-w" = "move-node-to-monitor --wrap-around left"; + "${meh}-e" = "move-node-to-monitor --wrap-around right"; + + "${meh}-f" = "fullscreen"; + + "${meh}-t" = "layout floating tiling"; + }; + }; +in +{ + home.packages = [ pkgs.aerospace ]; + + xdg.configFile."aerospace/aerospace.toml".source = settingsFormat.generate "aerospace.toml" settings; + + home.activation.aeorspaceConfig = lib.hm.dag.entryAfter [ "writeBoundary" ] /* bash */ '' + $VERBOSE_ECHO "Reloading configuration" + $DRY_RUN_CMD ${pkgs.aerospace}/bin/aerospace reload-config + ''; +}