fgdsha
This commit is contained in:
@@ -44,49 +44,6 @@ in
|
|||||||
"./dms/cursor.conf"
|
"./dms/cursor.conf"
|
||||||
"./dms/colors.conf"
|
"./dms/colors.conf"
|
||||||
];
|
];
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Monitors/
|
|
||||||
#monitor = lib.mkMerge [
|
|
||||||
# #(lib.mkIf (systemName == "laptop") [ "eDP-1,1920x1080@59.99700,0x0,1" ])
|
|
||||||
# (lib.mkIf (systemName == "pc") [
|
|
||||||
# "HDMI-A-2, disable"
|
|
||||||
# ])
|
|
||||||
#];
|
|
||||||
|
|
||||||
#monitorv2 =
|
|
||||||
# [ ]
|
|
||||||
# ++ lib.optional (systemName == "laptop") {
|
|
||||||
# output = "eDP-1";
|
|
||||||
# mode = "1920x1080@59.99700";
|
|
||||||
# scale = 1;
|
|
||||||
# position = "0x0";
|
|
||||||
# }
|
|
||||||
# ++ lib.optional (systemName == "pc") {
|
|
||||||
# output = "DP-1";
|
|
||||||
# mode = "2560x1440@239.97";
|
|
||||||
# position = "2560x0"; # "1440x750"; # Corrected from 2569x0 for seamless alignment
|
|
||||||
# scale = 1;
|
|
||||||
# #supports_wide_color = 1;
|
|
||||||
# bitdepth = 10;
|
|
||||||
# cm = "wide";
|
|
||||||
# supports_hdr = true;
|
|
||||||
# supports_wide_color = true;
|
|
||||||
# sdr_min_luminance = 0; # For true black on OLED
|
|
||||||
# sdr_max_luminance = 275; # Matches typical SDR brightness
|
|
||||||
# min_luminance = 0;
|
|
||||||
# max_luminance = 1000; # HDR peak
|
|
||||||
# max_avg_luminance = 400; # Average frame luminance
|
|
||||||
# sdrbrightness = 1.2; # Slight boost to avoid washed out look
|
|
||||||
# sdrsaturation = 1.0;
|
|
||||||
# }
|
|
||||||
# ++ lib.optional (systemName == "pc") {
|
|
||||||
# output = "DP-2";
|
|
||||||
# mode = "2560x1440@144";
|
|
||||||
# scale = 1;
|
|
||||||
# position = "0x0";
|
|
||||||
# transform = 0;
|
|
||||||
# };
|
|
||||||
|
|
||||||
# ─── Autostart ───────────────────────────────────────────────────────────────
|
# ─── Autostart ───────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
# Autostart necessary processes (like notifications daemons, status bars, etc.)
|
# Autostart necessary processes (like notifications daemons, status bars, etc.)
|
||||||
@@ -101,16 +58,7 @@ in
|
|||||||
"foot -s"
|
"foot -s"
|
||||||
"systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS WAYLAND_DISPLAY XDG_SESSION_TYPE XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP QT_QPA_PLATFORMTHEME GTK_THEME"
|
"systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS WAYLAND_DISPLAY XDG_SESSION_TYPE XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP QT_QPA_PLATFORMTHEME GTK_THEME"
|
||||||
"dbus-update-activation-environment --systemd --all"
|
"dbus-update-activation-environment --systemd --all"
|
||||||
]
|
|
||||||
++ lib.optionals (config.home.username == "work") [
|
|
||||||
"thunderbird"
|
|
||||||
"sleep 10 && emacsclient -c --frame-parameters='((name . \"work\"))' $HOME/Documents/work/README.org"
|
|
||||||
];
|
];
|
||||||
# ++ lib.optional (systemName == "laptop")
|
|
||||||
# "swaybg -o eDP-1 -i ${../assets/Wallpapers/138.png}"
|
|
||||||
#
|
|
||||||
# ++ lib.optional (systemName == "pc")
|
|
||||||
# "swaybg -o HDMI-A-1 -i ${../assets/Wallpapers/138.png} -o DP-1 -i ${../assets/Wallpapers/138.png}";
|
|
||||||
|
|
||||||
# ─── Plugins ─────────────────────────────────────────────────────────────────
|
# ─── Plugins ─────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
@@ -288,6 +236,7 @@ in
|
|||||||
# ",Print, exec, grim -g \"$(slurp)\" - | swappy -f -"
|
# ",Print, exec, grim -g \"$(slurp)\" - | swappy -f -"
|
||||||
",Print, exec, dms screenshot"
|
",Print, exec, dms screenshot"
|
||||||
"${mod}, f1, exec, dms ipc call keybinds toggle hyprland"
|
"${mod}, f1, exec, dms ipc call keybinds toggle hyprland"
|
||||||
|
"${mod}, BACKSLASH, exec, dms ipc call notepad toggle"
|
||||||
|
|
||||||
# Dwindle
|
# Dwindle
|
||||||
"${mod}, P, pseudo, "
|
"${mod}, P, pseudo, "
|
||||||
@@ -403,9 +352,6 @@ in
|
|||||||
|
|
||||||
# Fix some dragging issues with XWayland
|
# Fix some dragging issues with XWayland
|
||||||
"match:class ^$, match:title ^$, match:xwayland 1, match:float 1, match:fullscreen 0, match:pin 0, no_focus on"
|
"match:class ^$, match:title ^$, match:xwayland 1, match:float 1, match:fullscreen 0, match:pin 0, no_focus on"
|
||||||
|
|
||||||
"match:class thunderbird, workspace special:magic silent"
|
|
||||||
"match:class emacs, match:title work, workspace special:magic silent"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -19,12 +19,18 @@ in
|
|||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
assertions = [{
|
assertions = [
|
||||||
assertion = builtins.elem systemName [ "laptop" "pc" ];
|
{
|
||||||
|
assertion = builtins.elem systemName [
|
||||||
|
"laptop"
|
||||||
|
"pc"
|
||||||
|
];
|
||||||
message = "systemName must be either 'laptop' or 'pc', got: ${systemName}";
|
message = "systemName must be either 'laptop' or 'pc', got: ${systemName}";
|
||||||
}];
|
}
|
||||||
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ ]
|
boot.initrd.availableKernelModules =
|
||||||
|
[ ]
|
||||||
++ lib.optionals isPc [
|
++ lib.optionals isPc [
|
||||||
"xhci_pci"
|
"xhci_pci"
|
||||||
"ahci"
|
"ahci"
|
||||||
@@ -41,15 +47,20 @@ in
|
|||||||
"sd_mod"
|
"sd_mod"
|
||||||
];
|
];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ ]
|
boot.kernelModules =
|
||||||
++ lib.optionals isPc [ "kvm-amd" "btusb" ]
|
[ ]
|
||||||
|
++ lib.optionals isPc [
|
||||||
|
"kvm-amd"
|
||||||
|
"btusb"
|
||||||
|
]
|
||||||
++ lib.optionals isLaptop [ "kvm-intel" ];
|
++ lib.optionals isLaptop [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
# Most common working combination in 2024/2025
|
# Most common working combination in 2024/2025
|
||||||
"btusb.enable_autosuspend=0"
|
"btusb.enable_autosuspend=0"
|
||||||
"btusb.reset=1"
|
"btusb.reset=1"
|
||||||
];
|
];
|
||||||
|
boot.tmp.useTmpfs = true;
|
||||||
|
|
||||||
fileSystems."/" = lib.mkMerge [
|
fileSystems."/" = lib.mkMerge [
|
||||||
(lib.mkIf isPc {
|
(lib.mkIf isPc {
|
||||||
@@ -91,7 +102,6 @@ in
|
|||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
#fileSystems."/server" = lib.mkIf isPc { # or remove the mkIf if you want it on both
|
#fileSystems."/server" = lib.mkIf isPc { # or remove the mkIf if you want it on both
|
||||||
# device = "//192.168.1.8/mrfluffy"; # adjust the share name if it’s not the home share
|
# device = "//192.168.1.8/mrfluffy"; # adjust the share name if it’s not the home share
|
||||||
# fsType = "cifs";
|
# fsType = "cifs";
|
||||||
@@ -115,7 +125,8 @@ in
|
|||||||
# ];
|
# ];
|
||||||
#};
|
#};
|
||||||
|
|
||||||
swapDevices = [ ]
|
swapDevices =
|
||||||
|
[ ]
|
||||||
++ lib.optionals isPc [
|
++ lib.optionals isPc [
|
||||||
{ device = "/dev/disk/by-uuid/ccf41b96-c45f-47e0-8541-cd865f5d2ec6"; }
|
{ device = "/dev/disk/by-uuid/ccf41b96-c45f-47e0-8541-cd865f5d2ec6"; }
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user