Merge branch 'flake' of https://git.atagen.co/atagen/nix into flake

This commit is contained in:
atagen 2023-06-24 01:30:58 +10:00
commit d19208bd56
4 changed files with 7 additions and 15 deletions

View file

@ -122,7 +122,7 @@ bind=SUPER,minus,togglespecialworkspace
bind=SUPER_SHIFT,minus,movetoworkspace,special
bind=SUPER_SHIFT,S,exec,grim -g "$(slurp)" -t png -o "$HOME/Pictures/$(date +%F_%H-%m-%S).png" && notify-send "Screenshot taken."
bind=SUPER_SHIFT_CTRL,S,exec,if [[ $(pgrep wf-recorder; echo $?) -eq 0 ]]; then wf-recorder -a -f "$HOME/Videos/recording_$(date +%F_%H-%m-%S).mp4" & notify-send "Recording desktop.."; else pkill wf-recorder && notify-send "Recording complete."; fi
bind=SUPER_SHIFT_CTRL,S,exec,if [[ $(pgrep wf-recorder; echo $?) -eq 1 ]]; then wf-recorder -a -f "$HOME/Videos/recording_$(date +%F_%H-%m-%S).mp4" & notify-send "Recording desktop.."; else pkill wf-recorder && notify-send "Recording complete."; fi
bind=SUPER_SHIFT,E,exec,wlogout
bind=,XF86AudioMute,exec,swayosd --output-volume mute-toggle
bind=,XF86AudioRaiseVolume,exec,swayosd --output-volume raise

View file

@ -75,6 +75,8 @@ in {
enable = true;
};
services.udiskie.enable = true;
wayland.windowManager.hyprland = {
enable = true;
systemdIntegration = true;

View file

@ -8,15 +8,9 @@
modulesPath,
...
}: {
nix.settings = {
substituters = ["https://hyprland.cachix.org" ];
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
trusted-users = [ "root" "bolt" ]
};
imports = [
./configuration.nix
inputs.hyprland.nixosModules.default
];
boot.kernelParams = [
@ -61,6 +55,7 @@
services.tlp.enable = true;
environment.sessionVariables = rec {
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=5";
EDITOR = "hx";
};
@ -72,14 +67,6 @@
};
};
programs.hyprland = {
enable = true;
xwayland = {
enable = true;
hidpi = false;
};
nvidiaPatches = true;
};
services.xserver.videoDrivers = ["i915"];
programs.xwayland.enable = true;

View file

@ -82,6 +82,8 @@
services.xserver.libinput.enable = true;
services.xserver.displayManager.lightdm.enable = false; # gets installed by default..
services.udisks2.enable = true;
programs.hyprland = {
enable = true;
xwayland = {
@ -204,6 +206,7 @@
cachix
alejandra
];
programs.nix-index-database.comma.enable = true;