This commit is contained in:
2024-03-17 18:35:27 +00:00
parent 7a43e9b19d
commit 10babe814b
4 changed files with 36 additions and 21 deletions
+21 -5
View File
@@ -59,20 +59,36 @@
layout = "us"; layout = "us";
variant = ""; variant = "";
}; };
displayManager = { # displayManager = {
sddm.enable = true; # sddm.enable = true;
sddm.theme = "${import ../../modules/themes/sddm-theme.nix { inherit pkgs; }}"; # sddm.theme = "${import ../../modules/themes/sddm-theme.nix { inherit pkgs; }}";
sessionPackages = [ pkgs.hyprland ]; # sessionPackages = [ pkgs.hyprland ];
}; # };
windowManager.i3.enable = true; windowManager.i3.enable = true;
libinput.enable = true; libinput.enable = true;
}; };
services.greetd = {
enable = true;
restart = true;
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --cmd Hyprland";
};
};
};
environment.etc."greetd/environments".text = ''
Hyprland
none+i3
'';
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
services.blueman.enable = true; services.blueman.enable = true;
services.printing.enable = true; # Enable CUPS to print documents. services.printing.enable = true; # Enable CUPS to print documents.
security.pam.services.swaylock = {};
# Enable sound. # Enable sound.
sound.enable = true; sound.enable = true;
+14 -14
View File
@@ -21,26 +21,17 @@ env = QT_QPA_PLATFORMTHEME,qt6ct
env = SDL_VIDEODRIVER,wayland env = SDL_VIDEODRIVER,wayland
#auto-runs #auto-runs
exec-once = ~/.config/hypr/xdg-portal-hyprland exec-once = /home/liamm/.config/hypr/xdg-portal-hyprland
#exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP #exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
exec-once = dbus-update-activation-environment --systemd all # exec-once = dbus-update-activation-environment --systemd all
exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME # exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME
# exec-once = /usr/lib/polkit-kde-authentication-agent-1 # exec-once = /usr/lib/polkit-kde-authentication-agent-1
exec-once = wl-clipboard-history -t exec-once = wl-clipboard-history -t
exec-once = swww init exec-once = swww init
exec-once = gammastep # exec-once = gammastep
exec-once = waybar exec-once = waybar
exec-once = wl-paste -p --watch wl-copy -p '' exec-once = wl-paste -p --watch wl-copy -p ''
# THE FOLLOWING LINES ARE A TEST TO GET IDLE LOCKING/SLEEP WORKING
# Turn monitors off if locked (swaylock running) and idle for 10 seconds
#exec-once = swayidle -w timeout 10 'if pgrep -x swaylock; then hyprctl dispatch dpms off; fi' resume 'hyprctl dispatch dpms on'
#
# Sleep if locked (swaylock running) and idle for 10 seconds
$lock = swaylock -C $HOME/.config/swaylock/config
exec-once = swayidle -w timeout 180 'if pgrep -x swaylock; then systemctl suspend; fi' before-sleep '$lock' &
# Lock screen after idle for 300s and turn monitors off after 330
exec-once = swayidle -w timeout 300 '$lock' timeout 330 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' &
# IF ABANDONING ABOVE METHODS, UNCOMMENT BELOW # IF ABANDONING ABOVE METHODS, UNCOMMENT BELOW
#exec-once = swaylock #exec-once = swaylock
@@ -59,6 +50,15 @@ exec-once = blueman-applet
exec-once = nm-applet exec-once = nm-applet
exec-once = kdeconnect-indicator exec-once = kdeconnect-indicator
# THE FOLLOWING LINES ARE A TEST TO GET IDLE LOCKING/SLEEP WORKING
# Turn monitors off if locked (swaylock running) and idle for 10 seconds
#exec-once = swayidle -w timeout 10 'if pgrep -x swaylock; then hyprctl dispatch dpms off; fi' resume 'hyprctl dispatch dpms on'
#
# Sleep if locked (swaylock running) and idle for 10 seconds
$lock = swaylock -C $HOME/.config/swaylock/config
exec-once = swayidle -w timeout 180 'if pgrep -x swaylock; then systemctl suspend; fi' before-sleep '$lock' &
# Lock screen after idle for 300s and turn monitors off after 330
exec-once = swayidle -w timeout 300 '$lock' timeout 330 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' &
input { input {
kb_layout = us kb_layout = us
@@ -191,7 +191,7 @@ $ctrlMod = CTRL
# NATIVE PROGRAM BINDS # NATIVE PROGRAM BINDS
bind = $altMod, Return, exec, $HOME/.local/bin/ghostty bind = $altMod, Return, exec, $HOME/.local/bin/ghostty
bind = $mainMod, Return, exec, $HOME/.local/bin/ghostty # for apps that yoink alt- binds bind = $mainMod, Return, exec, $HOME/.local/bin/ghostty # for apps that yoink alt- binds
bind = $altMod SHIFT, Return, exec, contour bind = $altMod SHIFT, Return, exec, alacritty
bind = $mainMod SHIFT, D, exec, discord --enable-blink-features=MiddleClickAutoscroll bind = $mainMod SHIFT, D, exec, discord --enable-blink-features=MiddleClickAutoscroll
bind = $mainMod SHIFT, E, exec, emacsclient -c -a 'emacs' bind = $mainMod SHIFT, E, exec, emacsclient -c -a 'emacs'
bind = $mainMode SHIFT, F, exec, focus-linux bind = $mainMode SHIFT, F, exec, focus-linux
+1 -1
View File
@@ -24,5 +24,5 @@ ring-clear-color=9ccfd8
line-clear-color=1f1d2e line-clear-color=1f1d2e
line-wrong-color=1f1d2e line-wrong-color=1f1d2e
bs-hl-color=31748f bs-hl-color=31748f
image=/usr/share/pixmaps/background.jpg image=/home/liamm/pictures/desert.jpg
ignore-empty-password ignore-empty-password
-1
View File
@@ -19,7 +19,6 @@ pkgs.stdenv.mkDerivation {
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
cp -R ./* $out cp -R ./* $out
# rm Background.jpg
cp -r ${image} $out/Background.jpg cp -r ${image} $out/Background.jpg
''; '';
} }