diff --git a/extras/dev.nix b/extras/dev.nix index 64f7533..2ee6a33 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -37,16 +37,17 @@ gdb gnumake - # java (DSA) - gradle - jdt-language-server - jetbrains.idea-community - temurin-bin-17 + # # java (DSA) + # gradle + # jdt-language-server + # jetbrains.idea-community + # maven + # temurin-bin-17 - # michael (webdev) - nodejs - vscode-langservers-extracted - nodePackages_latest.typescript-language-server + # # michael (webdev) + # nodejs + # vscode-langservers-extracted + # nodePackages_latest.typescript-language-server # nix nil diff --git a/systems/BASED.nix b/systems/BASED.nix index 990423f..f160ff4 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -121,8 +121,6 @@ time.timeZone = lib.mkDefault "US/Pacific"; # services.automatic-timezoned.enable = lib.mkDefault true; - # i18n.defaultLocale = "en_US.utf8"; - # i18n.supportedLocales = ["all"]; # i18n.extraLocaleSettings = { # LC_CTYPE = "en_US.UTF-8"; # LC_MESSAGES = "en_US.UTF-8"; diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index 6d619ab..b773ceb 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -4,16 +4,16 @@ pkgs, ... }: { - boot.kernelPatches = [ - (lib.mkIf (lib.versionOlder pkgs.linuxPackages_latest.kernel.version "6.9") - { - name = "cros_ec_lpc"; - patch = pkgs.fetchpatch { - url = "https://patchwork.kernel.org/series/840830/mbox/"; - sha256 = "sha256-7jSEAGInFC+a+ozCyD4dFz3Qgh2JrHskwz7UfswizFw="; - }; - }) - ]; + # boot.kernelPatches = [ + # (lib.mkIf (lib.versionOlder pkgs.linuxPackages_latest.kernel.version "6.9") + # { + # name = "cros_ec_lpc"; + # patch = pkgs.fetchpatch { + # url = "https://patchwork.kernel.org/series/840830/mbox/"; + # sha256 = "sha256-7jSEAGInFC+a+ozCyD4dFz3Qgh2JrHskwz7UfswizFw="; + # }; + # }) + # ]; # nixpkgs.overlays = [ # (final: prev: { # libinput = prev.libinput.overrideAttrs (old: { diff --git a/users/tao/HOME.nix b/users/tao/HOME.nix index 389fbb4..167fc25 100644 --- a/users/tao/HOME.nix +++ b/users/tao/HOME.nix @@ -24,9 +24,17 @@ in { }; programs = { + bat = { + enable = true; + config = { + theme = "gruvbox-dark"; + }; + }; + bottom = { enable = true; settings = { + color = "gruvbox"; flags = { battery = if lib.strings.hasPrefix "NOlaptop" (builtins.readFile /etc/hostname) diff --git a/users/tao/nushell/stuff.nu b/users/tao/nushell/stuff.nu index dfaedbc..74a93c1 100644 --- a/users/tao/nushell/stuff.nu +++ b/users/tao/nushell/stuff.nu @@ -19,7 +19,7 @@ def l [ path: path = "." ] { ls $path - | sort-by type name -i + | sort-by type name -i -n } @@ -89,6 +89,8 @@ def tsr [] { } alias ts = tailscale alias tss = tailscale status +alias tsu = tailscale up +alias tsd = tailscale down alias tsx = tailscale exit-node list