diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index 5d1b70a..ec40274 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -6,7 +6,6 @@ # foldingathome gwe openrgb - snapper ]; services.tailscale.useRoutingFeatures = "both"; diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index 6199e26..c70bf6a 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -39,18 +39,6 @@ MatchName=Framework Laptop 16 Keyboard Module* AttrKeyboardIntegration=internal"; }; - services.snapper.configs = { - home = { - SUBVOLUME = "/home"; - ALLOW_USERS = ["tao"]; - TIMELINE_CREATE = true; - TIMELINE_CLEANUP = true; - TIMELINE_LIMIT_HOURLY = "5"; - TIMELINE_LIMIT_DAILY = "7"; - }; - }; - services.snapper.snapshotInterval = "*:0/5"; - services.displayManager.defaultSession = "plasma"; nix.buildMachines = [ diff --git a/users/tao.nix b/users/tao.nix index 9633215..1a99b6f 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -115,6 +115,18 @@ }; }; + services.snapper.configs = { + home = { + SUBVOLUME = "/home"; + ALLOW_USERS = ["tao"]; + TIMELINE_CREATE = true; + TIMELINE_CLEANUP = true; + TIMELINE_LIMIT_HOURLY = "5"; + TIMELINE_LIMIT_DAILY = "7"; + }; + }; + services.snapper.snapshotInterval = "*:0/5"; + hardware.keyboard.qmk.enable = true; services.udev.extraRules = '' KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl" diff --git a/users/tao/helix.nix b/users/tao/helix.nix index 860e648..92aa92e 100644 --- a/users/tao/helix.nix +++ b/users/tao/helix.nix @@ -54,6 +54,7 @@ language = [ { name = "arduino"; + grammar = "arduino"; scope = "source.arduino"; injection-regex = "arduino"; file-types = ["ino" "cpp" "h"]; @@ -67,7 +68,7 @@ auto-format = true; formatter = { command = "clang-format"; - args = ["--style=file:/home/tao/Templates/clang-format"]; + args = ["--style=file:/home/tao/templates/clang-format"]; }; } { @@ -75,7 +76,7 @@ auto-format = true; formatter = { command = "clang-format"; - args = ["--style=file:/home/tao/Templates/clang-format"]; + args = ["--style=file:/home/tao/templates/clang-format"]; }; indent = { tab-width = 8; @@ -87,7 +88,7 @@ auto-format = true; formatter = { command = "clang-format"; - args = ["--style=file:/home/tao/Templates/clang-format"]; + args = ["--style=file:/home/tao/templates/clang-format"]; }; indent = { tab-width = 8; diff --git a/users/tao/nushell/stuff.nu b/users/tao/nushell/stuff.nu index 99a0767..58c8b74 100644 --- a/users/tao/nushell/stuff.nu +++ b/users/tao/nushell/stuff.nu @@ -13,7 +13,7 @@ def l [ path? flags? ] { - if $path { + if $path != null { ls $path } else { ls @@ -21,7 +21,7 @@ def l [ } def tse [exit_node?] { - if exit_node { + if $exit_node != null { tailscale set --exit-node $exit_node } else { tailscale set --exit-node="" @@ -34,7 +34,7 @@ def rb [] { } def rs [] { - sudo nice -n19 nixos-rebuild boot --flake . --impure --verbose + sudo nice -n19 nixos-rebuild switch --flake . --impure --verbose hx --grammar fetch; hx --grammar build } diff --git a/users/vy.nix b/users/vy.nix index 93aae1f..3ce9f53 100644 --- a/users/vy.nix +++ b/users/vy.nix @@ -18,7 +18,19 @@ ]; services.flatpak.enable = true; - + + services.snapper.configs = { + home = { + SUBVOLUME = "/home"; + ALLOW_USERS = ["vy"]; + TIMELINE_CREATE = true; + TIMELINE_CLEANUP = true; + TIMELINE_LIMIT_HOURLY = "5"; + TIMELINE_LIMIT_DAILY = "7"; + }; + }; + services.snapper.snapshotInterval = "*:0/5"; + users.users.vy = { isNormalUser = true; extraGroups = ["wheel" "audio" "video"];