Compare commits

..

4 commits

6 changed files with 44 additions and 41 deletions

View file

@ -260,6 +260,9 @@ removedKeybinds =
++ [ (superMask , n) | n <- [xK_1 .. xK_9] ] ++ [ (superMask , n) | n <- [xK_1 .. xK_9] ]
++ [ (superMask .|. shiftMask, n) | n <- [xK_1 .. xK_9] ] ++ [ (superMask .|. shiftMask, n) | n <- [xK_1 .. xK_9] ]
warpToWindowCenter :: X ()
warpToWindowCenter = warpToWindow 0.5 0.5
keybinds :: [((KeyMask, KeySym), X ())] keybinds :: [((KeyMask, KeySym), X ())]
keybinds = keybinds =
[ [
@ -305,33 +308,26 @@ keybinds =
-- Switch between layers -- Switch between layers
, ((altMask, xK_s), switchLayer ) , ((altMask, xK_s), switchLayer )
-- Directional navigation of windows
, ((altMask, xK_l), windowGo R False )
, ((altMask, xK_h), windowGo L False )
, ((altMask, xK_k), windowGo U False )
, ((altMask, xK_j), windowGo D False )
-- Swap adjacent windows
, ((altMask .|. superMask, xK_l), windowSwap R False)
, ((altMask .|. superMask, xK_h), windowSwap L False)
, ((altMask .|. superMask, xK_k), windowSwap U False)
, ((altMask .|. superMask, xK_j), windowSwap D False)
]
-- We override default focus shifting bindings to warp the cursor to the center of the new window. -- We override default focus shifting bindings to warp the cursor to the center of the new window.
-- This is especially useful because mag doesn't work well with focusFollowsMouse. -- This is especially useful because mag doesn't work well with focusFollowsMouse.
-- The order is important: focus shift, and then warp the cursor -- The order is important: focus shift, and then warp the cursor
-- --
-- Warp when focus shifts by binding, not by mouse (otherwise it's annoying) -- Warp when focus shifts by binding, not by mouse (otherwise it's annoying)
++ (let warp = warpToWindow 0.5 0.5
in [ ((superMask, xK_Tab ), windows W.focusDown >> warp)
, ((superMask .|. shiftMask, xK_Tab ), windows W.focusUp >> warp)
, ((superMask, xK_j ), windows W.focusDown >> warp)
, ((superMask, xK_k ), windows W.focusUp >> warp)
]
)
-- Screenshots -- Directional navigation of windows
, ((altMask, xK_l), windowGo R False >> warpToWindowCenter)
, ((altMask, xK_h), windowGo L False >> warpToWindowCenter)
, ((altMask, xK_k), windowGo U False >> warpToWindowCenter)
, ((altMask, xK_j), windowGo D False >> warpToWindowCenter)
-- Swap adjacent windows
, ((altMask .|. superMask, xK_l), windowSwap R False >> warpToWindowCenter)
, ((altMask .|. superMask, xK_h), windowSwap L False >> warpToWindowCenter)
, ((altMask .|. superMask, xK_k), windowSwap U False >> warpToWindowCenter)
, ((altMask .|. superMask, xK_j), windowSwap D False >> warpToWindowCenter)
]
-- Screenshots
++ (let fullscreen = "maim -u | xclip -in -selection clipboard -t image/png" ++ (let fullscreen = "maim -u | xclip -in -selection clipboard -t image/png"
withSelection = "maim -u -s -b 5 -o | xclip -in -selection clipboard -t image/png" withSelection = "maim -u -s -b 5 -o | xclip -in -selection clipboard -t image/png"
toFloat = "maim -u -s -b 5 -o | feh --auto-zoom -" toFloat = "maim -u -s -b 5 -o | feh --auto-zoom -"

View file

@ -6,11 +6,6 @@
{ {
services.btrfs.autoScrub = { services.btrfs.autoScrub = {
enable = true; enable = true;
fileSystems = [
"/"
"/home"
"/nix"
];
}; };
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [

View file

@ -17,6 +17,10 @@ stdenvNoCC.mkDerivation {
hash = "sha256-p3wfR28DH6V8BHn9DT10d09Yq3mdbBecWwlR1CdDYUA="; hash = "sha256-p3wfR28DH6V8BHn9DT10d09Yq3mdbBecWwlR1CdDYUA=";
}; };
# Build takes no time
preferLocalBuild = true;
allowSubstitutes = false;
installPhase = '' installPhase = ''
mkdir -p $out/share mkdir -p $out/share
cp noai_hosts.txt $out/share/hosts.txt cp noai_hosts.txt $out/share/hosts.txt

View file

@ -17,6 +17,10 @@ stdenvNoCC.mkDerivation {
hash = "sha256-SZBrjIBUw687MdrbOV7WrP5IhAAtKvPL2GqdcICHNvQ="; hash = "sha256-SZBrjIBUw687MdrbOV7WrP5IhAAtKvPL2GqdcICHNvQ=";
}; };
# Build takes no time
preferLocalBuild = true;
allowSubstitutes = false;
installPhase = '' installPhase = ''
mkdir -p $out/share mkdir -p $out/share
cp blocklist.txt $out/share/domains.txt cp blocklist.txt $out/share/domains.txt

View file

@ -17,6 +17,10 @@ stdenvNoCC.mkDerivation {
hash = "sha256-+AhLkcCETVnF6S+ov1oKxhs3M9F6ghyyERoLN3aMMxw="; hash = "sha256-+AhLkcCETVnF6S+ov1oKxhs3M9F6ghyyERoLN3aMMxw=";
}; };
# Build takes no time
preferLocalBuild = true;
allowSubstitutes = false;
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp hrt-time.sh $out/bin/hrt-time cp hrt-time.sh $out/bin/hrt-time

View file

@ -114,9 +114,9 @@
}, },
"branch": "release-25.11", "branch": "release-25.11",
"submodules": false, "submodules": false,
"revision": "20561be440a11ec57a89715480717baf19fe6343", "revision": "7df150f0d3857cf68dae443813b27acfb201b2d8",
"url": "https://github.com/nix-community/home-manager/archive/20561be440a11ec57a89715480717baf19fe6343.tar.gz", "url": "https://github.com/nix-community/home-manager/archive/7df150f0d3857cf68dae443813b27acfb201b2d8.tar.gz",
"hash": "1n2l891p04y3xmd0sl5i3553ndgpxkinysg1bf8iiixmxhcm7i9v" "hash": "00hzbqdayq8zjrw5rfzb0909nw2b1gmy6czv2c1hfjj63z94xpic"
}, },
"infuse": { "infuse": {
"type": "GitRelease", "type": "GitRelease",
@ -200,9 +200,9 @@
}, },
"branch": "nixos-25.11-small", "branch": "nixos-25.11-small",
"submodules": false, "submodules": false,
"revision": "1acf2f172ef3d6e31c9913ccb7ba07b13dadfedc", "revision": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6",
"url": "https://github.com/nixos/nixpkgs/archive/1acf2f172ef3d6e31c9913ccb7ba07b13dadfedc.tar.gz", "url": "https://github.com/nixos/nixpkgs/archive/c6f52ebd45e5925c188d1a20119978aa4ffd5ef6.tar.gz",
"hash": "1hhjz7jx0n0i2mxq9d3yvqvlmrwjklq1ljcfzpmnzyfhrixqg9y5" "hash": "0gwxhs3j1nglyymbaqyqg8miz0rk84n4ijag5s4bx6yfb6vrd4lv"
}, },
"nur": { "nur": {
"type": "Git", "type": "Git",
@ -213,9 +213,9 @@
}, },
"branch": "main", "branch": "main",
"submodules": false, "submodules": false,
"revision": "e7844e0f24c76b6137e16ab95c9a7c275acf2fbb", "revision": "c5bc6e626bb2cf01b9e65572ca4b44ccdcc1dfc9",
"url": "https://github.com/nix-community/nur/archive/e7844e0f24c76b6137e16ab95c9a7c275acf2fbb.tar.gz", "url": "https://github.com/nix-community/nur/archive/c5bc6e626bb2cf01b9e65572ca4b44ccdcc1dfc9.tar.gz",
"hash": "10bz6b1j2d5z257xv8bjwdr1636f807f2gr24yaswxr55a7wdyk9" "hash": "1fdqlpqsidqis2jzc6iwbafi82916jsnrl46k9gfdp9bxhcrmbvf"
}, },
"pin-emacs28": { "pin-emacs28": {
"type": "Git", "type": "Git",
@ -365,9 +365,9 @@
}, },
"branch": "master", "branch": "master",
"submodules": false, "submodules": false,
"revision": "6a96aa2066d8ad945f2323b63dc217081ef51168", "revision": "491197a6a5ef9c65a85c3eb1531786f32ffff5b3",
"url": "https://github.com/Toqozz/wired-notify/archive/6a96aa2066d8ad945f2323b63dc217081ef51168.tar.gz", "url": "https://github.com/Toqozz/wired-notify/archive/491197a6a5ef9c65a85c3eb1531786f32ffff5b3.tar.gz",
"hash": "02b8pva12rzcciq5lavwk824xaym28igfsva4kikvd7mxs06ccwx" "hash": "07gaizslvsiihvfrrbcdz0b2c04llsfqaji03ls55p1zbm41w6f3"
}, },
"zen-browser": { "zen-browser": {
"type": "Git", "type": "Git",
@ -378,9 +378,9 @@
}, },
"branch": "main", "branch": "main",
"submodules": false, "submodules": false,
"revision": "bd8815d0a686267386268e7cc70315124e21362b", "revision": "bc7dfff92cb7919dfb213ea78c11ea0a4d265a56",
"url": "https://github.com/0xc000022070/zen-browser-flake/archive/bd8815d0a686267386268e7cc70315124e21362b.tar.gz", "url": "https://github.com/0xc000022070/zen-browser-flake/archive/bc7dfff92cb7919dfb213ea78c11ea0a4d265a56.tar.gz",
"hash": "03dz53picqw2bbbzaxxld5ydyqbf4jsdb048a4gb6h432kkp5gim" "hash": "0nqhwk7gbp9frh9k98yafdnm3d5kdc9d94vpwqalr49cblcmiyy9"
} }
}, },
"version": 5 "version": 5