Compare commits
	
		
			No commits in common. "58f2686097deab75f026cbbfa04afeb4d4a43efd" and "f9b9424b2974d9af382f2fc7ad8783f8d0d9ada1" have entirely different histories.
		
	
	
		
			58f2686097
			...
			f9b9424b29
		
	
		
					 17 changed files with 75 additions and 10129 deletions
				
			
		|  | @ -8,33 +8,22 @@ | |||
|     (modulesPath + "/installer/scan/not-detected.nix") | ||||
|   ]; | ||||
| 
 | ||||
|   boot = { | ||||
|     initrd = { | ||||
|       availableKernelModules = [ | ||||
|         "xhci_pci" | ||||
|         "nvme" | ||||
|         "usb_storage" | ||||
|         "sd_mod" | ||||
|         "rtsx_pci_sdmmc" | ||||
|       ]; | ||||
|       kernelModules = [ ]; | ||||
|       luks.devices."luks-c21cb4a4-f618-43af-bc0c-e8be74fe3b81".device = "/dev/disk/by-uuid/c21cb4a4-f618-43af-bc0c-e8be74fe3b81"; | ||||
|     }; | ||||
|     kernelModules = [ "kvm-intel" ]; | ||||
|     extraModulePackages = [ ]; | ||||
|   }; | ||||
|   boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; | ||||
|   boot.initrd.kernelModules = [ ]; | ||||
|   boot.kernelModules = [ "kvm-intel" ]; | ||||
|   boot.extraModulePackages = [ ]; | ||||
| 
 | ||||
|   fileSystems = { | ||||
|     "/" = { | ||||
|   fileSystems."/" = { | ||||
|     device = "/dev/disk/by-label/NIX-ROOT"; | ||||
|     fsType = "ext4"; | ||||
|   }; | ||||
| 
 | ||||
|     "/boot/efi" = { | ||||
|   boot.initrd.luks.devices."luks-c21cb4a4-f618-43af-bc0c-e8be74fe3b81".device = "/dev/disk/by-uuid/c21cb4a4-f618-43af-bc0c-e8be74fe3b81"; | ||||
| 
 | ||||
|   fileSystems."/boot/efi" = { | ||||
|     device = "/dev/disk/by-label/NIX-BOOT"; | ||||
|     fsType = "vfat"; | ||||
|   }; | ||||
|   }; | ||||
| 
 | ||||
|   swapDevices = [ | ||||
|     { device = "/dev/disk/by-label/SWAP"; } | ||||
|  |  | |||
|  | @ -65,17 +65,14 @@ in { | |||
| 
 | ||||
|   config = lib.mkIf cfg.enable { | ||||
|     environment.systemPackages = (with pkgs; [ | ||||
|       # Window manager related | ||||
|       dbus-sway-environment | ||||
|       configure-gtk | ||||
|       wayland | ||||
|       xdg-utils # Open with default program | ||||
|       glib      # gsettings | ||||
|       wl-clipboard | ||||
|       wl-mirror # Mirror an output | ||||
|       wdisplays # Tool to configure displays | ||||
| 
 | ||||
|       # Desktop Environment related | ||||
|       brightnessctl | ||||
|       dunst | ||||
|       libnotify | ||||
|  |  | |||
|  | @ -5,7 +5,6 @@ | |||
|     ./openssh | ||||
|     ./pipewire | ||||
|     ./printing | ||||
|     ./remEYEnder | ||||
|     ./tailscale | ||||
|   ]; | ||||
| } | ||||
|  |  | |||
										
											Binary file not shown.
										
									
								
							|  | @ -1,35 +0,0 @@ | |||
| { config, lib, pkgs, ... }: | ||||
| 
 | ||||
| let | ||||
|   cfg = config.sisyphus.services.remEYEnder; | ||||
| 
 | ||||
|   icon = ./vecteezy_eyes-line-icon-vector-isolated_13932670.jpg; | ||||
| in { | ||||
|   options.sisyphus.services.remEYEnder.enable = lib.mkEnableOption "Eye reminder"; | ||||
| 
 | ||||
|   config = lib.mkIf cfg.enable { | ||||
|     systemd.user = { | ||||
|       services.remEYEnder = { | ||||
|         enable = true; | ||||
|         description = "Send an eye reminder"; | ||||
|         serviceConfig.Type = "oneshot"; | ||||
|         script = '' | ||||
|           # Display reminder for 20 seconds. | ||||
|           ${pkgs.libnotify}/bin/notify-send -t 20000 --icon=${icon} "RemEYEnder" "Look away from your screen :)" | ||||
|         ''; | ||||
|       }; | ||||
|       timers.remEYEnder = { | ||||
|         enable = true; | ||||
|         description = "Timer for remEYEnders, runs every 20 minutes."; | ||||
|         wantedBy = [ | ||||
|           "timers.target" | ||||
|         ]; | ||||
|         timerConfig = { | ||||
|           OnActiveSec = "20min"; | ||||
|           OnUnitActiveSec = "20min"; | ||||
|           Unit = "remEYEnder.service"; | ||||
|         }; | ||||
|       }; | ||||
|     }; | ||||
|   }; | ||||
| } | ||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 97 KiB | 
|  | @ -46,7 +46,6 @@ in { | |||
| 
 | ||||
|     sisyphus = { | ||||
|       programs.spotify-adblock.enable = true; | ||||
|       services.remEYEnder.enable = true; | ||||
|     }; | ||||
| 
 | ||||
|     home-manager.users.tdpeuter = lib.mkIf config.sisyphus.programs.home-manager.enable { | ||||
|  |  | |||
|  | @ -47,17 +47,6 @@ in { | |||
|             icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; | ||||
|             definedAliases = [ "@np" ]; | ||||
|           }; | ||||
|           "NixOS Options" = { | ||||
|             urls = [{ | ||||
|               template = "https://search.nixos.org/options"; | ||||
|               params = [ | ||||
|                 { name = "query"; value = "{searchTerms}"; } | ||||
|               ]; | ||||
|             }]; | ||||
| 
 | ||||
|             icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; | ||||
|             definedAliases = [ "@no" ]; | ||||
|           }; | ||||
|           "GitHub" = { | ||||
|             urls = [{ | ||||
|               template = "https://github.com/search"; | ||||
|  |  | |||
|  | @ -1,6 +1,6 @@ | |||
| input type:keyboard { | ||||
|     xkb_layout  "us","be" | ||||
|     xkb_variant "altgr-intl","iso-alternate" | ||||
|     xkb_layout  "us" | ||||
|     xkb_variant "altgr-intl" | ||||
| } | ||||
| 
 | ||||
| input type:touchpad { | ||||
|  |  | |||
|  | @ -1,8 +1,7 @@ | |||
| set $notify ~/projects/sisyphus/scripts/notify.sh | ||||
| 
 | ||||
| # Focus | ||||
| bindsym { | ||||
| 
 | ||||
|     # Focus | ||||
|     $flag+$up    focus up | ||||
|     $flag+$right focus right | ||||
|     $flag+$down  focus down | ||||
|  | @ -15,8 +14,10 @@ bindsym { | |||
| 
 | ||||
|     $flag+p      focus parent | ||||
|     $flag+space  focus mode_toggle | ||||
| } | ||||
| 
 | ||||
|     # Move windows | ||||
| # Move windows | ||||
| bindsym { | ||||
|     $flag+Shift+$up     move up | ||||
|     $flag+Shift+$right  move right | ||||
|     $flag+Shift+$down   move down | ||||
|  | @ -31,8 +32,10 @@ bindsym { | |||
|     $flag+KP_Next       move scratchpad | ||||
|     $flag+Prior         scratchpad show | ||||
|     $flag+KP_Prior      scratchpad show | ||||
| } | ||||
| 
 | ||||
|     # Layouts | ||||
| # Layouts | ||||
| bindsym { | ||||
|     $flag+z       layout toggle split | ||||
|     $flag+x       layout tabbed | ||||
|     $flag+c       split h | ||||
|  | @ -221,6 +224,8 @@ bindsym { | |||
|      | ||||
|     # File explorer | ||||
|     $flag+e      exec $term -e vifm | ||||
|     # Internet browser | ||||
|     $flag+i      exec firefox | ||||
| } | ||||
| 
 | ||||
| bindgesture { | ||||
|  |  | |||
|  | @ -5,9 +5,9 @@ | |||
| set $default "default" | ||||
| 
 | ||||
| # Resizing | ||||
| set $mode_resize "Resize" | ||||
| bindsym $flag+r mode $mode_resize | ||||
| mode $mode_resize bindsym { | ||||
| set $resize "Resize" | ||||
| bindsym $flag+r mode $resize | ||||
| mode $resize bindsym { | ||||
|     $right       resize grow   width  10 px or 10 ppt | ||||
|     $up          resize grow   height 10 px or 10 ppt | ||||
|     $left        resize shrink width  10 px or 10 ppt | ||||
|  | @ -38,9 +38,9 @@ mode $mode_resize bindsym { | |||
|     $flag+Left   move left | ||||
|     $flag+Down   move down | ||||
| 
 | ||||
|     $flag+r      mode $default | ||||
|     Escape       mode $default | ||||
|     Return       mode $default | ||||
|     Escape       mode $default | ||||
|     $flag+r      mode $default | ||||
| } | ||||
| 
 | ||||
| # System actions | ||||
|  | @ -53,23 +53,9 @@ mode $mode_system bindsym { | |||
|     r                   mode $default, exec systemctl reboot | ||||
|     Shift+s             mode $default, exec systemctl poweroff -i | ||||
| 
 | ||||
|     Return              mode $default | ||||
|     Escape              mode $default | ||||
|     Control+$alt+Delete mode $default | ||||
|     Escape              mode $default | ||||
|     Return              mode $default | ||||
| } | ||||
| 
 | ||||
| set $mode_preferences "Toggle (d)ark mode, (s)unset, (n)otification" | ||||
| bindsym $alt+end    mode $mode_preferences | ||||
| bindsym $alt+KP_End mode $mode_preferences | ||||
| mode $mode_preferences bindsym { | ||||
|     d           exec "${SCRIPT_DIR}/toggle-light-dark.sh", mode $default | ||||
|     s           exec "${SCRIPT_DIR}/sunset.sh",            mode $default | ||||
|     n           exec "${SCRIPT_DIR}/do-not-disturb.sh",    mode $default | ||||
| 
 | ||||
|     $alt+end    mode $default | ||||
|     $alt+KP_End mode $default | ||||
|     Escape      mode $default | ||||
|     Return      mode $default | ||||
| } | ||||
| 
 | ||||
| # Screenshots | ||||
|  | @ -86,23 +72,20 @@ mode $mode_screenshot bindsym { | |||
|     Shift+s exec grimshot --notify save screen $save_format, mode $default | ||||
|     Print   exec grimshot --notify save screen $save_format, mode $default | ||||
| 
 | ||||
|     Escape mode $default | ||||
|     Return mode $default | ||||
|     Escape mode $default | ||||
| } | ||||
| 
 | ||||
| # Launcher | ||||
| set $mode_launcher "Launch (f)irefox, (s)potify or (t)hunderbird." | ||||
| bindsym $flag+o mode $mode_launcher | ||||
| mode $mode_launcher bindsym { | ||||
|     f   exec firefox | ||||
|     t   exec thunderbird | ||||
| set $mode_preferences "Toggle (d)ark mode, (s)unset, (n)otification" | ||||
| bindsym $alt+end    mode $mode_preferences | ||||
| bindsym $alt+KP_End mode $mode_preferences | ||||
| mode $mode_preferences bindsym { | ||||
|     d           exec "${SCRIPT_DIR}/toggle-light-dark.sh", mode $default | ||||
|     s           exec "${SCRIPT_DIR}/sunset.sh",            mode $default | ||||
|     n           exec "${SCRIPT_DIR}/do-not-disturb.sh",    mode $default | ||||
| 
 | ||||
|     $flag+o mode $default | ||||
|     Escape  mode $default | ||||
|     Return      mode $default | ||||
|     Escape      mode $default | ||||
|     $alt+end    mode $default | ||||
|     $alt+KP_End mode $default | ||||
| } | ||||
| 
 | ||||
| # Ignore (all) keybinds. Useful when working with Virtual Machines. | ||||
| set $mode_ignore "Ignore keybinds - Press Control+Alt+Insert to escape." | ||||
| bindsym Control+$alt+Insert mode $mode_ignore | ||||
| mode $mode_ignore bindsym Control+$alt+Insert mode $default | ||||
|  |  | |||
|  | @ -8,10 +8,8 @@ indicator-radius=200 | |||
| clock | ||||
| datestr=%A, %B %d %Y | ||||
| 
 | ||||
| show-failed-attempts | ||||
| 
 | ||||
| screenshots | ||||
| effect-pixelate=10 | ||||
| effect-blur=5x5 | ||||
| effect-vignette=0.75:0 # Darken the whole screen. | ||||
| fade-in=0.25 | ||||
| 
 | ||||
|  | @ -20,35 +18,25 @@ grace-no-mouse | |||
| 
 | ||||
| # Styling | ||||
| 
 | ||||
| color=000000 # The default background color when no image could be loaded | ||||
| 
 | ||||
| font=letter extended | ||||
| text-color=ffffff | ||||
| text-clear-color=ffffff | ||||
| text-caps-lock-color=ffffff | ||||
| text-wrong-color=bd2024 | ||||
| 
 | ||||
| layout-text-color=ffffff | ||||
| text-wrong-color=eb4d4b | ||||
| 
 | ||||
| # Make all the other stuff invisible | ||||
| inside-color=00000000 | ||||
| inside-clear-color=00000000 | ||||
| inside-caps-lock-color=00000000 | ||||
| inside-ver-color=00000000 | ||||
| inside-wrong-color=00000000 | ||||
| key-hl-color=00000000 | ||||
| layout-bg-color=00000000 | ||||
| layout-border-color=00000000 | ||||
| line-color=00000000 | ||||
| line-clear-color=00000000 | ||||
| line-caps-lock-color=00000000 | ||||
| line-ver-color=00000000 | ||||
| line-wrong-color=00000000 | ||||
| separator-color=00000000 | ||||
| ring-color=00000000 | ||||
| ring-clear-color=00000000 | ||||
| ring-caps-lock-color=00000000 | ||||
| ring-ver-color=00000000 | ||||
| ring-wrong-color=00000000 | ||||
| separator-color=00000000 | ||||
| line-color=00000000 | ||||
| line-clear-color=00000000 | ||||
| line-ver-color=00000000 | ||||
| line-wrong-color=00000000 | ||||
| inside-color=00000000 | ||||
| inside-clear-color=00000000 | ||||
| inside-ver-color=00000000 | ||||
| inside-wrong-color=00000000 | ||||
| text-ver-color=00000000 | ||||
| 
 | ||||
|  |  | |||
|  | @ -30,9 +30,9 @@ | |||
|     "name": "keep", | ||||
|     "position": "top", | ||||
|     "height": 25, | ||||
|     "modules-left": ["sway/mode"], | ||||
|     "modules-left": ["sway/mode", "keyboard-state"], | ||||
|     "modules-center": ["clock"], | ||||
|     "modules-right": ["privacy", "keyboard-state"], | ||||
|     "modules-right": ["privacy"], | ||||
| 
 | ||||
|     "include": [ | ||||
|         // Import modules (!) | ||||
|  |  | |||
|  | @ -3,14 +3,15 @@ | |||
|         "sway/workspaces", | ||||
|         "custom/scratchpad-indicator", | ||||
|         "mpris", | ||||
|         "group/system" | ||||
|         "group/system", | ||||
|     ], | ||||
|     "modules-right": [ | ||||
|         "group/hardware", | ||||
|         "custom/sep", | ||||
|         "bluetooth", | ||||
|         "network", | ||||
|         "pulseaudio", | ||||
|         "group/battery", | ||||
|         "battery", | ||||
|         "custom/sep", | ||||
|         "tray" | ||||
|     ] | ||||
|  |  | |||
|  | @ -48,31 +48,18 @@ | |||
|     }, | ||||
| 
 | ||||
|     "custom/light-dark-toggle": { | ||||
|         "exec": "bash ${SCRIPT_DIR}/toggle-light-dark.sh -g", | ||||
|         "exec-on-event": true, | ||||
|         "on-click": "bash ${SCRIPT_DIR}/toggle-light-dark.sh", | ||||
|         // "format": "\uf042 ", | ||||
|         "format": "{icon}", | ||||
|         "format-icons": [ | ||||
|             "\uf185", | ||||
|             "\uf111" | ||||
|         ], | ||||
|         "tooltip": true, | ||||
|         "tooltip-format": "Toggle between light and dark mode" | ||||
|     }, | ||||
| 
 | ||||
|     "custom/keyboard-switch": { | ||||
|         "format": "\uf11c", | ||||
|         "on-click": "swaymsg input type:keyboard xkb_switch_layout next", | ||||
|         "tooltip-format": "Toggle keyboard layouts", | ||||
|         "tooltip-format": "Toggle between light and dark mode", | ||||
|         "format": "\uf042 ", | ||||
|         "tooltip": true | ||||
|     }, | ||||
| 
 | ||||
|     "custom/night-light-toggle": { | ||||
|         "on-click": "bash ${SCRIPT_DIR}/sunset.sh", | ||||
|         "tooltip-format": "Toggle night-light on or off", | ||||
|         "format": "\uf0eb ", | ||||
|         "tooltip": true, | ||||
|         "tooltip-format": "Toggle night-light on or off" | ||||
|         "tooltip-format": "Toggle night-light on or off", | ||||
|     }, | ||||
| 
 | ||||
|     "custom/scratchpad-indicator": { | ||||
|  | @ -132,39 +119,24 @@ | |||
|         "tooltip": true | ||||
|     }, | ||||
| 
 | ||||
|     "group/battery": { | ||||
|     "group/hardware": { | ||||
|         "orientation": "inherit", | ||||
|         "modules": [ | ||||
|             "battery", | ||||
|             "power-profiles-daemon", | ||||
|             "memory", | ||||
|             "cpu", | ||||
|             "temperature", | ||||
|             "custom/system-shutdown", | ||||
|             "custom/system-reboot", | ||||
|             "custom/system-hibernate", | ||||
|             "custom/system-sleep", | ||||
|             "custom/system-lock", | ||||
|             "custom/sep", | ||||
|             "power-profiles-daemon", | ||||
|             "custom/sep" | ||||
|         ], | ||||
|         "drawer": { | ||||
|             "transition-duration": 500, | ||||
|             "transition-left-to-right": false, | ||||
|             "children-class": "drawer-child" | ||||
|         } | ||||
|             "children-class": "drawer-child", | ||||
|         }, | ||||
| 
 | ||||
|     "group/hardware": { | ||||
|         "orientation": "inherit", | ||||
|         "modules": [ | ||||
|             "custom/sep", | ||||
|             "memory", | ||||
|             "cpu", | ||||
|             "temperature" | ||||
|         ], | ||||
|         "drawer": { | ||||
|             "transition-duration": 500, | ||||
|             "transition-left-to-right": false, | ||||
|             "children-class": "drawer-child" | ||||
|         } | ||||
|     }, | ||||
| 
 | ||||
|     "group/system": { | ||||
|  | @ -173,14 +145,13 @@ | |||
|             "idle_inhibitor", | ||||
|             "custom/light-dark-toggle", | ||||
|             "custom/night-light-toggle", | ||||
|             "custom/keyboard-switch", | ||||
|             "custom/toggle-notifications" | ||||
|             "custom/toggle-notifications", | ||||
|         ], | ||||
|         "drawer": { | ||||
|             "transition-duration": 500, | ||||
|             "tansition-left-to-right": true, | ||||
|             "children-class": "drawer-child" | ||||
|         } | ||||
|             "children-class": "drawer-child", | ||||
|         }, | ||||
|     }, | ||||
| 
 | ||||
|     "idle_inhibitor": { | ||||
|  | @ -194,7 +165,7 @@ | |||
| 
 | ||||
|     "keyboard-state": { | ||||
|         "format": { | ||||
|             "capslock": "{icon}" | ||||
|             "capslock": "{icon}", | ||||
|         }, | ||||
|         "format-icons": { | ||||
|             "locked": "\uf023", | ||||
|  | @ -202,7 +173,7 @@ | |||
|         }, | ||||
|         "numlock": false, | ||||
|         "capslock": true, | ||||
|         "scrollock": false | ||||
|         "scrollock": false, | ||||
|     }, | ||||
| 
 | ||||
|     "memory": { | ||||
|  | @ -306,7 +277,7 @@ | |||
|         }, | ||||
|         "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle", | ||||
|         "on-click-right": "pavucontrol", | ||||
|         "scroll-step": -2 | ||||
|         "scroll-step": 2 | ||||
|     }, | ||||
| 
 | ||||
|     "temperature": { | ||||
|  |  | |||
|  | @ -54,12 +54,8 @@ alias free='free -m' | |||
| alias gs='git status' | ||||
| alias hgrep='history | grep' | ||||
| alias ll='ls -la' | ||||
| alias mkdir='mkdir -pv' | ||||
| alias more='less' | ||||
| alias mv='mv -i' | ||||
| alias np='nano -w PKGBUILD' | ||||
| alias rm='rm -I --preserve-root' | ||||
| alias zip='zip -r' | ||||
| alias update='pushd ~/projects/sisyphus/nixos | ||||
| nix flake update | ||||
| sudo nixos-rebuild switch --flake .# --show-trace | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue