diff options
| -rw-r--r-- | hardware-configuration.nix | 4 | ||||
| -rw-r--r-- | home.nix | 10 | ||||
| -rw-r--r-- | modules/trackpad.nix | 7 | ||||
| -rw-r--r-- | overlays.nix | 12 | ||||
| -rw-r--r-- | platforms/linux/configuration.nix | 17 | ||||
| -rw-r--r-- | programs/newsboat/urls | 2 |
6 files changed, 39 insertions, 13 deletions
diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 84eb8cd..3b34522 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -12,8 +12,8 @@ boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.kernelModules = [ "kvm-intel" "tp_smapi" ]; + boot.extraModulePackages = with config.boot.kernelPackages; [ tp_smapi ]; fileSystems."/" = { device = "/dev/disk/by-uuid/e00c989b-b3fd-469e-b894-ea609fb4d7fa"; diff --git a/home.nix b/home.nix index 985e801..9055b0f 100644 --- a/home.nix +++ b/home.nix @@ -21,6 +21,10 @@ let ./platforms/linux # ./programs/rclone.nix ]; + + music = pkgs.nur.repos.pn.larbs-music.override { + musicDir = "~/music"; + }; in { # Errors on linux @@ -56,7 +60,7 @@ in pnvim (lowPrio nur.repos.pn.larbs-mail) (lowPrio nur.repos.pn.larbs-news) - (lowPrio nur.repos.pn.larbs-music) + (lowPrio music) nur.repos.pn.larbs-scripts slop xlibs.xdpyinfo @@ -66,6 +70,10 @@ in nix-index fzf + # Handy tools + skanlite + imagemagick + # Misc zoom-us diff --git a/modules/trackpad.nix b/modules/trackpad.nix new file mode 100644 index 0000000..89e549a --- /dev/null +++ b/modules/trackpad.nix @@ -0,0 +1,7 @@ +{ + services.xserver.libinput = { + enable = true; + naturalScrolling = true; + additionalOptions = ''MatchIsTouchpad "on"''; + }; +} diff --git a/overlays.nix b/overlays.nix index bc2c426..c2c842e 100644 --- a/overlays.nix +++ b/overlays.nix @@ -13,12 +13,10 @@ }; }); - brave-beta = super.brave.overrideAttrs (oldAttrs: rec { - version = "1.18.57"; - src = super.fetchurl { - url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser-beta_${version}_amd64.deb"; - sha256 = "11v7j13ids7dw1lpcjc5cw18vk6x9jc6ylsd2na7cgmygwx0f3ms"; - }; - }); + brave17 = (import (builtins.fetchTarball { + url = "https://github.com/buckley310/nixpkgs/archive/brave.tar.gz"; + sha256 = "08m6w0d2z8n0wlvffgfaglyrydxw895z0hk7x2b41x44zkrc3zx5"; + }) { }).brave; + }) ] diff --git a/platforms/linux/configuration.nix b/platforms/linux/configuration.nix index c353c59..3ef93dd 100644 --- a/platforms/linux/configuration.nix +++ b/platforms/linux/configuration.nix @@ -39,6 +39,7 @@ in [ # Include the results of the hardware scan. # <home-manager>/nixos ../../modules/dockd.nix + ../../modules/trackpad.nix ../../hardware-configuration.nix ]; @@ -55,6 +56,7 @@ in boot.extraModulePackages = with pkgs.linuxPackages; [ v4l2loopback + acpi_call ]; boot.kernelModules = [ "v4l2loopback" ]; @@ -143,7 +145,7 @@ in # Basic tools stdenv wget vim curl htop dnsutils zip unzip zsh neovim ripgrep jq groff file pinentry_gnome - ssh-ident busybox_utils usbutils + ssh-ident busybox_utils # XORG perfs xorg.xorgserver xorg.xf86inputevdev xorg.xf86inputsynaptics xorg.xf86inputlibinput @@ -168,7 +170,7 @@ in quickserve ueberzug chafa # Thinkpad utils - nur.repos.pn.dockd + nur.repos.pn.dockd acpi tpacpi-bat wineStaging @@ -224,6 +226,9 @@ in # services.udev.packages = [ # pkgs.android-udev-rules # ]; + services.udev.packages = [ pkgs.libu2f-host ]; + + services.pcscd.enable = true; # Enable the OpenSSH daemon. # services.openssh.enable = true; @@ -245,6 +250,9 @@ in services.acpid.enable = true; + # Battery + services.tlp.enable = true; + # Enable sound. sound.enable = true; hardware.pulseaudio.enable = true; @@ -257,7 +265,10 @@ in # services.xserver.xkbOptions = "eurosign:e"; # Enable touchpad support. - services.xserver.libinput.enable = true; + services.xserver.libinput = { + enable = true; + accelSpeed = "0.8"; + }; # Enable the KDE Desktop Environment. #services.xserver.displayManager.sddm.enable = true; diff --git a/programs/newsboat/urls b/programs/newsboat/urls index 0449fcf..70a53f9 100644 --- a/programs/newsboat/urls +++ b/programs/newsboat/urls @@ -23,6 +23,8 @@ https://weekly.nixos.org/feeds/all.rss.xml "~NixOS Weekly" "tech" https://christine.website/blog.rss "~Christine Dodrill" "tech" https://portal.mozz.us/gemini/makeworld.gq/gemlog/atom.xml?raw=1 "~makeworld" "tech" https://portal.mozz.us/gemini/gemini.marmaladefoo.com/cgi-bin/atom-feed.cgi%3Flukee?raw=1 "~Luke Emmet" +https://proxy.vulpes.one/gemini/otrn.org/atom.xml + ## Youtube yt "~## YOUTUBE ##" |