From a2929f7dfa9819405c8b65c11892ae841521c23f Mon Sep 17 00:00:00 2001 From: Lily Anderson Date: Wed, 15 Oct 2025 10:59:36 -0500 Subject: [PATCH] System snapshots and window manager configs --- hosts/desktop/snapshot.nix | 18 ++++ modules/home/hyprland.nix | 9 +- modules/home/river.nix | 145 ++++++++++++++++++++++++++++ modules/nixos/desktops/hyprland.nix | 9 +- modules/nixos/desktops/river.nix | 15 +++ modules/nixos/desktops/wm_apps.nix | 13 +++ 6 files changed, 200 insertions(+), 9 deletions(-) create mode 100644 hosts/desktop/snapshot.nix create mode 100644 modules/home/river.nix create mode 100644 modules/nixos/desktops/river.nix create mode 100644 modules/nixos/desktops/wm_apps.nix diff --git a/hosts/desktop/snapshot.nix b/hosts/desktop/snapshot.nix new file mode 100644 index 0000000..e83a0a0 --- /dev/null +++ b/hosts/desktop/snapshot.nix @@ -0,0 +1,18 @@ +{ config, pkgs, inputs, ... }: +{ + services.btrbk = { + instances."local_snapshots" = { + onCalendar = "hourly"; + settings = { + snapshot_preserve = "14d 8w 120m"; + snapshot_preserve_min = "7d"; + volume = { + "/media/2tb" = { + snapshot_dir = "/media/2tb/@snapshots"; + subvolume = "@home"; + }; + }; + }; + }; + }; +} diff --git a/modules/home/hyprland.nix b/modules/home/hyprland.nix index e3eef3f..bb660a4 100644 --- a/modules/home/hyprland.nix +++ b/modules/home/hyprland.nix @@ -1,13 +1,18 @@ { pkgs, lib, ... }: let startupScript = pkgs.pkgs.writeShellScriptBin "start" '' -${pkgs.waybar}/bin/waybar & +#${pkgs.quickshell}/bin/quickshell & ${pkgs.swww}/bin/swww init & sleep 1 ''; in { +# home.file = { +# ".config/quickshell/shell.qml".source = quickshell/shell.qml; +# }; + + wayland.windowManager.hyprland = { enable = true; @@ -27,6 +32,7 @@ in "$mod" = "SUPER"; "$terminal" = "alacritty"; "$browser" = "firefox"; + "$menu" = "rofi -show drun"; general = { gaps_in = 5; @@ -56,6 +62,7 @@ in "$mod, right, movefocus, r" "$mod, up, movefocus, u" "$mod, down, movefocus, d" + "$mod, F, fullscreen" "$mod, 1, workspace, 1" "$mod, 2, workspace, 2" diff --git a/modules/home/river.nix b/modules/home/river.nix new file mode 100644 index 0000000..41bc5ea --- /dev/null +++ b/modules/home/river.nix @@ -0,0 +1,145 @@ +{ pkgs, lib, ... }: +{ + wayland.windowManager.river = { + enable = true; + settings = { + map = { + normal = { + /* Manage Session and Windows */ + "Super Q" = "close"; + "Super+Shift Q" = "exit"; + "Super J" = "focus-view next"; + "Super K" = "focus-view previous"; + "Super+Shift J" = "swap next"; + "Super+Shift K" = "swap previous"; + "Super H" = "send-layout-cmd rivertile \"main-ratio -0.05\""; + "Super L" = "send-layout-cmd rivertile \"main-ratio +0.05\""; + "Super+Shift H" = "send-layout-cmd rivertile \"main-count +1\""; + "Super+Shift L" = "send-layout-cmd rivertile \"main-count -1\""; + + "Super Period" = "focus-output next"; + "Super Comma" = "focus-output previous"; + + "Super+Shift Period" = "send-to-output next"; + "Super+Shift Comma" = "send-to-output previous"; + + "Super+Alt H" = "move left 100"; + "Super+Alt J" = "move down 100"; + "Super+Alt K" = "move up 100"; + "Super+Alt L" = "move right 100"; + + "Super+Alt+Control H" = "snap left"; + "Super+Alt+Control J" = "snap down"; + "Super+Alt+Control K" = "snap up"; + "Super+Alt+Control L" = "snap right"; + + "Super+Alt+Shift H" = "resize horizontal -100"; + "Super+Alt+Shift J" = "resize vertical 100"; + "Super+Alt+Shift K" = "resize vertical -100"; + "Super+Alt+Shift L" = "resize horizontal 100"; + + + "Super Return" = "spawn alacritty"; + "Super W" = "spawn firefox"; + "Super R" = "spawn \"rofi -show drun\""; + }; + }; + }; + extraConfig = '' +# See the river(1), riverctl(1), and rivertile(1) man pages for complete + +# Super + Left Mouse Button to move views +riverctl map-pointer normal Super BTN_LEFT move-view + +# Super + Right Mouse Button to resize views +riverctl map-pointer normal Super BTN_RIGHT resize-view + +# Super + Middle Mouse Button to toggle float +riverctl map-pointer normal Super BTN_MIDDLE toggle-float + +for i in $(seq 1 9) +do + tags=$((1 << ($i - 1))) + + # Super+[1-9] to focus tag [0-8] + riverctl map normal Super $i set-focused-tags $tags + + # Super+Shift+[1-9] to tag focused view with tag [0-8] + riverctl map normal Super+Shift $i set-view-tags $tags + + # Super+Control+[1-9] to toggle focus of tag [0-8] + riverctl map normal Super+Control $i toggle-focused-tags $tags + + # Super+Shift+Control+[1-9] to toggle tag [0-8] of focused view + riverctl map normal Super+Shift+Control $i toggle-view-tags $tags +done + +# Super+0 to focus all tags +# Super+Shift+0 to tag focused view with all tags +all_tags=$(((1 << 32) - 1)) +riverctl map normal Super 0 set-focused-tags $all_tags +riverctl map normal Super+Shift 0 set-view-tags $all_tags + +# Super+Space to toggle float +riverctl map normal Super Space toggle-float + +# Super+F to toggle fullscreen +riverctl map normal Super F toggle-fullscreen + +# Super+{Up,Right,Down,Left} to change layout orientation +riverctl map normal Super Up send-layout-cmd rivertile "main-location top" +riverctl map normal Super Right send-layout-cmd rivertile "main-location right" +riverctl map normal Super Down send-layout-cmd rivertile "main-location bottom" +riverctl map normal Super Left send-layout-cmd rivertile "main-location left" + +# Declare a passthrough mode. This mode has only a single mapping to return to +# normal mode. This makes it useful for testing a nested wayland compositor +riverctl declare-mode passthrough + +# Super+F11 to enter passthrough mode +riverctl map normal Super F11 enter-mode passthrough + +# Super+F11 to return to normal mode +riverctl map passthrough Super F11 enter-mode normal + +# Various media key mapping examples for both normal and locked mode which do +# not have a modifier +for mode in normal locked +do + # Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer) + riverctl map $mode None XF86AudioRaiseVolume spawn 'pamixer -i 5' + riverctl map $mode None XF86AudioLowerVolume spawn 'pamixer -d 5' + riverctl map $mode None XF86AudioMute spawn 'pamixer --toggle-mute' + + # Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl) + riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause' + riverctl map $mode None XF86AudioPlay spawn 'playerctl play-pause' + riverctl map $mode None XF86AudioPrev spawn 'playerctl previous' + riverctl map $mode None XF86AudioNext spawn 'playerctl next' + + # Control screen backlight brightness with brightnessctl (https://github.com/Hummer12007/brightnessctl) + riverctl map $mode None XF86MonBrightnessUp spawn 'brightnessctl set +5%' + riverctl map $mode None XF86MonBrightnessDown spawn 'brightnessctl set 5%-' +done + +# Set background and border color +riverctl background-color 0x002b36 +riverctl border-color-focused 0x93a1a1 +riverctl border-color-unfocused 0x586e75 + +# Set keyboard repeat rate +riverctl set-repeat 50 300 + +# Make all views with an app-id that starts with "float" and title "foo" start floating. +riverctl rule-add -app-id 'float*' -title 'foo' float + +# Make all views with app-id "bar" and any title use client-side decorations +riverctl rule-add -app-id "bar" csd + +# Set the default layout generator to be rivertile and start it. +# River will send the process group of the init executable SIGTERM on exit. +riverctl default-layout rivertile +rivertile -view-padding 6 -outer-padding 6 & +''; + }; +} diff --git a/modules/nixos/desktops/hyprland.nix b/modules/nixos/desktops/hyprland.nix index 860efb1..b65aada 100644 --- a/modules/nixos/desktops/hyprland.nix +++ b/modules/nixos/desktops/hyprland.nix @@ -1,13 +1,6 @@ { config, pkgs, inputs, ... }: { - imports = [ ]; + imports = [ ./wm_apps.nix ]; programs.hyprland.enable = true; - -#Packages - environment.systemPackages = with pkgs; [ - alacritty - - font-awesome - ]; } diff --git a/modules/nixos/desktops/river.nix b/modules/nixos/desktops/river.nix new file mode 100644 index 0000000..fce1abc --- /dev/null +++ b/modules/nixos/desktops/river.nix @@ -0,0 +1,15 @@ +{ config, pkgs, inputs, ... }: +{ + imports = [ ./wm_apps.nix ]; + + programs.river-classic.enable = true; + +#Packages + environment.systemPackages = with pkgs; [ + alacritty + font-awesome + libnotify + dunst + rofi + ]; +} diff --git a/modules/nixos/desktops/wm_apps.nix b/modules/nixos/desktops/wm_apps.nix new file mode 100644 index 0000000..e81582a --- /dev/null +++ b/modules/nixos/desktops/wm_apps.nix @@ -0,0 +1,13 @@ +{ config, pkgs, inputs, ... }: +{ + imports = [ ]; + +#Packages + environment.systemPackages = with pkgs; [ + alacritty + font-awesome + libnotify + dunst + rofi + ]; +}