From cffa274b7b5376330febf9aaa087aea07e4fe81d Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Tue, 27 Feb 2024 10:26:58 -0800 Subject: [PATCH] cleanup --- extras/dev.nix | 2 +- systems/BASED.nix | 1 + systems/NOcomputer.nix | 15 ++++++++------- systems/NOlaptop.nix | 18 ++++++++---------- users/tao.nix | 24 ++++++++++++------------ users/tao/config.nu | 8 +++++++- users/tao/helix.nix | 4 ++-- 7 files changed, 39 insertions(+), 33 deletions(-) diff --git a/extras/dev.nix b/extras/dev.nix index b52fb4a..712d42e 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -6,7 +6,7 @@ environment.systemPackages = with pkgs; [ # freecad # vulkan-loader - # etcher + etcher hyperfine inputs.helix.packages.${pkgs.system}.default jq diff --git a/systems/BASED.nix b/systems/BASED.nix index d9b8bd0..f2ac23c 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -90,6 +90,7 @@ alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; + wireplumber.enable = lib.mkDefault true; }; security.sudo-rs.enable = true; diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index e0340b6..470604a 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -6,6 +6,7 @@ environment.systemPackages = with pkgs; [ # egl-wayland + # gpt4all-chat # nvidia-vaapi-driver foldingathome gwe @@ -23,14 +24,14 @@ extraArgs = ["--passkey=76ba03d55acf116776ba03d55acf1167"]; }; - environment.sessionVariables = { - # wayland chromium workaround - NIXOS_OZONE_WL = "1"; + # environment.sessionVariables = { + # # 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" = { device = "/dev/disk/by-uuid/eb9fcce2-e9f3-438a-b5ce-8f72f32f0e09"; diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index 62c1812..9e79b91 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -25,19 +25,12 @@ swapDevices = [{device = "/dev/disk/by-uuid/ca55d0ea-c0db-44c5-af3a-e38eec803929";}]; + # services.fstrim.enable = true; services.fprintd.enable = true; services.fwupd.enable = true; - # services.fstrim.enable = true; powerManagement.powertop.enable = true; hardware.sensor.iio.enable = true; - # hardware.sane = { - # enable = true; - # extraBackends = [ pkgs.epkowa ]; - # }; - - services.xserver.displayManager.defaultSession = "plasmawayland"; - # systemd.user.services.backlight = { # # description = ""; # ExecStart = "${pkgs.prescurve}/bin/prescurve_backlight"; @@ -45,6 +38,13 @@ # wantedBy = [ "default.target" ]; # }; + services.xserver.displayManager.defaultSession = "plasmawayland"; + + # hardware.sane = { + # enable = true; + # extraBackends = [ pkgs.epkowa ]; + # }; + services.udev.extraRules = '' # Ethernet expansion card ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20" @@ -75,7 +75,5 @@ # boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; # boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = "1"; - services.pipewire.wireplumber.enable = true; - networking.hostName = "NOlaptop"; } diff --git a/users/tao.nix b/users/tao.nix index 5e97f65..5a4ce79 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -11,16 +11,21 @@ # expressvpn # fractal # gh + # joshuto # libftdi # libusb - # mdbook # mendeley # nuspell # ocs-url # oculante + # ollama + # onefetch # partition-manager # slack + # tectonic + # texlab # tio + # toastify # vial # wkhtmltopdf # yazi @@ -32,23 +37,20 @@ darktable deluge discord - gpt4all-chat jellyfin-media-player jellyfin-mpv-shim - joshuto keepassxc leetcode-cli libsForQt5.kcharselect libsForQt5.kdeconnect-kde + libsForQt5.plasma-integration libsForQt5.plasma-vault miniserve nushell obs-studio - # ollama - onefetch onlyoffice-bin pandoc - plasma-integration + pipe-rename prusa-slicer pueue qmk @@ -57,8 +59,6 @@ snapper starship syncthingtray - tectonic - texlab thunderbird typst typst-fmt @@ -85,10 +85,10 @@ }; hardware.keyboard.qmk.enable = true; - services.udev.extraRules = '' - KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl" - KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl" - ''; + # services.udev.extraRules = '' + # KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl" + # KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl" + # ''; # obs virtual camera boot.extraModulePackages = with config.boot.kernelPackages; [ diff --git a/users/tao/config.nu b/users/tao/config.nu index 8ee7e0d..3ace368 100644 --- a/users/tao/config.nu +++ b/users/tao/config.nu @@ -218,7 +218,13 @@ $env.config = { env_change: { PWD: [{|before, after| null }] # run if the PWD environment is different since the last repl input } - display_output: { table } # run before the output of a command is drawn, example: `{ if (term size).columns >= 100 { table -e } else { table } }` + display_output: { + if (term size).columns >= 80 { + table -e + } else { + table + } + } command_not_found: { null } # return an error message when a command is not found } diff --git a/users/tao/helix.nix b/users/tao/helix.nix index fd21186..265e766 100644 --- a/users/tao/helix.nix +++ b/users/tao/helix.nix @@ -35,8 +35,8 @@ j = "move_line_up"; }; keys.select = { - k = "move_line_down"; - j = "move_line_up"; + k = "extend_line_down"; + j = "extend_line_up"; }; }; languages = {