Compare commits

..

1 commit

Author SHA1 Message Date
e4e59c52fa
[hypr] WIP: Switch colours at boot 2025-10-30 19:54:23 +01:00
35 changed files with 375 additions and 422 deletions

180
nixos/flake.lock generated
View file

@ -25,42 +25,63 @@
]
},
"locked": {
"lastModified": 1781184346,
"narHash": "sha256-cZRlW47U6A2nWvAmnZeeO6Xvq23gxYbVLel4KxqOrcQ=",
"lastModified": 1758463745,
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ea6d221d7aa85652d014b6f719dddf036037515b",
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-26.05",
"ref": "release-25.05",
"repo": "home-manager",
"type": "github"
}
},
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"openconnect-sso",
"nixpkgs"
]
},
"locked": {
"lastModified": 1720066371,
"narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1780902259,
"narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
"lastModified": 1760862643,
"narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
"rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-26.05",
"ref": "nixos-25.05",
"type": "indirect"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1781074563,
"narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
"lastModified": 1760878510,
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"type": "github"
},
"original": {
@ -69,14 +90,81 @@
"type": "indirect"
}
},
"openconnect-sso": {
"inputs": {
"flake-utils": [
"utils"
],
"nix-github-actions": "nix-github-actions",
"nixpkgs": [
"nixpkgs"
],
"poetry2nix": "poetry2nix",
"systems": "systems_2",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1758594056,
"narHash": "sha256-6XyKDRWqBngw1g73e789iyIaw/0VF04ELk/ATtlkTVU=",
"owner": "ThinkChaos",
"repo": "openconnect-sso",
"rev": "2041471efd331d0591d34e122aefb02690fb233a",
"type": "github"
},
"original": {
"owner": "ThinkChaos",
"ref": "fix/nix-flake",
"repo": "openconnect-sso",
"type": "github"
}
},
"poetry2nix": {
"inputs": {
"flake-utils": [
"openconnect-sso",
"flake-utils"
],
"nix-github-actions": [
"openconnect-sso",
"nix-github-actions"
],
"nixpkgs": [
"openconnect-sso",
"nixpkgs"
],
"systems": [
"openconnect-sso",
"systems"
],
"treefmt-nix": [
"openconnect-sso",
"treefmt-nix"
]
},
"locked": {
"lastModified": 1721039874,
"narHash": "sha256-XANsG9GYHip8pxZpbqKf/YGv8tIa0xTh289Y+WNBNfw=",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "d11c01e58587e5f21037ed6477465a7f26a32e27",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "poetry2nix",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"openconnect-sso": "openconnect-sso",
"sops-nix": "sops-nix",
"utils": "utils"
"utils": "utils",
"zen-browser": "zen-browser"
}
},
"sops-nix": {
@ -86,11 +174,11 @@
]
},
"locked": {
"lastModified": 1780547341,
"narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
"lastModified": 1760998189,
"narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
"rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
"type": "github"
},
"original": {
@ -114,6 +202,42 @@
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"openconnect-sso",
"nixpkgs"
]
},
"locked": {
"lastModified": 1721769617,
"narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"utils": {
"inputs": {
"flake-utils": [
@ -121,11 +245,11 @@
]
},
"locked": {
"lastModified": 1779563444,
"narHash": "sha256-+rEagECcF6BhWfLs8VCkPqsBuxxSSIRxMlgjXj6G8UQ=",
"lastModified": 1738591040,
"narHash": "sha256-4WNeriUToshQ/L5J+dTSWC5OJIwT39SEP7V7oylndi8=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "a00f6f51907b5c74d2fde086b10b19d446d15717",
"rev": "afcb15b845e74ac5e998358709b2b5fe42a948d1",
"type": "github"
},
"original": {
@ -133,6 +257,26 @@
"repo": "flake-utils-plus",
"type": "github"
}
},
"zen-browser": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1761105987,
"narHash": "sha256-d01CGcdNlsqIn4ncGCWHM0Velnii/Ggef1iybQvEOfc=",
"owner": "youwen5",
"repo": "zen-browser-flake",
"rev": "e7d9fefd8665be5d4c77466140f21a15f6d29e93",
"type": "github"
},
"original": {
"owner": "youwen5",
"repo": "zen-browser-flake",
"type": "github"
}
}
},
"root": "root",

View file

@ -2,14 +2,21 @@
description = "System configuration of my machines using flakes";
inputs = {
nixpkgs.url = "nixpkgs/nixos-26.05";
nixpkgs.url = "nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
home-manager = {
url = "github:nix-community/home-manager/release-26.05";
url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};
openconnect-sso = {
url = "github:ThinkChaos/openconnect-sso/fix/nix-flake";
inputs = {
flake-utils.follows = "utils";
nixpkgs.follows = "nixpkgs";
};
};
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
@ -18,25 +25,28 @@
url = "github:gytis-ivaskevicius/flake-utils-plus";
inputs.flake-utils.follows = "flake-utils";
};
zen-browser = {
url = "github:youwen5/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = inputs@{
self, nixpkgs, nixpkgs-unstable,
flake-utils, home-manager, sops-nix, utils,
flake-utils, home-manager, openconnect-sso, sops-nix, utils, zen-browser,
... }:
let
system = utils.lib.system.x86_64-linux;
unfreePackages = pkg: builtins.elem (nixpkgs.lib.getName pkg) [
"corefonts"
"nvidia-settings" "nvidia-x11" "nvidia-persistenced" "nvidia-kernel-modules"
"nvidia-settings" "nvidia-x11" "nvidia-persistenced"
"Oracle_VirtualBox_Extension_Pack"
"spotify"
"steam" "steam-unwrapped" "steam-run"
"vista-fonts"
"intel-ocl"
"libfprint-2-tod1-broadcom"
"vmware-workstation"
];
in
utils.lib.mkFlake {

View file

@ -20,8 +20,6 @@
networking = {
networkmanager.enable = true;
openconnect-sso.enable = true;
openvpn.enable = true;
tailscale.enable = true;
};
nix = {
@ -31,13 +29,13 @@
programs = {
direnv.enable = true;
git.enable = true;
home-manager.enable = true;
sops.enable = true;
ssh.enable = true;
};
services = {
tailscale.enable = true;
pipewire.enable = true;
printing.enable = true;
openrgb.enable = true;
@ -64,6 +62,7 @@
};
environment.systemPackages = with pkgs; [
git
vim-full
w3m
wget

View file

@ -23,7 +23,6 @@
networking = {
networkmanager.enable = true;
openconnect-sso.enable = true;
tailscale.enable = true;
};
nix = {
@ -38,7 +37,10 @@
ssh.enable = true;
};
services.pipewire.enable = true;
services = {
pipewire.enable = true;
tailscale.enable = true;
};
users.tdpeuter.enable = true;

View file

@ -25,9 +25,7 @@
networking = {
networkmanager.enable = true;
#openconnect-sso.enable = true;
openvpn.enable = true;
tailscale.enable = true;
openconnect-sso.enable = true;
};
nix = {
@ -37,14 +35,15 @@
programs = {
direnv.enable = true;
git.enable = true;
home-manager.enable = true;
sops.enable = true;
ssh.enable = true;
wireshark.enable = true;
};
services.pipewire.enable = true;
services = {
pipewire.enable = true;
tailscale.enable = true;
};
users.tdpeuter.enable = true;
@ -55,8 +54,23 @@
};
boot = {
# Use EFI and YubiKey
initrd.kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ];
initrd = {
# Use EFI and YubiKey
kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ];
luks = {
# Enable YubiKey PBA
yubikeySupport = true;
devices."encrypted".yubikey = {
slot = 2;
twoFactor = false;
gracePeriod = 10;
keyLength = 64;
saltLength = 16;
storage.device = "/dev/nvme0n1p1";
};
};
};
loader = {
# Use the systemd-boot EFI boot loader.
@ -80,8 +94,6 @@
powerOnBoot = false;
};
nix.settings.download-buffer-size = 500 * 1024 * 1024; # 500 MiB
programs.zsh.enable = true;
services = {
@ -99,17 +111,17 @@
};
};
logind.settings.Login = {
logind = {
# Handle the laptop lid switch as follows:
HandleLidSwitch = "hybrid-sleep";
HandleLidSwitchExternalPower = "lock";
HandleLidSwitchDocked = "ignore";
lidSwitch = "hybrid-sleep";
lidSwitchExternalPower = "lock";
lidSwitchDocked = "ignore";
# Handle the power key
HandlePowerKey = "suspend";
HandlePowerKeyLongPress = "poweroff";
powerKey = "suspend";
};
power-profiles-daemon.enable = false;
smartd.enable = true;
@ -128,9 +140,9 @@
libinput.enable = true;
};
virtualisation.vmware.host.enable = true;
networking.hostName = "Tibo-NixTop"; # Define your hostname.
networking = {
hostName = "Tibo-NixTop"; # Define your hostname.
};
# Set your time zone.
time.timeZone = "Europe/Brussels";
@ -147,6 +159,12 @@
useXkbConfig = true; # use xkb.options in tty.
};
# Enable CUPS to print documents.
# services.printing.enable = true;
# Enable touchpad support (enabled default in most desktopManager).
# services.libinput.enable = true;
# List packages installed in system profile.
# You can use https://search.nixos.org/ to find more packages (and options).
environment = {
@ -154,6 +172,7 @@
localBinInPath = true;
systemPackages = with pkgs; [
git
vim-full # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
w3m
wget
@ -179,5 +198,6 @@
#
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
system.stateVersion = "25.05"; # Did you read the comment?
}

View file

@ -7,18 +7,14 @@ in {
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [
libnotify
jq # JSON parser
libnotify # Notifications
sunwait # Sunrise/sunset calculator
playerctl
jq
j4-dmenu-desktop
];
fonts.packages = with pkgs; [
font-awesome_6
];
programs.waybar.enable = true;
services.atd.enable = true; # Command scheduler
};
}

View file

@ -25,6 +25,15 @@ in {
};
config = lib.mkIf cfg.enable {
boot = {
extraModprobeConfig = ''
options nvidia-drm modeset=1
'';
kernelParams = [
"nvidia_drm.modeset=1"
];
};
hardware = {
graphics = {
enable = true;
@ -32,8 +41,8 @@ in {
extraPackages = with pkgs; [
intel-ocl
intel-compute-runtime
intel-graphics-compiler
opencl-clhpp
opencl-clang
opencl-headers
ocl-icd
];
@ -42,9 +51,7 @@ in {
nvidia = {
# Use the NVidia open source kernel module (or not)
open = false;
branch = "stable";
# To override the default package set by the branch:
#package = config.boot.kernelPackages.nvidiaPackages.stable;
package = config.boot.kernelPackages.nvidiaPackages.stable;
# Modesetting is required.
modesetting.enable = true;
nvidiaSettings = cfg.gui-settings;

View file

@ -2,7 +2,5 @@
imports = [
./networkmanager
./openconnect-sso
./openvpn
./tailscale
];
}

View file

@ -1,14 +0,0 @@
{ config, lib, ... }:
let
cfg = config.sisyphus.networking.openvpn;
in {
options.sisyphus.networking.openvpn.enable = lib.mkEnableOption "OpenVPN client";
config = lib.mkIf cfg.enable {
programs.openvpn3.enable = true;
# https://github.com/NixOS/nixpkgs/issues/379074
services.resolved.enable = true;
};
}

View file

@ -1,22 +0,0 @@
{ config, lib, pkgs, pkgs-unstable, ... }:
let
cfg = config.sisyphus.networking.tailscale;
in {
options.sisyphus.networking.tailscale.enable = lib.mkEnableOption "Tailscale";
config = lib.mkIf cfg.enable {
services = {
tailscale = {
enable = true;
package = pkgs-unstable.tailscale;
useRoutingFeatures = "client";
extraDaemonFlags = [
"--no-logs-no-support"
];
};
resolved.enable = true;
};
};
}

View file

@ -5,6 +5,5 @@
./sops
./spotify-adblock
./ssh
./wireshark
];
}

View file

@ -1,12 +0,0 @@
{ config, lib, pkgs, ... }:
let
cfg = config.sisyphus.programs.git;
in {
options.sisyphus.programs.git.enable = lib.mkEnableOption "Git";
config.programs.git = lib.mkIf cfg.enable {
enable = true;
lfs.enable = true;
};
}

View file

@ -1,23 +0,0 @@
{ config, lib, pkgs, ... }:
let
cfg = config.sisyphus.programs.wireshark;
in {
options.sisyphus.programs.wireshark.enable = lib.mkEnableOption "Wireshark";
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [
wireshark
];
programs.wireshark = {
enable = true;
dumpcap.enable = true;
usbmon.enable = false;
};
sisyphus.users.wantedGroups = [
"wireshark"
];
};
}

View file

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

View file

@ -6,24 +6,18 @@ in {
options.sisyphus.services.openrgb.enable = lib.mkEnableOption "OpenRGB";
config = lib.mkIf cfg.enable {
boot.kernelModules = [ "i2c-dev" ];
environment.systemPackages = with pkgs; [
openrgb-with-all-plugins
services.udev.packages = with pkgs; [
openrgb
];
boot.kernelModules = [ "i2c-dev" ];
hardware.i2c.enable = true;
services = {
hardware.openrgb = {
enable = true;
package = pkgs.openrgb-with-all-plugins;
motherboard = "intel";
};
udev.packages = with pkgs; [
openrgb
];
services.hardware.openrgb = {
enable = true;
package = pkgs.openrgb-with-all-plugins;
motherboard = "intel";
};
};
}

View file

@ -2,6 +2,8 @@
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";
@ -11,10 +13,10 @@ in {
enable = true;
description = "Send an eye reminder";
serviceConfig.Type = "oneshot";
script = builtins.readFile ./remEYEnder.sh;
path = with pkgs; [
libnotify
];
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;

View file

@ -1 +0,0 @@
../../../../scripts/remEYEnder.sh

View file

@ -0,0 +1,15 @@
{ config, lib, pkgs, pkgs-unstable, ... }:
let
cfg = config.sisyphus.services.tailscale;
in {
options.sisyphus.services.tailscale.enable = lib.mkEnableOption "Tailscale";
config = lib.mkIf cfg.enable {
services.tailscale = {
enable = true;
package = pkgs-unstable.tailscale;
useRoutingFeatures = "client";
};
};
}

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, pkgs-unstable, ... }:
{ config, inputs, lib, pkgs, pkgs-unstable, ... }:
let
cfg = config.sisyphus.users.tdpeuter;
@ -35,7 +35,7 @@ in {
shell = pkgs.zsh;
packages = (with pkgs; [
#bitwarden-desktop
bitwarden-desktop
brave # Internet browser
chafa # Terminal image viewer
cmdtime # Zsh plugin
@ -46,10 +46,9 @@ in {
gh # GitHub CLI tool
glow # Terminal Markdown renderer
icosystem # Personal icon theme
#jellyfin-media-player
jellyfin-media-player
libreoffice-fresh # Office tools
librewolf # Internet browser
#logseq # Note taking
mpv # Media player
nextcloud-client
nsxiv # Lightweight image viewer
@ -74,7 +73,10 @@ in {
# TODO Move to devshells
# ruff pylint # Python
]) ++ (with pkgs-unstable; [
]);
logseq # Note taking
]) ++ [
inputs.zen-browser.packages.${pkgs.system}.default
];
};
fonts.packages = with pkgs; [
@ -85,8 +87,9 @@ in {
noto-fonts # Dependency of Zellij config
noto-fonts-cjk-sans # Dependency of Zellij config
noto-fonts-cjk-serif # Dependency of Zellij config
noto-fonts-emoji
noto-fonts-color-emoji # Emoji's!
vista-fonts # Microsoft fonts
vistafonts # Microsoft fonts
];
sisyphus = {
@ -139,6 +142,14 @@ in {
};
};
services.syncthing = {
enable = true;
extraOptions = [
"--no-default-folder"
];
tray.enable = true;
};
xdg = {
desktopEntries.spotify = {
name = "Spotify";

View file

@ -37,12 +37,6 @@ in {
recursive = true;
source = ../../../stow/hyprland/.config/hypr;
};
".config/hypr/hy3-plugin.conf" = {
inherit (config.sisyphus.desktop.hyprland) enable;
text = ''
plugin = ${pkgs.hyprlandPlugins.hy3}/lib/libhy3.so
'';
};
".config/kitty" = {
enable = false;
recursive = true;

View file

@ -54,8 +54,6 @@ in {
];
};
configPath = "/home/tdpeuter/.config/mozilla/firefox";
languagePacks = [
"en-GB"
"nl"

View file

@ -1,36 +0,0 @@
DURATION=20 # How long it takes to progress the bar fully
STEPS=100 # In how many steps to progress (> 0)
# Trick to fake decimals
EXP=3
interval_ms="$(( "${DURATION}" * ( 10 ** "${EXP}" ) / "${STEPS}" ))"
padded_interval_ms="$(printf "%0${EXP}d" "${interval_ms}")"
interval_s="${padded_interval_ms:0:-${EXP}}.${padded_interval_ms:-${EXP}}"
end_time="$(( "$( date '+%s' )" + "${DURATION}" ))"
# notify-send args
replace_id="${end_time}"
counter=0
while [[ "${end_time}" -gt "$( date '+%s' )" ]]; do
# Remap to [0, 100]
remaining_part="$(( ("${STEPS}" - "${counter}") * 100 / "${STEPS}" ))"
notify-send \
'Look away from your screen :)' 'RemEYEnder' \
--hint="int:value:${remaining_part}" \
--category='sysinfo' \
--replace-id="${replace_id}"
counter="$(( "${counter}" + 1 ))"
sleep "${interval_s}"
done
notify-send \
'Look away from your screen :)' 'RemEYEnder' \
--hint="int:value:${remaining_part}" \
--category='sysinfo' \
--replace-id="${replace_id}" \
--expire-time="${interval_ms}"

15
scripts/sunset.sh Executable file
View file

@ -0,0 +1,15 @@
#!/usr/bin/env bash
# Script to disable for an hour or immediately continue wlsunset. 'Toggle'
# Check if wlsunset is still running
pid=$(pgrep wlsunset)
if [[ -z ${pid} ]] ; then
# Start wlsunset right away.
wlsunset -l 50.50 -L 4.00 -t 3000 -T 6500 &
else
# Currently stop wlsunset but restart in an hour.
kill ${pid}
notify-send 'Stopping sunset' 'Restarting in an hour'
at now +1 hours -f "${0}"
fi

View file

@ -14,10 +14,27 @@ STATE_DIR="${HOME}/.local/state/sisyphus"
STATE_FILE="${STATE_DIR}/theme"
BG_DIR="${HOME}/Nextcloud/Afbeeldingen/wallpapers"
LATITUDE='50.50N' # Belgium
LONGITUDE='4.00E'
# Mapping inputs to themes
declare -A theme_name
theme_name['light']="${THEME_LIGHT}"
theme_name['dark']="${THEME_DARK}"
declare -A theme_time
theme_time['DAY']="${THEME_LIGHT}"
theme_time['NIGHT']="${THEME_DARK}"
# Mapping of current theme to next theme
declare -A theme_next
theme_next[${THEME_LIGHT}]="${THEME_DARK}"
theme_next[${THEME_DARK}]="${THEME_LIGHT}"
# Mapping of theme to applications
declare -A gsettings_alt
gsettings_alt[${THEME_LIGHT}]='default'
gsettings_alt[${THEME_DARK}]='prefer-dark'
@ -35,17 +52,14 @@ wallpaper[${THEME_DARK}]="bg-dark"
#############
# Parse options
while getopts ":m:g" option; do
while getopts ":m:gt" option; do
case "${option}" in
m)
if [ "${OPTARG}" == 'light' ]; then
theme="${THEME_LIGHT}"
elif [ "${OPTARG}" == 'dark' ]; then
theme="${THEME_DARK}"
else
if [ -z "${theme_name[${OPTARG}]}" ]; then
>&2 printf "Error: Invalid mode: '%s'.\nShould be either 'light' or 'dark'\n" "${option}"
exit 1
fi
theme="${theme_name[${OPTARG}]}"
;;
g)
current_state="$(cat "${STATE_FILE}")"
@ -58,6 +72,22 @@ while getopts ":m:g" option; do
"${gsettings_alt[${current_state}]}" "${next_state}" "${percentage:=0}" "${class:="none"}"
exit 0
;;
t)
if ! [ "$(command -v sunwait)" ]; then
>&2 printf "Error: sunwait command not found. Please install sunwait or do not use the -t option.\n"
exit 1
fi
current_time="$(sunwait poll "${LATITUDE}" "${LONGITUDE}")"
if [ -z "${current_time}" ] || [ -z "${theme_time[${current_time}]}" ]; then
>&2 printf "Error: Invalid time returned by sunwait: '%s'.\nInspect the script for more details.\n" "${current_time}"
exit 1
fi
theme="${theme_time[${current_time}]}"
printf "Setting theme based on time of day: %s -> %s\n" "${current_time}" "${theme}"
;;
*)
>&2 printf "Error: Invalid option: '%s'.\n" "${option}"
exit 1
@ -67,16 +97,26 @@ done
shift $(( OPTIND - 1 ))
# Check if the state file exists
if ! [ -d "$(dirname ${STATE_FILE})" ]; then
mkdir -p "$(dirname ${STATE_FILE})"
if ! [ -d "$(dirname "${STATE_FILE}")" ]; then
mkdir -p "$(dirname "${STATE_FILE}")"
fi
# Choose next theme
previous_theme="$(cat ${STATE_FILE})"
if ! [[ -z "${previous_theme}" || "${theme}" ]]; then
theme="${theme_next[${previous_theme}]}"
# Determine the theme to set
if [ -z "${theme}" ]; then
# Read from state file
if [ -f "${STATE_FILE}" ]; then
previous_theme="$(cat "${STATE_FILE}")"
fi
if [ -n "${previous_theme}" ]; then
theme="${theme_next[${previous_theme}]}"
else
theme="${THEME_DEFAULT}"
fi
fi
echo "${theme:=${THEME_DEFAULT}}" > "${STATE_FILE}"
# Store the new theme in the state file
echo "${theme}" > "${STATE_FILE}"
######################
### Set all themes ###

View file

@ -1,52 +0,0 @@
#!/usr/bin/env bash
# Script to disable for an hour or immediately continue wlsunset. 'Toggle'
# Queue for at, check man page for options
ATQUEUE='T'
# Get current state
pid=$(pgrep wlsunset)
while getopts ":g" option; do
case "${option}" in
g)
if [[ -z "${pid}" ]]; then
state='active'
tooltip='Turn off nightlight'
class='activated'
else
state='inactive'
tooltip='Turn on nightlight'
class='none'
fi
printf '{"alt": "%s", "tooltip": "%s", "class": "%s" }' \
"${state}" "${tooltip}" "${class}"
exit 0
;;
*)
echo 'Invalid option'
exit 1
;;
esac
done
# Toggle
if [[ -z ${pid} ]] ; then
# Clear queue
for job in $(at -l -q "${ATQUEUE}" | cut -f1); do
at -r "${job}"
done
if [ "$( command -v wlsunset )" ]; then
notify-send 'Starting nightlight'
wlsunset -l 50.50 -L 4.00 -t 3000 -T 6500 &
else
notify-send 'Nightlight is not available'
exit 1
fi
else
# Currently stop wlsunset but restart in an hour.
kill ${pid}
notify-send 'Stopping nightlight' 'Restarting in an hour'
at now +1 hours -f "${0}" -q "${ATQUEUE}"
fi

View file

@ -23,9 +23,6 @@
[init]
defaultBranch = "main"
[rebase]
autoSquash = "true"
[safe]
directory = "/home/tdpeuter/university/sshfs"

View file

@ -1,9 +1,6 @@
#
# ~/.config/hypr/hy3.conf
#
# Load the plugin. File should contain `plugin = /path/to/lib/libhy3.so`
source = /home/tdpeuter/.config/hypr/hy3-plugin.conf
# TODO Do not hardcode this path
plugin = /nix/store/afivj8v5kfdsadxs4pa45vh0y65s3ajm-hy3-hl0.49.0/lib/libhy3.so
general:layout = hy3

View file

@ -85,6 +85,9 @@ animations {
}
gestures {
workspace_swipe = true
workspace_swipe_fingers = 3
workspace_swipe_min_fingers = false
workspace_swipe_distance = 300
workspace_swipe_invert = true
workspace_swipe_min_speed_to_force = 30
@ -100,12 +103,6 @@ gestures {
workspace_swipe_forever = true
workspace_swipe_use_r = false
# hyprlang if !HYPRLAND_V_0_53
workspace_swipe = true
workspace_swipe_fingers = 3
workspace_swipe_min_fingers = false
# hyprlang endif
}
group {
@ -248,6 +245,8 @@ exec-once = waybar
# TODO Replace with something else?
exec-once = wlsunset -t 2500 -l 50.51 -L 4.21
# Set light/dark theme based on time
exec-once = bash ${SCRIPT_DIR}/toggle-light-dark.sh -t
exec-once = nextcloud --background
@ -261,10 +260,6 @@ env = XCURSOR_SIZE,24
# SHIFT CAPS CTRL/CONTROL ALT MOD2 MOD3 SUPER/WIN/LOGO/MOD4 MOD5
$flag = MOD4
$LMB = mouse:272
$RMB = mouse:273
$MMB = mouse:274
$left = h
$down = j
$up = k

View file

@ -56,10 +56,6 @@ bind = $flag+Shift, s, settiled
bind = $flag, F11, fullscreen, 1
bind = $flag+Shift, F11, fullscreen, 0
bindm = $flag, $LMB, movewindow
bindm = $flag, $RMB, resizewindow
bindc = $flag, $LMB, togglefloating
# Workspaces
$ws1 = 1

View file

@ -1,62 +1,3 @@
# Resizing
$mode_resize = Resize
bind = $flag, R, submap, $mode_resize
submap = $mode_resize
bind = , F, togglefloating
binde = , $right, resizeactive, 10 0
binde = , $up, resizeactive, 0 -10
binde = , $left, resizeactive, -10 0
binde = , $down, resizeactive, 0 10
binde = , Right , resizeactive, 10 0
binde = , Up, resizeactive, 0 -10
binde = , Left, resizeactive, -10 0
binde = , Down, resizeactive, 0 10
binde = Shift, $right, resizeactive, 50 0
binde = Shift, $up, resizeactive, 0 -50
binde = Shift, $left, resizeactive, -50 0
binde = Shift, $down, resizeactive, 0 50
binde = Shift, Right, resizeactive, 50 0
binde = Shift, Up, resizeactive, 0 -50
binde = Shift, Left, resizeactive, -50 0
binde = Shift, Down, resizeactive, 0 50
binde = $flag, $right, moveactive, 10 0
binde = $flag, $up, moveactive, 0 -10
binde = $flag, $left, moveactive, -10 0
binde = $flag, $down, moveactive, 0 10
binde = $flag, Right, moveactive, 10 0
binde = $flag, Up, moveactive, 0 -10
binde = $flag, Left, moveactive, -10 0
binde = $flag, Down, moveactive, 0 10
binde = $flag+Shift, $right, moveactive, 50 0
binde = $flag+Shift, $up, moveactive, 0 -50
binde = $flag+Shift, $left, moveactive, -50 0
binde = $flag+Shift, $down, moveactive, 0 50
binde = $flag+Shift, Right , moveactive, 50 0
binde = $flag+Shift, Up, moveactive, 0 -50
binde = $flag+Shift, Left, moveactive, -50 0
binde = $flag+Shift, Down, moveactive, 0 50
# hyprlang if HYPRLAND_V_0_53
#gesture = 3, swipe, move
#gesture = 4, swipe, resize
# hyprlang endif
bind = $flag, R, submap, reset
bind = , Escape, submap, reset
bind = , Return, submap, reset
submap = reset
# System actions
$mode_system = System (l)ock, (s)leep, (h)ibernate, (r)eboot, (Shift+s)hutdown
bind = Ctrl+Alt, Delete, submap, $mode_system
@ -95,11 +36,3 @@ bind = , Return, submap, reset
submap = reset
# Ignore (all) keybinds. Useful when working with Virtual Machines.
$mode_ignore=Ignore keybinds - Press Control+Alt+Insert to escape.
bind = Ctrl+Alt, Insert, submap, $mode_ignore
submap = $mode_ignore
bind = Ctrl+Alt, Insert, submap, reset
submap = reset

View file

@ -60,7 +60,7 @@ Host Gitea
Host Nextcloud
User administrator
Hostname 192.168.0.23
Hostname 192.168.0.14
IdentitiesOnly yes
IdentityFile /run/secrets/HomeLab/Nextcloud/ssh

View file

@ -25,7 +25,8 @@ set smarttab
set tabstop=4
set title
set wildignore=*.docx,*.jpg,*.png,*.gif,*.pdf,*.pyc,*.exe,*.flv,*.img,*.xlsx
set wildmenu "" Show suggestions on another line instead of inplace
"" Show suggestions on another line instead of inplace
set wildmenu
syntax enable

View file

@ -23,17 +23,18 @@
],
"include": [
"~/.config/waybar/modules.json"
],
"start_hidden": true
]
},
/* Toggle this bar, contains all information */
{
"name": "toggle",
"mode": "hide",
"ipc": true,
"position": "top",
"height": 26,
/* Show this bar on top of the other one, seemingly replacing it. */
/*"margin": "-26px 0 0 0",*/
"margin": "-26px 0 0 0",
"modules-left": [
"custom/meta",
"sway/window",
@ -50,7 +51,6 @@
"privacy",
"tray",
"group/control-center",
"group/display",
"group/network",
"pulseaudio",
"group/power",
@ -58,7 +58,6 @@
],
"include": [
"~/.config/waybar/modules.json"
],
"reload_style_on_change": true
]
}
]

View file

@ -1,15 +1,4 @@
{
"backlight": {
"device": "intel_backlight",
"format": "{percent}% {icon}",
"format-icons": [
"\uf111", /* */
"\uf185" /* */
],
"on-click": "brightnessctl -sq set 0",
"on-click-right": "wl-mirror $(hyprctl monitors -j | jq --raw-output '.[] | select(.focused) | .name')"
},
"battery": {
"format": "{capacity}% {icon}",
"format-alt": "{time} {icon}",
@ -82,12 +71,6 @@
"tooltip": false
},
"custom/display": {
"format": "\ue163", /* */
"tooltip": false,
"on-click": "wdisplays"
},
"custom/meta": {
"format": "\uf17c", /* */
"tooltip": false,
@ -151,19 +134,6 @@
"tooltip": true
},
"custom/toggle-nightlight": {
"exec": "bash ${SCRIPT_DIR}/toggle-nightlight.sh -g",
"interval": 60,
"return-type": "json",
"on-click": "bash ${SCRIPT_DIR}/toggle-nightlight.sh",
"format": "{icon}",
"format-icons": {
"active": "\uf186", /* */
"inactive": "\uf0eb" /* */
},
"tooltip": true
},
"custom/toggle-notifications": {
"exec": "bash ${SCRIPT_DIR}/toggle-notifications.sh -g",
"interval": 60,
@ -193,31 +163,12 @@
"group/control-center": {
"orientation": "inherit",
"modules": [
/* Preview */
"custom/control-center",
/* Left-most */
"group/language",
"custom/toggle-notifications"
/* Right-most */
],
"drawer": {
"transition-duration": 500,
"transition-left-to-right": false,
"children-class": "drawer-child"
}
},
"group/display": {
"orientation": "inherit",
"modules": [
/* Preview */
"custom/display",
/* Most-left */
"idle_inhibitor",
"custom/toggle-nightlight",
/* "hyprland/language", "sway/language", */
"custom/toggle-notifications",
"custom/toggle-light-dark",
"backlight"
/* Most-right */
"bluetooth"
],
"drawer": {
"transition-duration": 500,
@ -248,7 +199,6 @@
/* Preview */
"network",
/* Most-left */
"bluetooth",
"custom/toggle-tailscale"
/* Most-right */
],
@ -270,7 +220,8 @@
"custom/system-hibernate",
"custom/system-sleep",
"custom/system-lock",
"power-profiles-daemon"
"power-profiles-daemon",
"idle_inhibitor"
/* Most-right */
],
"drawer": {

View file

@ -82,13 +82,12 @@ window#waybar {
#privacy,
#privacy-item,
#privacy-item.screenshare,
#privacy-item.audio-in,
#privacy-item.audio-out {
#privacy-item.audio-in {
background-color: @safety;
}
#privacy-item {
padding: 0;
#privacy-item.screenshare {
background-color: #000000;
}
#pulseaudio.muted {