From 842ea7a6810ea884cbca637f17d683bdab672d88 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Fri, 22 Nov 2024 16:26:46 -0500 Subject: [PATCH] updates --- dotfiles/dot_sbclrc | 4 +++- flake.lock | 24 ++++++++++++------------ home/home.nix | 9 ++++++++- system/eddie/configuration.nix | 22 +++++++++++++++++----- 4 files changed, 40 insertions(+), 19 deletions(-) diff --git a/dotfiles/dot_sbclrc b/dotfiles/dot_sbclrc index a647fb3..66848ec 100644 --- a/dotfiles/dot_sbclrc +++ b/dotfiles/dot_sbclrc @@ -7,13 +7,15 @@ (when (probe-file quicklisp-init) (load quicklisp-init))) -(push (pathname "~/source/_cl/") ql:*local-project-directories*) +;; (push (pathname "~/quicklisp/") ql:*local-project-directories*) (ql:quickload :cffi :silent t) (pushnew (merge-pathnames ".nix-profile/lib/" (user-homedir-pathname)) cffi:*foreign-library-directories*) (pushnew (merge-pathnames ".nix-profile/lib64/" (user-homedir-pathname)) cffi:*foreign-library-directories*) +(pushnew (merge-pathnames "/run/current-system/sw/share/nix-ld/lib/" (user-homedir-pathname)) + cffi:*foreign-library-directories*) (defun pkg-config-add-lib (libname) diff --git a/flake.lock b/flake.lock index 1c76aab..22bc2ff 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1730699102, - "narHash": "sha256-xkplzGzjywMPOpfTOw5oXbwuH4X14VfXEa3m10aHqrY=", + "lastModified": 1732139495, + "narHash": "sha256-bsL1CZWp5fMDXP6U0Ipwi/XA1YigK9ON+pC7Cxurgec=", "owner": "musnix", "repo": "musnix", - "rev": "3feabdc65fb3466f07f306fa5f4e9c43234186e6", + "rev": "996b38613a282299c852eca204a10914c6b0074d", "type": "github" }, "original": { @@ -162,11 +162,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1731698554, - "narHash": "sha256-5kTDLWpsMaKSEnekip2rUBfzuHNS9Fafp5Y7n4Y7hr8=", + "lastModified": 1732304879, + "narHash": "sha256-/DOW8VadE//HA6tuV2++NowYWi7Wa/FmJHXRJoTQnfQ=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "8db1648a95446d41e97ace7caf54e172669810ff", + "rev": "c84579946c03c996916be0fb6e1340f444c277af", "type": "github" }, "original": { @@ -235,11 +235,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -290,11 +290,11 @@ ] }, "locked": { - "lastModified": 1731878857, - "narHash": "sha256-5Bg6+R6PdBSakjnuqEHrTVIPZ4PjMjHmcSBBieF2kPA=", + "lastModified": 1732304010, + "narHash": "sha256-UAjxzFJ0kxzXeZGaMqH8qhy9hlBGgxM4W/3n6IusBU0=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "82cf2241ee012ff5157d72ac055db9cdc67c410b", + "rev": "df3091fb619ee79602768386d25005d5fa038bcd", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index 92ed259..7b5c71e 100644 --- a/home/home.nix +++ b/home/home.nix @@ -59,6 +59,7 @@ cmake raylib raygui + libuv.dev SDL2.dev protonplus ispell @@ -90,12 +91,14 @@ sbclPackages.cffi-object_dot_ops ccl racket + editorconfig-core-c clang-tools cljfmt libxml2 gdtoolkit_4 zulu + openssl.out nixfmt-rfc-style wl-clipboard maim @@ -123,10 +126,12 @@ libGLU glpng libGL - nix-ld nurl freecad + rpi-imager + caligula + prusa-slicer # node packages @@ -183,6 +188,8 @@ whitesur-cursors whitesur-icon-theme bibata-cursors + piper + libratbag icloudpd squirreldisk diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index a1bdf0e..40536dd 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -34,20 +34,20 @@ ulauncher fontconfig freetype - nix-ld egl-wayland glfw-wayland + openssl ]; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.configurationLimit = 8; boot.loader.efi.canTouchEfiVariables = true; - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages_6_11; boot = { initrd.kernelModules = [ "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" ]; - kernelParams = [ "nvidia-drm.fbdev=1" "nvidia_drm.modeset=1"]; # "amd_pstate=guided" + kernelParams = [ "nvidia-drm.fbdev=1" "nvidia_drm.modeset=1" "amdgpu.sg_display=0"]; # "amd_pstate=guided" }; systemd.services.tailscaled.after = ["NetworkManager-wait-online.service"]; @@ -76,6 +76,11 @@ enable32Bit = true; extraPackages = [ pkgs.rocmPackages.clr.icd + pkgs.amdvlk + ]; + + extraPackages32 = [ + pkgs.driversi686Linux.amdvlk ]; }; @@ -83,10 +88,10 @@ nvidia = { # Modesetting is required. + open = true; modesetting.enable = true; powerManagement.enable = true; powerManagement.finegrained = true; - open = true; forceFullCompositionPipeline = true; @@ -177,6 +182,11 @@ services.xserver.deviceSection = ''Option "TearFree" "true"''; # For amdgpu. services.gnome.gnome-keyring.enable = true; + services.picom = { + enable = true; + vSync = true; + }; + programs.dconf.enable = true; services.xserver.xkb = { @@ -312,7 +322,7 @@ zstd stdenv.cc.cc curlFull - openssl + openssl.out attr libssh bzip2 @@ -329,6 +339,8 @@ libGL egl-wayland glfw-wayland + libuv.out + libressl.out ]; services.udev.packages = with pkgs; [