diff --git a/.gitignore b/.gitignore
index b2be92b..31688e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
result
+hosts/*/firmware/*
diff --git a/flake.lock b/flake.lock
index b8dd06f..bb82c07 100644
--- a/flake.lock
+++ b/flake.lock
@@ -356,11 +356,11 @@
"homebrew-cask": {
"flake": false,
"locked": {
- "lastModified": 1781779141,
- "narHash": "sha256-5vw5wosVFamUjXpgcG+259NqMD9QYjUm7kgkFKgu/NI=",
+ "lastModified": 1781793117,
+ "narHash": "sha256-w5TiAwnNIxrpQ8aapdmiUVDUyI5jr1L5n9bCzs2qWkA=",
"owner": "homebrew",
"repo": "homebrew-cask",
- "rev": "b3f1ab62ab9bf221f4299afbef107f005165ce77",
+ "rev": "df72b7113f471eeb73fac0f58520bffc1bdbb7fe",
"type": "github"
},
"original": {
@@ -372,11 +372,11 @@
"homebrew-core": {
"flake": false,
"locked": {
- "lastModified": 1781781130,
- "narHash": "sha256-JR18wLMzIYnbspFGGAudaMZroxsuV+DfnD1Op7vKcvM=",
+ "lastModified": 1781793010,
+ "narHash": "sha256-gxr1oeeh8W/PVhPCTRaZk+gVsAJhtIaFlncv4GXP3+I=",
"owner": "homebrew",
"repo": "homebrew-core",
- "rev": "bf5ad9919adf03ed87a74a2da24ce8829ced16b5",
+ "rev": "30fbf0e9f5d719897c207b1801ef9f60549f5c9e",
"type": "github"
},
"original": {
@@ -907,11 +907,11 @@
"nixpkgs": "nixpkgs_12"
},
"locked": {
- "lastModified": 1781779566,
- "narHash": "sha256-XHlqfQ0KwjXdnoZYI3p3OAGhMj/PTsGLfmBvTXWoY3E=",
+ "lastModified": 1781793196,
+ "narHash": "sha256-AtPZh9rpsmQcGk1MTU96iV/ZVDPFOMlK3oJe7IaEAnE=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "2f0c2ef761ca3c0ec446ccecf776dd5728f1e5fb",
+ "rev": "d6f9ff5873f2c301ea5324d574bee817c47f255f",
"type": "github"
},
"original": {
@@ -947,7 +947,7 @@
"oisd": {
"flake": false,
"locked": {
- "narHash": "sha256-aejYjOpU8ToZRyLiPkzSR/rplI90wE8l1Oa87wWZzsc=",
+ "narHash": "sha256-fy096+pfUOeiEpp+26MlFUyU/iFEJU6IRFO4NoLUHEw=",
"type": "file",
"url": "https://big.oisd.nl/domainswild"
},
diff --git a/hosts/fragile/default.nix b/hosts/fragile/default.nix
index 9ab3831..22df86d 100644
--- a/hosts/fragile/default.nix
+++ b/hosts/fragile/default.nix
@@ -17,12 +17,14 @@
./../../modules/services/mullvad.nix
# ./../../modules/services/automount.nix
# ./../../modules/home/webapps.nix
+ ./../../modules/services/keyd.nix
];
hardware.asahi.peripheralFirmwareDirectory = ./firmware;
environment = {
systemPackages = [
+ pkgs.asahi-bless
pkgs.monero-gui
pkgs.btrfs-progs
pkgs.apfs-fuse
diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix
index d24c5cb..484c858 100644
--- a/modules/home/hyprland/config.nix
+++ b/modules/home/hyprland/config.nix
@@ -57,7 +57,7 @@
kb_options = "caps:ctrl_modifier,compose:ralt";
numlock_by_default = true;
follow_mouse = 1;
- sensitivity = 0;
+ sensitivity = 0.01;
touchpad = {
natural_scroll = true;
tap-to-click = false;
@@ -124,7 +124,8 @@
decoration = {
rounding = 0;
active_opacity = 1.00;
- inactive_opacity = 0.75;
+ inactive_opacity = 1.00;
+ # inactive_opacity = 0.75;
# fullscreen_opacity = 1.0;
shadow = {
@@ -218,7 +219,7 @@
# clipboard manager
"ALT SHIFT, V, exec, cliphist list | bemenu -l 5 --ignorecase | cliphist decode | wl-copy"
- "ALT SHIFT, F, exec, librewolf"
+ "ALT SHIFT, F, exec, firefox"
"ALT SHIFT, C, exec, chromium"
"ALT SHIFT, Q, exec, qutebrowser"
"ALT SHIFT, W, exec, wdisplays"
diff --git a/modules/home/sway/default.nix b/modules/home/sway/default.nix
index a62c046..2b1043a 100644
--- a/modules/home/sway/default.nix
+++ b/modules/home/sway/default.nix
@@ -159,7 +159,7 @@ in
"${altmod}+Shift+l" = "exec ${pkgs.swaylock-fancy}/bin/swaylock-fancy";
"${mod}+Shift+b" = "exec pkill -SIGUSR1 .waybar-wrapped";
"${mod}+Shift+v" = "exec cliphist list | bemenu -l 5 --ignorecase | cliphist decode | wl-copy";
- "${mod}+Shift+f" = "exec --no-startup-id ${pkgs.librewolf}/bin/librewolf";
+ "${mod}+Shift+f" = "exec --no-startup-id ${pkgs.firefox}/bin/firefox";
"${mod}+Shift+c" = "exec --no-startup-id ${pkgs.ungoogled-chromium}/bin/chromium";
"${mod}+Shift+q" = "exec --no-startup-id ${pkgs.qutebrowser}/bin/qutebrowser";
"${mod}+Shift+w" = "exec --no-startup-id ${pkgs.wdisplays}/bin/wdisplays";
diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix
index f09e2f0..ddb45d2 100644
--- a/modules/home/waybar/default.nix
+++ b/modules/home/waybar/default.nix
@@ -28,6 +28,7 @@
"sway/workspaces",
"hyprland/workspaces",
"sway/mode",
+ "custom/weather",
"tray",
],
@@ -60,6 +61,13 @@
"separate-outputs": true
},
+ "custom/weather": {
+ "format": "{text}",
+ "return-type": "text",
+ "exec": "~/.local/bin/waybar-weather",
+ "interval": 1800
+ },
+
"sway/workspaces": {
"all-outputs": true,
"disable-scroll": true,
@@ -263,11 +271,9 @@
},
"wireplumber": {
- "format": "{icon} {node_name}/{volume}",
- "format-muted": "",
+ "format": "VOL: {node_name}/{volume}",
"on-click": "pavucontrol-qt",
"on-click-right": "helvum",
- "format-icons": ["", "", ""]
},
"custom/audio-internal": {
@@ -365,10 +371,6 @@
"clock#time": {
"interval": 60,
"format": "CEST: {:%I:%M %p}",
- "actions": {
- "on-scroll-up": "tz_up",
- "on-scroll-down": "tz_down"
- }
},
"custom/clock#minutes": {
diff --git a/modules/home/waybar/scripts.nix b/modules/home/waybar/scripts.nix
index 9a2627f..33a521d 100644
--- a/modules/home/waybar/scripts.nix
+++ b/modules/home/waybar/scripts.nix
@@ -218,18 +218,7 @@
text = ''
#!/usr/bin/env zsh
- if [[ -f /sys/class/power_supply/BAT1/status && "$(cat /sys/class/power_supply/BAT1/status)" == "Discharging" ]]; then; cat /sys/class/power_supply/BAT1/current_now /sys/class/power_supply/BAT1/voltage_now | xargs | awk '{print $1*$2/1e12 " W"}'; fi
- '';
- };
- "/home/${username}/.local/bin/waybar-vpn" = {
- # unused nowadays
- executable = true;
- text = ''
- #!/usr/bin/env bash
-
- ip route | grep -q '10.7.0.0' \
- && echo '{"text":"Connected","class":"connected","percentage":100}' \
- || echo '{"text":"Disconnected","class":"disconnected","percentage":0}'
+ cat /sys/class/power_supply/*/current_now /sys/class/power_supply/*/voltage_now | xargs | awk '{print $1*$2/1e12 " W"}'
'';
};
"/home/${username}/.local/bin/waybar-mullvad" = {
@@ -249,6 +238,14 @@
echo "$TEXT"
'';
};
+ "/home/${username}/.local/bin/waybar-weather" = {
+ executable = true;
+ text = ''
+ #!/usr/bin/env sh
+
+ mullvad-exclude curl 'wttr.is?format=%c+(%p)+%t+(%f)+%w+(%S,+%s)\n'
+ '';
+ };
};
home.packages = with pkgs; [
wf-recorder
diff --git a/modules/home/zsh.nix b/modules/home/zsh.nix
index a9a6502..e1eb498 100644
--- a/modules/home/zsh.nix
+++ b/modules/home/zsh.nix
@@ -285,6 +285,7 @@
tailscale = "sudo tailscale";
finder = "open -a Finder";
fucking = "systemctl --user restart";
+ reboot-to-macos = "sudo asahi-bless --set-boot 1";
# NixOS
ns = "nix-shell --run zsh";
@@ -293,6 +294,8 @@
nix-switch-upgrade = "sudo nixos-rebuild switch --upgrade --flake ~/nixos-config#${host}";
nix-flake-update = "sudo nix flake update ~/nixos-config#";
nix-clean = "sudo nix-collect-garbage && sudo nix-collect-garbage -d && sudo rm /nix/var/nix/gcroots/auto/* && nix-collect-garbage && nix-collect-garbage -d";
+ keydon = "sudo systemctl start keyd";
+ keydoff = "sudo systemctl stop keyd";
};
plugins = with pkgs; [
diff --git a/modules/services/keyd.nix b/modules/services/keyd.nix
new file mode 100644
index 0000000..6176912
--- /dev/null
+++ b/modules/services/keyd.nix
@@ -0,0 +1,18 @@
+{
+ services.keyd = {
+ enable = true;
+ keyboards.default.settings = {
+ main.capslock = "overload(control, esc)";
+ control = {
+ h = "left";
+ j = "down";
+ k = "up";
+ l = "right";
+ };
+ meta = {
+ k = "C-k";
+ l = "C-l";
+ };
+ };
+ };
+}
diff --git a/roles/gnome.nix b/roles/gnome.nix
index fbe820a..d3cfe72 100644
--- a/roles/gnome.nix
+++ b/roles/gnome.nix
@@ -56,7 +56,7 @@ in
"rounded-window-corners@yilozt.shell-extension.zip"
];
favorite-apps = [
- "librewolf.desktop"
+ "firefox.desktop"
"foot.desktop"
];
had-bluetooth-devices-setup = true;
@@ -164,7 +164,7 @@ in
# };
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom4" = {
name = "Open element";
- command = "${pkgs.librewolf}/bin/librewolf";
+ command = "${pkgs.firefox}/bin/firefox";
binding = "f";
};
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom5" = {
diff --git a/roles/gui.nix b/roles/gui.nix
index f5ea504..26f375f 100644
--- a/roles/gui.nix
+++ b/roles/gui.nix
@@ -74,7 +74,7 @@ in
pkgs.mumble
pkgs.anki
pkgs.wdisplays
- pkgs.librewolf
+ pkgs.firefox
pkgs.ungoogled-chromium
pkgs.nsxiv
pkgs.imv
@@ -83,6 +83,7 @@ in
pkgs.spotify-player
pkgs.thunderbird
pkgs.lxqt.pavucontrol-qt
+ pkgs.helvum
pkgs.mpv
pkgs.kdePackages.kdeconnect-kde
pkgs.libgnome-keyring