Compare commits
6 commits
Author | SHA1 | Date | |
---|---|---|---|
f2f4a01c6a | |||
ddf010febb | |||
8887600322 | |||
bd7ae3084a | |||
lelgenio | 43f376d9ac | ||
dbb165237e |
24
flake.lock
24
flake.lock
|
@ -176,11 +176,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723685519,
|
"lastModified": 1726590912,
|
||||||
"narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=",
|
"narHash": "sha256-5bxY85siOIqOcQ8TOMAWLkMUZvLUADS2i5TsZhzUIZY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "276a0d055a720691912c6a34abb724e395c8e38a",
|
"rev": "d32d1504c77d7f6ba7e033357dcf638baceab9b7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -393,11 +393,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720042825,
|
"lastModified": 1726592409,
|
||||||
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
|
"narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
|
"rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -414,11 +414,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723352546,
|
"lastModified": 1726449931,
|
||||||
"narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
|
"narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
|
"rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -456,11 +456,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723556749,
|
"lastModified": 1726447378,
|
||||||
"narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=",
|
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4a92571f9207810b559c9eac203d1f4d79830073",
|
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
list_paired_controllers() {
|
|
||||||
bluetoothctl devices Paired | grep 'Controller' | cut -d' ' -f2
|
|
||||||
}
|
|
||||||
|
|
||||||
count_connected_controllers() {
|
|
||||||
bluetoothctl devices Connected | grep 'Controller' | wc -l
|
|
||||||
}
|
|
||||||
|
|
||||||
try_to_connect_to_all_controllers() {
|
|
||||||
list_paired_controllers | while read paired_controller; do
|
|
||||||
echo "Trying to connect to controller $paired_controller"
|
|
||||||
bluetoothctl connect "$paired_controller"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
while true; do
|
|
||||||
echo "looping"
|
|
||||||
if test "$(count_connected_controllers)" -ne 0 ; then
|
|
||||||
echo "there is a controller connected, not attempting to connect to any other"
|
|
||||||
sleep 10s
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
sleep 1s
|
|
||||||
try_to_connect_to_all_controllers
|
|
||||||
done
|
|
|
@ -124,11 +124,6 @@
|
||||||
zbar
|
zbar
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
];
|
];
|
||||||
auto_connect_gamepad = [
|
|
||||||
bluez
|
|
||||||
coreutils
|
|
||||||
gnugrep
|
|
||||||
];
|
|
||||||
powerplay-led-idle = [
|
powerplay-led-idle = [
|
||||||
bash
|
bash
|
||||||
libinput
|
libinput
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
settings = {
|
settings = {
|
||||||
General = {
|
General = {
|
||||||
DiscoverableTimeout = 0;
|
DiscoverableTimeout = 0;
|
||||||
# Discoverable = true;
|
Discoverable = true;
|
||||||
AlwaysPairable = true;
|
AlwaysPairable = true;
|
||||||
};
|
};
|
||||||
Policy = {
|
Policy = {
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
{ pkgs, lib, ... }:
|
|
||||||
{
|
|
||||||
systemd.user.services = {
|
|
||||||
autoconnect-gamepad = {
|
|
||||||
Unit = {
|
|
||||||
Description = "Attempt to connect to game controllers";
|
|
||||||
PartOf = [ "graphical-session.target" ];
|
|
||||||
After = [ "graphical-session.target" ];
|
|
||||||
};
|
|
||||||
Service = {
|
|
||||||
ExecStart = lib.getExe pkgs.auto_connect_gamepad;
|
|
||||||
};
|
|
||||||
Install = {
|
|
||||||
WantedBy = [ "sway-session.target" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
xdg.desktopEntries = {
|
|
||||||
disconnect-controller = {
|
|
||||||
name = "Disconnect Controller";
|
|
||||||
exec = "bluetoothctl disconnect 84:30:95:97:1A:79";
|
|
||||||
terminal = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -103,29 +103,29 @@ function fish_git_prompt
|
||||||
_fish_prompt_warn "init"
|
_fish_prompt_warn "init"
|
||||||
end
|
end
|
||||||
|
|
||||||
git rev-parse HEAD -- &>/dev/null
|
# if we have at least one commit
|
||||||
or return
|
if git rev-parse HEAD -- &>/dev/null
|
||||||
|
# print a "↑" if ahead of origin
|
||||||
|
test 0 -ne (git log --oneline "$git_remote_branch"..HEAD -- | wc -l)
|
||||||
|
and set -f _git_sync_ahead '↑'
|
||||||
|
|
||||||
# print a "↑" if ahead of origin
|
# print a "↓" if behind of origin
|
||||||
test 0 -ne (git log --oneline "$git_remote_branch"..HEAD -- | wc -l)
|
test 0 -lt (git log --oneline HEAD.."$git_remote_branch" -- | wc -l)
|
||||||
and set -f _git_sync_ahead '↑'
|
and set -l _git_sync_behind '↓'
|
||||||
|
|
||||||
# print a "↓" if behind of origin
|
if set -q _git_sync_ahead _git_sync_behind
|
||||||
test 0 -lt (git log --oneline HEAD.."$git_remote_branch" -- | wc -l)
|
_fish_prompt_normal '⇅'
|
||||||
and set -l _git_sync_behind '↓'
|
else if set -q _git_sync_ahead
|
||||||
|
_fish_prompt_normal '↑'
|
||||||
|
else if set -q _git_sync_behind
|
||||||
|
_fish_prompt_normal '↓'
|
||||||
|
end
|
||||||
|
|
||||||
if set -q _git_sync_ahead _git_sync_behind
|
if test -n "$git_log_unpushed"
|
||||||
_fish_prompt_normal '⇅'
|
and not string match -qr "$git_branch" "$git_log_unpushed"
|
||||||
else if set -q _git_sync_ahead
|
_fish_prompt_normal '↻'
|
||||||
_fish_prompt_normal '↑'
|
_fish_prompt_warn $git_log_unpushed[1]
|
||||||
else if set -q _git_sync_behind
|
end
|
||||||
_fish_prompt_normal '↓'
|
|
||||||
end
|
|
||||||
|
|
||||||
if test -n "$git_log_unpushed"
|
|
||||||
and not string match -qr "$git_branch" "$git_log_unpushed"
|
|
||||||
_fish_prompt_normal '↻'
|
|
||||||
_fish_prompt_warn $git_log_unpushed[1]
|
|
||||||
end
|
end
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./controller.nix
|
|
||||||
./waybar
|
./waybar
|
||||||
./helix.nix
|
./helix.nix
|
||||||
./kakoune
|
./kakoune
|
||||||
|
|
|
@ -9,7 +9,12 @@
|
||||||
config = {
|
config = {
|
||||||
programs.password-store = {
|
programs.password-store = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
|
package = pkgs.pass.withExtensions (
|
||||||
|
ex: with ex; [
|
||||||
|
pass-otp
|
||||||
|
pass-import
|
||||||
|
]
|
||||||
|
);
|
||||||
};
|
};
|
||||||
services = {
|
services = {
|
||||||
pass-secret-service.enable = true;
|
pass-secret-service.enable = true;
|
||||||
|
|
|
@ -71,6 +71,7 @@ in
|
||||||
"*" = {
|
"*" = {
|
||||||
bg = "${theme.background} fill";
|
bg = "${theme.background} fill";
|
||||||
mode = "1920x1080@144.000Hz";
|
mode = "1920x1080@144.000Hz";
|
||||||
|
adaptive_sync = "on";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
fonts = {
|
fonts = {
|
||||||
|
|
Loading…
Reference in a new issue