Compare commits
5 Commits
macos-supe
...
50c62a4d3f
| Author | SHA1 | Date | |
|---|---|---|---|
| 50c62a4d3f | |||
| f4b518f806 | |||
| 7fffa45e4e | |||
| a3c53820b1 | |||
| 8cbdeb4cdc |
@@ -13,9 +13,9 @@ set $term alacritty
|
|||||||
set $menu wofi --term '$term'
|
set $menu wofi --term '$term'
|
||||||
|
|
||||||
### Output configuration
|
### Output configuration
|
||||||
output DP-3 pos 3840 0 res 1920x1080@59Hz
|
output DP-3 pos 1920 0 res 1920x1080@60Hz
|
||||||
output HDMI-A-1 pos 0 0 res 1920x1080@59Hz
|
output HDMI-A-1 pos 0 0 res 1920x1080@60Hz
|
||||||
output DP-2 pos 1920 0 res 1920x1080@60Hz
|
output DP-2 pos 3840 0 res 1920x1080@60Hz
|
||||||
|
|
||||||
### Wallpaper
|
### Wallpaper
|
||||||
output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
|
output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
|
||||||
@@ -25,22 +25,22 @@ output DP-3 bg ~/.wallpaper/.wallpaper.png fill
|
|||||||
### Workspace binding
|
### Workspace binding
|
||||||
|
|
||||||
## DP-3 bindings
|
## DP-3 bindings
|
||||||
workspace 1 output DP-2
|
workspace 1 output DP-3
|
||||||
workspace 2 output DP-2
|
workspace 2 output DP-3
|
||||||
workspace 4 output DP-2
|
workspace 4 output DP-3
|
||||||
workspace 5 output DP-2
|
workspace 5 output DP-3
|
||||||
|
|
||||||
## HDMI-A-1 bindings
|
## HDMI-A-1 bindings
|
||||||
workspace 3 output HDMI-A-1
|
workspace 3 output HDMI-A-1
|
||||||
workspace 9 output HDMI-A-1
|
workspace 9 output HDMI-A-1
|
||||||
|
|
||||||
## DP-2 bindings
|
## DP-2 bindings
|
||||||
workspace 6 output DP-3
|
workspace 6 output DP-2
|
||||||
workspace 7 output DP-3
|
workspace 7 output DP-2
|
||||||
workspace 8 output DP-3
|
workspace 8 output DP-2
|
||||||
|
|
||||||
### Colour options
|
### Colour options
|
||||||
set $bg #24283b
|
set $bg #24283b
|
||||||
set $bg-inactive #323232
|
set $bg-inactive #323232
|
||||||
set $bg-urgent #000000
|
set $bg-urgent #000000
|
||||||
set $text #eeeeec
|
set $text #eeeeec
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{pkgs, ...}: {
|
{pkgs, lib, ...}: {
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# initExtra = ''
|
# initExtra = ''
|
||||||
@@ -52,6 +52,27 @@
|
|||||||
'';
|
'';
|
||||||
onEvent = "fish_greeting";
|
onEvent = "fish_greeting";
|
||||||
};
|
};
|
||||||
|
} // lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||||
|
block = {
|
||||||
|
body = ''
|
||||||
|
systemd-inhibit --what=sleep --who="$USER" --why="manual invocation" --mode=block sleep infinity &
|
||||||
|
set -g INHIBIT_PID $last_pid
|
||||||
|
echo "Sleep inhibited. PID: $INHIBIT_PID"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
unblock = {
|
||||||
|
body = ''
|
||||||
|
if set -q INHIBIT_PID
|
||||||
|
kill $INHIBIT_PID 2>/dev/null
|
||||||
|
and echo "Sleep inhibitor removed. PID: $INHIBIT_PID"
|
||||||
|
or echo "Failed to kill process or already terminated."
|
||||||
|
set -e INHIBIT_PID
|
||||||
|
else
|
||||||
|
echo "No active sleep inhibitor found."
|
||||||
|
end
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -12,24 +12,24 @@
|
|||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
|
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "ahci" "usb_storage" "usbhid" "sd_mod"];
|
||||||
boot.initrd.kernelModules = [];
|
boot.initrd.kernelModules = [];
|
||||||
boot.kernelModules = ["kvm-amd"];
|
boot.kernelModules = ["kvm-amd"];
|
||||||
boot.extraModulePackages = [];
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
fileSystems."/" = {
|
fileSystems."/" = {
|
||||||
device = "/dev/disk/by-label/COMPUTER";
|
device = "/dev/disk/by-uuid/f8f39aae-61d2-437d-a8e1-01066bbb3c5c";
|
||||||
fsType = "xfs";
|
fsType = "xfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
fileSystems."/boot" = {
|
||||||
device = "/dev/disk/by-label/BOOT";
|
device = "/dev/disk/by-uuid/B72F-087F";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = ["fmask=0022" "dmask=0022"];
|
options = ["fmask=0022" "dmask=0022"];
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [
|
swapDevices = [
|
||||||
{device = "/dev/disk/by-label/SWAP";}
|
{device = "/dev/disk/by-uuid/6d6bcc02-20a9-4ae8-9c1e-5124fb2b2634";}
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
|||||||
@@ -2,6 +2,6 @@
|
|||||||
services.shairport-sync = {
|
services.shairport-sync = {
|
||||||
enable = pkgs.stdenv.isLinux;
|
enable = pkgs.stdenv.isLinux;
|
||||||
openFirewall = pkgs.stdenv.isLinux;
|
openFirewall = pkgs.stdenv.isLinux;
|
||||||
arguments = "-v -o pw";
|
arguments = "-v -o pa";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user