diff --git a/extras/dev.nix b/extras/dev.nix index 6375556..586b22b 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -4,9 +4,10 @@ ... }: { environment.systemPackages = with pkgs; [ + lua-language-server # freecad # vulkan-loader - etcher + # etcher hyperfine jq just @@ -57,10 +58,10 @@ trunk ]; - nixpkgs.config.permittedInsecurePackages = [ - # etcher - "electron-19.1.9" - ]; + # nixpkgs.config.permittedInsecurePackages = [ + # # etcher + # "electron-19.1.9" + # ]; services.udev.extraRules = '' SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic GDB Server", SYMLINK+="ttyBmpGdb" diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index 60ee9ee..05d8699 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -29,9 +29,9 @@ # wayland chromium workaround NIXOS_OZONE_WL = "1"; - # # firefox nvidia-vaapi-driver - # # MOZ_DISABLE_RDD_SANDBOX = "1"; - # # LIBVA_DRIVER_NAME = "nvidia"; + # firefox nvidia-vaapi-driver + # MOZ_DISABLE_RDD_SANDBOX = "1"; + # LIBVA_DRIVER_NAME = "nvidia"; }; fileSystems."/home" = { @@ -99,6 +99,7 @@ modesetting.enable = true; powerManagement.enable = true; # options: production, beta, vulkan_beta, latest + # package = pkgs.linuxPackages_latest.nvidiaPackages.latest; package = pkgs.linuxPackages_zen.nvidiaPackages.latest; open = true; }; diff --git a/users/tao.nix b/users/tao.nix index 7a71c34..e879b75 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -64,6 +64,7 @@ snapper starship syncthingtray + taskwarrior thunderbird typst typst-fmt @@ -145,5 +146,5 @@ home-manager.useGlobalPkgs = true; home-manager.verbose = true; home-manager.backupFileExtension = ".hm-bak"; - home-manager.users.tao = import ./tao/home.nix {inherit inputs pkgs;}; + home-manager.users.tao = import ./tao/HOME.nix {inherit inputs pkgs;}; } diff --git a/users/tao/home.nix b/users/tao/HOME.nix similarity index 86% rename from users/tao/home.nix rename to users/tao/HOME.nix index 3cda13c..39f05f0 100644 --- a/users/tao/home.nix +++ b/users/tao/HOME.nix @@ -31,8 +31,9 @@ nushell = { enable = true; - configFile.source = ./config.nu; - envFile.source = ./env.nu; + configFile.source = ./nushell/config.nu; + envFile.source = ./nushell/env.nu; + extraConfig = builtins.readFile ./nushell/stuff.nu; }; starship = { @@ -41,6 +42,10 @@ settings = builtins.fromTOML (builtins.readFile ./starship.toml); }; + taskwarrior = { + enable = true; + }; + wezterm = { enable = true; extraConfig = builtins.readFile ./wezterm.lua; diff --git a/users/tao/config.nu b/users/tao/nushell/config.nu similarity index 98% rename from users/tao/config.nu rename to users/tao/nushell/config.nu index 3ace368..2017b7c 100644 --- a/users/tao/config.nu +++ b/users/tao/nushell/config.nu @@ -1,15 +1,3 @@ -alias zl = zellij -alias ts = tailscale -alias tss = tailscale status -alias tsx = tailscale exit-node list -alias fetch = macchina -alias cringe = sudo bootctl set-oneshot auto-windows -alias rebs = sudo nixos-rebuild switch --flake ~/Projects/NOflake/ -alias rebb = sudo nixos-rebuild boot --flake ~/Projects/NOflake/ -alias gc = sudo nix-collect-garbage -d -alias ff = firefox -alias pu = pueue - # Nushell Config File # # version = 0.83.1 @@ -740,6 +728,3 @@ $env.config = { ] } -source ~/.zoxide.nu -source ~/.cache/starship/init.nu - diff --git a/users/tao/env.nu b/users/tao/nushell/env.nu similarity index 100% rename from users/tao/env.nu rename to users/tao/nushell/env.nu diff --git a/users/tao/nushell/stuff.nu b/users/tao/nushell/stuff.nu new file mode 100644 index 0000000..05d699d --- /dev/null +++ b/users/tao/nushell/stuff.nu @@ -0,0 +1,15 @@ +source ~/.cache/starship/init.nu +source ~/.zoxide.nu +alias cringe = sudo bootctl set-oneshot auto-windows +alias fetch = macchina +alias ff = firefox +alias gc = sudo nix-collect-garbage -d +alias pu = pueue +alias rb = sudo nixos-rebuild boot --flake ~/Projects/NOflake/ +alias rs = sudo nixos-rebuild switch --flake ~/Projects/NOflake/ +alias t = task +alias ts = tailscale +alias tss = tailscale status +alias tsx = tailscale exit-node list +alias zl = zellij +task diff --git a/users/tao/wezterm.lua b/users/tao/wezterm.lua index a3ce5cb..5e1fec1 100644 --- a/users/tao/wezterm.lua +++ b/users/tao/wezterm.lua @@ -1,8 +1,9 @@ -return { +local wezterm = require 'wezterm'; +local config = { font = wezterm.font 'FiraCode Nerd Font', color_scheme = "Dracula", warn_about_missing_glyphs = true, check_for_updates = false, - hide_tab_bar_if_only_one_tab = true, } +return config