diff --git a/common.nix b/common.nix index d109206..921f0a7 100644 --- a/common.nix +++ b/common.nix @@ -153,6 +153,9 @@ with builtins; { users.users.jade = { isNormalUser = true; extraGroups = ["wheel" "input" "uinput" "libvirtd" "adbusers" "dialout" "plugdev" "wireshark"]; + packages = [ + pkgs.marksman + ]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOaE8TFsIazpn4OnHvHcRpOFr9FfvMaWOiEjmHsmnAoE cardno:000F_70CD7D05" ]; diff --git a/justfile b/justfile index 0c3044a..0e2ed0b 100644 --- a/justfile +++ b/justfile @@ -4,7 +4,7 @@ test: sudo nixos-rebuild test --flake . --impure build: - sudo nixos-rebuild switch --flake . --impure --fast + sudo nixos-rebuild switch --flake . --impure update: nix flake update --commit-lock-file diff --git a/modules/default.nix b/modules/default.nix index ebb1252..4a225f4 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{...}: { imports = [ ./shell ./desktop @@ -7,17 +7,4 @@ ./firewall.nix ./git.nix ]; - - services.kmscon = { - enable = true; - fonts = [ - { - name = "FiraCode Nerd Font"; - package = pkgs.nerdfonts.override {fonts = ["FiraCode"];}; - } - ]; - extraConfig = "font-size=14"; - extraOptions = "--term xterm-256color"; - hwRender = true; - }; } diff --git a/other/config.nu b/other/config.nu index c590b75..cda795c 100644 --- a/other/config.nu +++ b/other/config.nu @@ -782,9 +782,9 @@ def start_zellij [] { start_zellij def nsp [ - ...programs: string + program: string ] { - nix shell ...($programs | each {|it| $"nixpkgs#($it)" }) + nix shell $"nixpkgs#$program" } def lcr [ @@ -806,17 +806,6 @@ def glog [ | split column "»¦«" commit subject name email date } -def ed [ - file: path - ...cmdargs: string -] { - let ext = $file | path parse | get extension; - match $ext { - "typ" => {|| zellij run --direction down -- typst watch $file --open ($cmdargs | str join ' ') } - }; - hx $file -} - alias gnix = cd ~/nix-configs; alias grepo = cd ~/Documents/repos; alias wh = wormhole-rs;