Compare commits

..

No commits in common. "58f2686097deab75f026cbbfa04afeb4d4a43efd" and "f9b9424b2974d9af382f2fc7ad8783f8d0d9ada1" have entirely different histories.

17 changed files with 75 additions and 10129 deletions

View file

@ -8,33 +8,22 @@
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot = { boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
initrd = { boot.initrd.kernelModules = [ ];
availableKernelModules = [ boot.kernelModules = [ "kvm-intel" ];
"xhci_pci" boot.extraModulePackages = [ ];
"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 = [ ];
};
fileSystems = { fileSystems."/" = {
"/" = {
device = "/dev/disk/by-label/NIX-ROOT"; device = "/dev/disk/by-label/NIX-ROOT";
fsType = "ext4"; 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"; device = "/dev/disk/by-label/NIX-BOOT";
fsType = "vfat"; fsType = "vfat";
}; };
};
swapDevices = [ swapDevices = [
{ device = "/dev/disk/by-label/SWAP"; } { device = "/dev/disk/by-label/SWAP"; }

View file

@ -65,17 +65,14 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = (with pkgs; [ environment.systemPackages = (with pkgs; [
# Window manager related
dbus-sway-environment dbus-sway-environment
configure-gtk configure-gtk
wayland wayland
xdg-utils # Open with default program xdg-utils # Open with default program
glib # gsettings glib # gsettings
wl-clipboard wl-clipboard
wl-mirror # Mirror an output
wdisplays # Tool to configure displays wdisplays # Tool to configure displays
# Desktop Environment related
brightnessctl brightnessctl
dunst dunst
libnotify libnotify

View file

@ -5,7 +5,6 @@
./openssh ./openssh
./pipewire ./pipewire
./printing ./printing
./remEYEnder
./tailscale ./tailscale
]; ];
} }

View file

@ -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

View file

@ -46,7 +46,6 @@ in {
sisyphus = { sisyphus = {
programs.spotify-adblock.enable = true; programs.spotify-adblock.enable = true;
services.remEYEnder.enable = true;
}; };
home-manager.users.tdpeuter = lib.mkIf config.sisyphus.programs.home-manager.enable { home-manager.users.tdpeuter = lib.mkIf config.sisyphus.programs.home-manager.enable {

View file

@ -47,17 +47,6 @@ in {
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@np" ]; 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" = { "GitHub" = {
urls = [{ urls = [{
template = "https://github.com/search"; template = "https://github.com/search";

View file

@ -1,6 +1,6 @@
input type:keyboard { input type:keyboard {
xkb_layout "us","be" xkb_layout "us"
xkb_variant "altgr-intl","iso-alternate" xkb_variant "altgr-intl"
} }
input type:touchpad { input type:touchpad {

View file

@ -1,8 +1,7 @@
set $notify ~/projects/sisyphus/scripts/notify.sh set $notify ~/projects/sisyphus/scripts/notify.sh
# Focus
bindsym { bindsym {
# Focus
$flag+$up focus up $flag+$up focus up
$flag+$right focus right $flag+$right focus right
$flag+$down focus down $flag+$down focus down
@ -15,8 +14,10 @@ bindsym {
$flag+p focus parent $flag+p focus parent
$flag+space focus mode_toggle $flag+space focus mode_toggle
}
# Move windows # Move windows
bindsym {
$flag+Shift+$up move up $flag+Shift+$up move up
$flag+Shift+$right move right $flag+Shift+$right move right
$flag+Shift+$down move down $flag+Shift+$down move down
@ -31,8 +32,10 @@ bindsym {
$flag+KP_Next move scratchpad $flag+KP_Next move scratchpad
$flag+Prior scratchpad show $flag+Prior scratchpad show
$flag+KP_Prior scratchpad show $flag+KP_Prior scratchpad show
}
# Layouts # Layouts
bindsym {
$flag+z layout toggle split $flag+z layout toggle split
$flag+x layout tabbed $flag+x layout tabbed
$flag+c split h $flag+c split h
@ -221,6 +224,8 @@ bindsym {
# File explorer # File explorer
$flag+e exec $term -e vifm $flag+e exec $term -e vifm
# Internet browser
$flag+i exec firefox
} }
bindgesture { bindgesture {

View file

@ -5,9 +5,9 @@
set $default "default" set $default "default"
# Resizing # Resizing
set $mode_resize "Resize" set $resize "Resize"
bindsym $flag+r mode $mode_resize bindsym $flag+r mode $resize
mode $mode_resize bindsym { mode $resize bindsym {
$right resize grow width 10 px or 10 ppt $right resize grow width 10 px or 10 ppt
$up resize grow height 10 px or 10 ppt $up resize grow height 10 px or 10 ppt
$left resize shrink width 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+Left move left
$flag+Down move down $flag+Down move down
$flag+r mode $default
Escape mode $default
Return mode $default Return mode $default
Escape mode $default
$flag+r mode $default
} }
# System actions # System actions
@ -53,23 +53,9 @@ mode $mode_system bindsym {
r mode $default, exec systemctl reboot r mode $default, exec systemctl reboot
Shift+s mode $default, exec systemctl poweroff -i Shift+s mode $default, exec systemctl poweroff -i
Return mode $default
Escape mode $default
Control+$alt+Delete 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 # Screenshots
@ -86,23 +72,20 @@ mode $mode_screenshot bindsym {
Shift+s exec grimshot --notify save screen $save_format, mode $default Shift+s exec grimshot --notify save screen $save_format, mode $default
Print 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 Return mode $default
Escape mode $default
} }
# Launcher set $mode_preferences "Toggle (d)ark mode, (s)unset, (n)otification"
set $mode_launcher "Launch (f)irefox, (s)potify or (t)hunderbird." bindsym $alt+end mode $mode_preferences
bindsym $flag+o mode $mode_launcher bindsym $alt+KP_End mode $mode_preferences
mode $mode_launcher bindsym { mode $mode_preferences bindsym {
f exec firefox d exec "${SCRIPT_DIR}/toggle-light-dark.sh", mode $default
t exec thunderbird 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 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

View file

@ -8,10 +8,8 @@ indicator-radius=200
clock clock
datestr=%A, %B %d %Y datestr=%A, %B %d %Y
show-failed-attempts
screenshots screenshots
effect-pixelate=10 effect-blur=5x5
effect-vignette=0.75:0 # Darken the whole screen. effect-vignette=0.75:0 # Darken the whole screen.
fade-in=0.25 fade-in=0.25
@ -20,35 +18,25 @@ grace-no-mouse
# Styling # Styling
color=000000 # The default background color when no image could be loaded
font=letter extended font=letter extended
text-color=ffffff text-color=ffffff
text-clear-color=ffffff text-clear-color=ffffff
text-caps-lock-color=ffffff text-wrong-color=eb4d4b
text-wrong-color=bd2024
layout-text-color=ffffff
# Make all the other stuff invisible # 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 key-hl-color=00000000
layout-bg-color=00000000 separator-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
ring-color=00000000 ring-color=00000000
ring-clear-color=00000000 ring-clear-color=00000000
ring-caps-lock-color=00000000
ring-ver-color=00000000 ring-ver-color=00000000
ring-wrong-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 text-ver-color=00000000

View file

@ -30,9 +30,9 @@
"name": "keep", "name": "keep",
"position": "top", "position": "top",
"height": 25, "height": 25,
"modules-left": ["sway/mode"], "modules-left": ["sway/mode", "keyboard-state"],
"modules-center": ["clock"], "modules-center": ["clock"],
"modules-right": ["privacy", "keyboard-state"], "modules-right": ["privacy"],
"include": [ "include": [
// Import modules (!) // Import modules (!)

View file

@ -3,14 +3,15 @@
"sway/workspaces", "sway/workspaces",
"custom/scratchpad-indicator", "custom/scratchpad-indicator",
"mpris", "mpris",
"group/system" "group/system",
], ],
"modules-right": [ "modules-right": [
"group/hardware", "group/hardware",
"custom/sep",
"bluetooth", "bluetooth",
"network", "network",
"pulseaudio", "pulseaudio",
"group/battery", "battery",
"custom/sep", "custom/sep",
"tray" "tray"
] ]

View file

@ -48,31 +48,18 @@
}, },
"custom/light-dark-toggle": { "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", "on-click": "bash ${SCRIPT_DIR}/toggle-light-dark.sh",
// "format": "\uf042 ", "tooltip-format": "Toggle between light and dark mode",
"format": "{icon}", "format": "\uf042 ",
"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": true "tooltip": true
}, },
"custom/night-light-toggle": { "custom/night-light-toggle": {
"on-click": "bash ${SCRIPT_DIR}/sunset.sh", "on-click": "bash ${SCRIPT_DIR}/sunset.sh",
"tooltip-format": "Toggle night-light on or off",
"format": "\uf0eb ", "format": "\uf0eb ",
"tooltip": true, "tooltip": true,
"tooltip-format": "Toggle night-light on or off" "tooltip-format": "Toggle night-light on or off",
}, },
"custom/scratchpad-indicator": { "custom/scratchpad-indicator": {
@ -132,39 +119,24 @@
"tooltip": true "tooltip": true
}, },
"group/battery": { "group/hardware": {
"orientation": "inherit", "orientation": "inherit",
"modules": [ "modules": [
"battery", "power-profiles-daemon",
"memory",
"cpu",
"temperature",
"custom/system-shutdown", "custom/system-shutdown",
"custom/system-reboot", "custom/system-reboot",
"custom/system-hibernate", "custom/system-hibernate",
"custom/system-sleep", "custom/system-sleep",
"custom/system-lock", "custom/system-lock",
"custom/sep",
"power-profiles-daemon",
"custom/sep"
], ],
"drawer": { "drawer": {
"transition-duration": 500, "transition-duration": 500,
"transition-left-to-right": false, "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": { "group/system": {
@ -173,14 +145,13 @@
"idle_inhibitor", "idle_inhibitor",
"custom/light-dark-toggle", "custom/light-dark-toggle",
"custom/night-light-toggle", "custom/night-light-toggle",
"custom/keyboard-switch", "custom/toggle-notifications",
"custom/toggle-notifications"
], ],
"drawer": { "drawer": {
"transition-duration": 500, "transition-duration": 500,
"tansition-left-to-right": true, "tansition-left-to-right": true,
"children-class": "drawer-child" "children-class": "drawer-child",
} },
}, },
"idle_inhibitor": { "idle_inhibitor": {
@ -194,7 +165,7 @@
"keyboard-state": { "keyboard-state": {
"format": { "format": {
"capslock": "{icon}" "capslock": "{icon}",
}, },
"format-icons": { "format-icons": {
"locked": "\uf023", "locked": "\uf023",
@ -202,7 +173,7 @@
}, },
"numlock": false, "numlock": false,
"capslock": true, "capslock": true,
"scrollock": false "scrollock": false,
}, },
"memory": { "memory": {
@ -306,7 +277,7 @@
}, },
"on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle", "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
"on-click-right": "pavucontrol", "on-click-right": "pavucontrol",
"scroll-step": -2 "scroll-step": 2
}, },
"temperature": { "temperature": {

View file

@ -54,12 +54,8 @@ alias free='free -m'
alias gs='git status' alias gs='git status'
alias hgrep='history | grep' alias hgrep='history | grep'
alias ll='ls -la' alias ll='ls -la'
alias mkdir='mkdir -pv'
alias more='less' alias more='less'
alias mv='mv -i'
alias np='nano -w PKGBUILD' alias np='nano -w PKGBUILD'
alias rm='rm -I --preserve-root'
alias zip='zip -r'
alias update='pushd ~/projects/sisyphus/nixos alias update='pushd ~/projects/sisyphus/nixos
nix flake update nix flake update
sudo nixos-rebuild switch --flake .# --show-trace sudo nixos-rebuild switch --flake .# --show-trace