Compare commits

..

No commits in common. "576f10a6d052f61438118f5a66029d3405889ae7" and "e1f59a5aa5871010a0257945dc65e4fe78bfc940" have entirely different histories.

4 changed files with 46 additions and 48 deletions

View file

@ -54,11 +54,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716638635, "lastModified": 1716000408,
"narHash": "sha256-exRwSztMwH4IZ//3+Xq9hnyONVOnQ2Yo41gJRJWA78E=", "narHash": "sha256-jIGTdIcHtRpY3fcfNUbcTv2IOVGW9srUzLrcYgK07Ik=",
"owner": "atuinsh", "owner": "atuinsh",
"repo": "atuin", "repo": "atuin",
"rev": "2e88321aecfd1c4a7fa69a1794ecdf34a401c358", "rev": "95c91689441c66228cd8eb2e94e9b43a848d75f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +195,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716431128, "lastModified": 1716168343,
"narHash": "sha256-t3T8HlX3udO6f4ilLcN+j5eC3m2gqsouzSGiriKK6vk=", "narHash": "sha256-82oT27w9smpItZ+PyN2C0PjIwZYbIocwXSM4u1igXuc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "7ffc4354dfeb37c8c725ae1465f04a9b45ec8606", "rev": "6f01b9710bc4d3bf006eb8df928b4b15e0430901",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +219,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1716743184, "lastModified": 1716196045,
"narHash": "sha256-/SUTE2dhBz3iNX+UkmDTWJX08Fd6G+800D+WVCT4ogQ=", "narHash": "sha256-WLxzdjUlIuf56IYdILyrDUtyUhRlWsiCF7xuhunErMA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "98aa2d306590b9ad5d62fea389b06a8651b406b5", "rev": "96e0ae1f75b858ce26b84fb2b4bb2a0249dab918",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -563,11 +563,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716736760, "lastModified": 1715930644,
"narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=", "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239", "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -587,11 +587,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1716382614, "lastModified": 1715787097,
"narHash": "sha256-dwUYl8jyMNKidPEM9gTafcRe+3pUh2rH3ZlBrUpsvnw=", "narHash": "sha256-TPp2j0ttvBvkk4oXidvo8Y071zEab0BtcNsC3ZEkluI=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "a59c3167f673ce29b65c674deb2bee73d151a96c", "rev": "fa673bf8656fe6f28253b83971a36999bc9995d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -670,11 +670,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1716715385, "lastModified": 1716173274,
"narHash": "sha256-fe6Z33pbfqu4TI5ijmcaNc5vRBs633tyxJ12HTghy3w=", "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "2e7d6c568063c83355fe066b8a8917ee758de1b8", "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -729,11 +729,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1716361217, "lastModified": 1716061101,
"narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -761,11 +761,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1716655032, "lastModified": 1716061101,
"narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -777,11 +777,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1716509168, "lastModified": 1716137900,
"narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bfb7a882678e518398ce9a31a881538679f6f092", "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -829,11 +829,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1716213921, "lastModified": 1715870890,
"narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", "narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", "rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -905,11 +905,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716689906, "lastModified": 1716171463,
"narHash": "sha256-tQYQM9zT4P1fFf739/AIZuTIGPxtEIpV7K7VieU60Io=", "narHash": "sha256-lc7wOh5BjYUoxdhcPkeUY8BmuL2qtRaHlW1403RW48E=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "3b6e1e221b04965427f3eee11fd6b6ea7b5f579b", "rev": "04d61d14803854fd8453ec43c5c53a471e5407a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -926,11 +926,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1716692524, "lastModified": 1716087663,
"narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", "narHash": "sha256-zuSAGlx8Qk0OILGCC2GUyZ58/SJ5R3GZdeUNQ6IS0fQ=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "962797a8d7f15ed7033031731d0bb77244839960", "rev": "0bf1808e70ce80046b0cff821c019df2b19aabf5",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -141,15 +141,13 @@ in
"${mod}+Shift f" = "spawn ${rofiPower}/bin/rofi-power"; "${mod}+Shift f" = "spawn ${rofiPower}/bin/rofi-power";
"${mod}+Shift+Alt ${directions.left}" = "send-layout-cmd filtile 'main-ratio -0.05'"; "${mod}+Shift+Alt ${directions.left}" = "send-layout-cmd rivertile 'main-ratio -0.05'";
"${mod}+Shift+Alt ${directions.right}" = "send-layout-cmd filtile 'main-ratio +0.05'"; "${mod}+Shift+Alt ${directions.right}" = "send-layout-cmd rivertile 'main-ratio +0.05'";
"${mod}+Shift+Control ${directions.left}" = "send-layout-cmd filtile 'main-location left'"; "${mod}+Shift+Control ${directions.left}" = "send-layout-cmd rivertile 'main-location left'";
"${mod}+Shift+Control ${directions.right}" = "send-layout-cmd filtile 'main-location right'"; "${mod}+Shift+Control ${directions.right}" = "send-layout-cmd rivertile 'main-location right'";
"${mod}+Shift+Control ${directions.up}" = "send-layout-cmd filtile 'main-location top'"; "${mod}+Shift+Control ${directions.up}" = "send-layout-cmd rivertile 'main-location top'";
"${mod}+Shift+Control ${directions.down}" = "send-layout-cmd filtile 'main-location bottom'"; "${mod}+Shift+Control ${directions.down}" = "send-layout-cmd rivertile 'main-location bottom'";
"${mod} w" = "send-layout-cmd filtile 'monocle'";
} }
// builtins.listToAttrs ( // builtins.listToAttrs (
map (tag: { map (tag: {
@ -195,7 +193,7 @@ in
}; };
}; };
default-layout = "filtile"; default-layout = "rivertile";
border-width = 1; border-width = 1;
border-color-focused = catppuccin.lavender; border-color-focused = catppuccin.lavender;
@ -214,7 +212,7 @@ in
}; };
extraConfig = '' extraConfig = ''
${pkgs.river-filtile}/bin/filtile -view-padding 5 -outer-padding 5 & ${cfg.package}/bin/rivertile -view-padding 5 -outer-padding 5 &
''; '';
}; };

View file

@ -194,7 +194,7 @@ in
blink1-tool blink1-tool
bottom bottom
dconf dconf
dbeaver-bin dbeaver
easyeffects easyeffects
element-desktop element-desktop
fd fd

View file

@ -242,7 +242,7 @@ in
blink1-tool blink1-tool
bottom bottom
chromium chromium
dbeaver-bin dbeaver
dconf dconf
fd fd
ffmpeg_5-full ffmpeg_5-full