emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updates

Browse source
This commit is contained in:
Matt Nish-Lapidus 2024-11-22 16:26:46 -05:00
parent 86219fee55
commit 842ea7a681
4 changed files with 40 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dotfiles/dot_sbclrc
View file

@ -7,13 +7,15 @@
(when (probe-file quicklisp-init) (when (probe-file quicklisp-init)
(load 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) (ql:quickload :cffi :silent t)
(pushnew (merge-pathnames ".nix-profile/lib/" (user-homedir-pathname)) (pushnew (merge-pathnames ".nix-profile/lib/" (user-homedir-pathname))
cffi:*foreign-library-directories*) cffi:*foreign-library-directories*)
(pushnew (merge-pathnames ".nix-profile/lib64/" (user-homedir-pathname)) (pushnew (merge-pathnames ".nix-profile/lib64/" (user-homedir-pathname))
cffi:*foreign-library-directories*) 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) (defun pkg-config-add-lib (libname)

24
flake.lock generated
View file

@ -126,11 +126,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730699102, "lastModified": 1732139495,
"narHash": "sha256-xkplzGzjywMPOpfTOw5oXbwuH4X14VfXEa3m10aHqrY=", "narHash": "sha256-bsL1CZWp5fMDXP6U0Ipwi/XA1YigK9ON+pC7Cxurgec=",
"owner": "musnix", "owner": "musnix",
"repo": "musnix", "repo": "musnix",
"rev": "3feabdc65fb3466f07f306fa5f4e9c43234186e6", "rev": "996b38613a282299c852eca204a10914c6b0074d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -162,11 +162,11 @@
}, },
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1731698554, "lastModified": 1732304879,
"narHash": "sha256-5kTDLWpsMaKSEnekip2rUBfzuHNS9Fafp5Y7n4Y7hr8=", "narHash": "sha256-/DOW8VadE//HA6tuV2++NowYWi7Wa/FmJHXRJoTQnfQ=",
"owner": "gmodena", "owner": "gmodena",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"rev": "8db1648a95446d41e97ace7caf54e172669810ff", "rev": "c84579946c03c996916be0fb6e1340f444c277af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -235,11 +235,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1731676054, "lastModified": 1732014248,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -290,11 +290,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731878857, "lastModified": 1732304010,
"narHash": "sha256-5Bg6+R6PdBSakjnuqEHrTVIPZ4PjMjHmcSBBieF2kPA=", "narHash": "sha256-UAjxzFJ0kxzXeZGaMqH8qhy9hlBGgxM4W/3n6IusBU0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "82cf2241ee012ff5157d72ac055db9cdc67c410b", "rev": "df3091fb619ee79602768386d25005d5fa038bcd",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
home/home.nix
View file

@ -59,6 +59,7 @@
cmake cmake
raylib raylib
raygui raygui
libuv.dev
SDL2.dev SDL2.dev
protonplus protonplus
ispell ispell
@ -90,12 +91,14 @@
sbclPackages.cffi-object_dot_ops sbclPackages.cffi-object_dot_ops
ccl ccl
racket racket
editorconfig-core-c editorconfig-core-c
clang-tools clang-tools
cljfmt cljfmt
libxml2 libxml2
gdtoolkit_4 gdtoolkit_4
zulu zulu
openssl.out
nixfmt-rfc-style nixfmt-rfc-style
wl-clipboard wl-clipboard
maim maim
@ -123,10 +126,12 @@
libGLU libGLU
glpng glpng
libGL libGL
nix-ld
nurl nurl
freecad freecad
rpi-imager
caligula
prusa-slicer prusa-slicer
# node packages # node packages
@ -183,6 +188,8 @@
whitesur-cursors whitesur-cursors
whitesur-icon-theme whitesur-icon-theme
bibata-cursors bibata-cursors
piper
libratbag
icloudpd icloudpd
squirreldisk squirreldisk

22
system/eddie/configuration.nix
View file

@ -34,20 +34,20 @@
ulauncher ulauncher
fontconfig fontconfig
freetype freetype
nix-ld
egl-wayland egl-wayland
glfw-wayland glfw-wayland
openssl
]; ];
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.systemd-boot.configurationLimit = 8; boot.loader.systemd-boot.configurationLimit = 8;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_6_11;
boot = { boot = {
initrd.kernelModules = [ "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" ]; 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"]; systemd.services.tailscaled.after = ["NetworkManager-wait-online.service"];
@ -76,6 +76,11 @@
enable32Bit = true; enable32Bit = true;
extraPackages = [ extraPackages = [
pkgs.rocmPackages.clr.icd pkgs.rocmPackages.clr.icd
pkgs.amdvlk
];
extraPackages32 = [
pkgs.driversi686Linux.amdvlk
]; ];
}; };
@ -83,10 +88,10 @@
nvidia = { nvidia = {
# Modesetting is required. # Modesetting is required.
open = true;
modesetting.enable = true; modesetting.enable = true;
powerManagement.enable = true; powerManagement.enable = true;
powerManagement.finegrained = true; powerManagement.finegrained = true;
open = true;
forceFullCompositionPipeline = true; forceFullCompositionPipeline = true;
@ -177,6 +182,11 @@
services.xserver.deviceSection = ''Option "TearFree" "true"''; # For amdgpu. services.xserver.deviceSection = ''Option "TearFree" "true"''; # For amdgpu.
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
services.picom = {
enable = true;
vSync = true;
};
programs.dconf.enable = true; programs.dconf.enable = true;
services.xserver.xkb = { services.xserver.xkb = {
@ -312,7 +322,7 @@
zstd zstd
stdenv.cc.cc stdenv.cc.cc
curlFull curlFull
openssl openssl.out
attr attr
libssh libssh
bzip2 bzip2
@ -329,6 +339,8 @@
libGL libGL
egl-wayland egl-wayland
glfw-wayland glfw-wayland
libuv.out
libressl.out
]; ];
services.udev.packages = with pkgs; [ services.udev.packages = with pkgs; [