Compare commits
6
Commits
bbd16df0ef
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1c30651722 | ||
|
|
60daacc1d8 | ||
|
|
18385b7ae8 | ||
|
|
00724cf598 | ||
|
|
31b80abee2 | ||
|
|
3f2c40960f |
Generated
+16
-16
@@ -3,11 +3,11 @@
|
|||||||
"janet-pkgs": {
|
"janet-pkgs": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768783276,
|
"lastModified": 1786619609,
|
||||||
"narHash": "sha256-VPzMcRq8oerlHwDegKaqP6MpOMsUprDAAzyqrI7YEY8=",
|
"narHash": "sha256-fCA+/CcS9jMPz6WXY6UmPEOU0vHVaA1+S52QMV669Bk=",
|
||||||
"owner": "janet-lang",
|
"owner": "janet-lang",
|
||||||
"repo": "pkgs",
|
"repo": "pkgs",
|
||||||
"rev": "36e69933328cc7ac98ac8d59fca315906cd82384",
|
"rev": "1fcf04ec3abdff869232a38930fb357052189d45",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -51,11 +51,11 @@
|
|||||||
"lemongrass": {
|
"lemongrass": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765024507,
|
"lastModified": 1786160845,
|
||||||
"narHash": "sha256-OUqK57EYh6McnxnbvqoPm92eBMYM5iNaPuN6R0yZHA4=",
|
"narHash": "sha256-YMK+vYsXlujH5HyYKKPgiF3+2vpvGXIAEhsh0IHe1no=",
|
||||||
"owner": "pyrmont",
|
"owner": "pyrmont",
|
||||||
"repo": "lemongrass",
|
"repo": "lemongrass",
|
||||||
"rev": "906974b82ba06ed421e0c8cd9a56c6ddc4ca6820",
|
"rev": "494e2835138b23f75bc8ffb3e0940491ca45696f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -66,11 +66,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1780750590,
|
"lastModified": 1788453257,
|
||||||
"narHash": "sha256-1TMOErEkQatevyUn4Y/wpriZuj+8a8GFdqITzDuWDMw=",
|
"narHash": "sha256-ifjnnUKt0L1EDCOPfKnmuhGYieiMU7kTMoEs7ilaR7A=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4bb2f933a726f6164c2c7066ca03f5684de94f2a",
|
"rev": "1a662c3d6251125fd069fecc30faeea85dff4c20",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -82,11 +82,11 @@
|
|||||||
"river": {
|
"river": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1780581500,
|
"lastModified": 1788442116,
|
||||||
"narHash": "sha256-ufnhCOsVa8QGZGsmTrYRdC9fN+Z5ma7j5Cjxvn9Dhik=",
|
"narHash": "sha256-rHWlDaEtO0NzZPbd5swLYTxkBTRK6Vt4tRKWf1U7wNo=",
|
||||||
"ref": "main",
|
"ref": "main",
|
||||||
"rev": "76b9f619c74a1ddebfad3c798b189b5458b06009",
|
"rev": "ce0922c1848bf341db325609be5809e08e6e82b8",
|
||||||
"revCount": 1721,
|
"revCount": 1757,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://codeberg.org/river/river.git"
|
"url": "https://codeberg.org/river/river.git"
|
||||||
},
|
},
|
||||||
@@ -110,11 +110,11 @@
|
|||||||
"spork": {
|
"spork": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776515126,
|
"lastModified": 1788443601,
|
||||||
"narHash": "sha256-4oKmRjwDMRwlnntHOh3k2XG3pNxQ239Hgvw7zlokoCQ=",
|
"narHash": "sha256-gAt1lH1hE7RETlmBCPT98kUuDSkaztRBU1+QcN+A9Eg=",
|
||||||
"owner": "janet-lang",
|
"owner": "janet-lang",
|
||||||
"repo": "spork",
|
"repo": "spork",
|
||||||
"rev": "993887a8dbc9387af3b037418f02ef8e2b42b275",
|
"rev": "e4b4db5d2c1b29563e8cf203738283dd7149dcc0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -87,14 +87,7 @@
|
|||||||
src = ./.;
|
src = ./.;
|
||||||
nativeBuildInputs = [pkgs.pkg-config janet-pm];
|
nativeBuildInputs = [pkgs.pkg-config janet-pm];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
(pkgs.wayland.overrideAttrs (final: prev: {
|
pkgs.wayland
|
||||||
# patches = [
|
|
||||||
# (pkgs.fetchpatch {
|
|
||||||
# url = "https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/485.patch";
|
|
||||||
# hash = "sha256-gd5BRE/ioFMM86Q8HLSzdvuwDDaqws0b3HiInC0nNgQ=";
|
|
||||||
# })
|
|
||||||
# ];
|
|
||||||
}))
|
|
||||||
pkgs.wayland-scanner
|
pkgs.wayland-scanner
|
||||||
pkgs.wayland-protocols
|
pkgs.wayland-protocols
|
||||||
pkgs.libxkbcommon
|
pkgs.libxkbcommon
|
||||||
|
|||||||
+10
-9
@@ -288,7 +288,7 @@
|
|||||||
(seat/focus seat window))
|
(seat/focus seat window))
|
||||||
|
|
||||||
(when-let [[binding action] (seat :pending-action)]
|
(when-let [[binding action] (seat :pending-action)]
|
||||||
(action seat binding))
|
(protect (action seat binding)))
|
||||||
|
|
||||||
(seat/focus seat nil))
|
(seat/focus seat nil))
|
||||||
|
|
||||||
@@ -598,8 +598,9 @@
|
|||||||
M-S {:mod1 true :shift true}]
|
M-S {:mod1 true :shift true}]
|
||||||
[[:Tab M (action/focus :next)]
|
[[:Tab M (action/focus :next)]
|
||||||
[:Tab M-S (action/focus :prev)]
|
[:Tab M-S (action/focus :prev)]
|
||||||
[:Tab G (action/focus-output :next)]
|
# Go left-to-right
|
||||||
[:Tab G-S (action/focus-output :prev)]
|
[:Tab G (action/focus-output :prev)]
|
||||||
|
[:Tab G-S (action/focus-output :next)]
|
||||||
[:Tab {:mod4 true :ctrl true :mod1 true} (action/spawn "toggle-monitor")]
|
[:Tab {:mod4 true :ctrl true :mod1 true} (action/spawn "toggle-monitor")]
|
||||||
[:Return G (action/spawn "alacritty")]
|
[:Return G (action/spawn "alacritty")]
|
||||||
[:f G (action/toggle-fullscreen true)]
|
[:f G (action/toggle-fullscreen true)]
|
||||||
@@ -644,19 +645,19 @@
|
|||||||
|
|
||||||
|
|
||||||
(defn startup []
|
(defn startup []
|
||||||
(spawn "pkill waybar; waybar")
|
(each w (wm :windows)
|
||||||
(spawn "kanshi")
|
(unless (w :tag)
|
||||||
|
(put w :tag :q)))
|
||||||
|
|
||||||
|
(spawn "systemctl restart --user waybar")
|
||||||
|
(spawn "systemctl restart --user kanshi")
|
||||||
|
|
||||||
(spawn "vesktop")
|
(spawn "vesktop")
|
||||||
(spawn "thunderbird")
|
(spawn "thunderbird")
|
||||||
(spawn "solaar --window hide")
|
(spawn "solaar --window hide")
|
||||||
(spawn "io.github.alainm23.planify"))
|
(spawn "io.github.alainm23.planify"))
|
||||||
|
|
||||||
# TODO: layout flexibility
|
|
||||||
# TODO: fullscreen oddities with games: debug (warframe, novadrift, portal)
|
# TODO: fullscreen oddities with games: debug (warframe, novadrift, portal)
|
||||||
# TODO: firefox focus weirdness
|
|
||||||
# TODO: double fullscreen
|
|
||||||
# TODO: swaylock hibernate acquire outputs
|
|
||||||
|
|
||||||
(defn configure-keymap []
|
(defn configure-keymap []
|
||||||
(def ctx (xkbcommon/context/new))
|
(def ctx (xkbcommon/context/new))
|
||||||
|
|||||||
+8
-16
@@ -4,11 +4,10 @@
|
|||||||
|
|
||||||
linkFarm "zig-packages" [
|
linkFarm "zig-packages" [
|
||||||
{
|
{
|
||||||
name = "aro-0.0.0-JSD1Qi7QNgDnfcrdEJf82v3o6MhZySjYVrtdfEf3E4Se";
|
name = "aro-0.0.0-JSD1QmbSNgDrBkBPRoDPwy1rN1ABGBa7B1NzC-lqnGxw";
|
||||||
path = fetchgit {
|
path = fetchzip {
|
||||||
url = "https://github.com/Vexu/arocc";
|
url = "https://codeberg.org/ifreund/arocc/archive/0.16.x.tar.gz";
|
||||||
rev = "5f5a050569a95ecc40a426f0c3666ae7ef987ede";
|
hash = "sha256-UjLpDXeD5supXFUpa4+q9Uc9aTVglZrIp6pM1qyv1+A=";
|
||||||
hash = "sha256-f8Z0SXWx5Uia2TCMB5SUpcO8+xUnaWk32Oknva7xcxw=";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
@@ -19,11 +18,11 @@ linkFarm "zig-packages" [
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "translate_c-0.0.0-Q_BUWlX1BgCD1wo6uo97prlp9VJ4gxAjwN_vZ7nsSjGN";
|
name = "translate_c-0.0.0-Q_BUWlL1BgD7PmL27vTsccyNCOvKb-B65O5Ki1ZKm-ED";
|
||||||
path = fetchgit {
|
path = fetchgit {
|
||||||
url = "https://codeberg.org/ziglang/translate-c/";
|
url = "https://codeberg.org/ifreund/translate-c/";
|
||||||
rev = "57c559cf581b1fcad90494eda219f98abeb155ce";
|
rev = "64570104eeed461dc221e77574cd3f1c5b7eb974";
|
||||||
hash = "sha256-7OlW2f5tRc1UZySDcEQERsLGChSxIcJAiVWdvuFUvvY=";
|
hash = "sha256-ZQnT0XeVxcs5Px1Y8pNvqUOXzj0UnVC+Ijnr5ePvF/M=";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
@@ -40,13 +39,6 @@ linkFarm "zig-packages" [
|
|||||||
hash = "sha256-cfzHJ2ziiCkMyNlIo6I9o/NjaZGrsv22hq41WYwCnpk=";
|
hash = "sha256-cfzHJ2ziiCkMyNlIo6I9o/NjaZGrsv22hq41WYwCnpk=";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
|
||||||
name = "xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr";
|
|
||||||
path = fetchzip {
|
|
||||||
url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.3.0.tar.gz";
|
|
||||||
hash = "sha256-e5bPEfxl4SQf0cqccLt/py1KOW1+Q1+kWZUEXBbh9oQ=";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
name = "xkbcommon-0.4.0-VDqIe0i2AgDRsok2GpMFYJ8SVhQS10_PI2M_CnHXsJJZ";
|
name = "xkbcommon-0.4.0-VDqIe0i2AgDRsok2GpMFYJ8SVhQS10_PI2M_CnHXsJJZ";
|
||||||
path = fetchzip {
|
path = fetchzip {
|
||||||
|
|||||||
Reference in New Issue
Block a user