tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: tristan:f9460c453101d26adf43e8d482abe1ad8668b24e
Branches Tags
tristan:main
..
compare: tristan:4ddd6194dc0c99bcaff4ec268f85abb11bc9f0ce
Branches Tags
tristan:main

No commits in common. "f9460c453101d26adf43e8d482abe1ad8668b24e" and "4ddd6194dc0c99bcaff4ec268f85abb11bc9f0ce" have entirely different histories.
f9460c4531 ... 4ddd6194dc

5 changed files with 31 additions and 36 deletions
Show stats Expand all files Collapse all files

18
flake.lock generated
View file

@ -58,11 +58,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740562777, "lastModified": 1741201737,
"narHash": "sha256-2Hr6GRQjbStwM4ASLSOzkJZLNil4foNuuOFPGyopj9w=", "narHash": "sha256-bLuBf/K4yGokkrMIvEUy4SCh8UJ0AC+Fpd67yEIabW4=",
"owner": "oddlama", "owner": "oddlama",
"repo": "agenix-rekey", "repo": "agenix-rekey",
"rev": "1a30818e41b6573389abfe4f1f99086714c0ca6a", "rev": "e7b93c191080cd8089f6e60124ed822a8366a69a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1226,11 +1226,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741099788, "lastModified": 1741221681,
"narHash": "sha256-ZDTcZmhz7glHFPCSR7cmyK63Ovm1tN90PsH7YwJWTRI=", "narHash": "sha256-NsG8qx3Wmyn6jVQLdyPefA0sFjR6hoMc8iDVZ9mefJY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "c13f06ae97a5c40b170f7ab92251f90981b4df77", "rev": "7f9073f6f76849057e73ddadc6b1a305f2358f41",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1490,11 +1490,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1739742581, "lastModified": 1740440122,
"narHash": "sha256-0Ze86fzS6dzw/i0+egACKR7EGe9eoOriIHwKpTDQvTI=", "narHash": "sha256-F6hf8YApwMlXCz27tUS1ohqf5/R1ZE1d+txit8esrJk=",
"owner": "brckd", "owner": "brckd",
"repo": "stylix", "repo": "stylix",
"rev": "e3fe2c662862c2fbf09bfd9fc0556d0e4225298b", "rev": "83645322fd2214b06cf01623f1774fe58cfc3520",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
home-mods/shell/default.nix
View file

@ -17,7 +17,7 @@ let
ref = "main"; ref = "main";
rev = "c7392136bed264258c9b8788b14410e1ff06d602"; rev = "c7392136bed264258c9b8788b14410e1ff06d602";
}; };
myEmacs = (pkgs.pkgsAMD64Microarchs.znver2.emacsPackagesFor pkgs.emacs-unstable-pgtk).emacsWithPackages (epkgs: myEmacs = (pkgs.emacsPackagesFor pkgs.emacs-unstable-pgtk).emacsWithPackages (epkgs:
with epkgs; [ with epkgs; [
vterm vterm
treesit-grammars.with-all-grammars treesit-grammars.with-all-grammars
@ -341,7 +341,7 @@ in
}; };
# TODO Disable gui apps & switch to emacs-git instead of pgtk on headless systems # TODO Disable gui apps & switch to emacs-git instead of pgtk on headless systems
packages = with pkgs.pkgsAMD64Microarchs.znver2; [ packages = with pkgs; [
myEmacs myEmacs
emacs-lsp-booster emacs-lsp-booster
any-nix-shell any-nix-shell
@ -393,8 +393,8 @@ in
xpipe xpipe
# surrealist # surrealist
# surrealdb # surrealdb
rage pkgs.rage
nh pkgs.nh
pkgs.agenix-rekey pkgs.agenix-rekey
# android-studio-full # android-studio-full
]; ];

8
os-mods/amdgpu/default.nix
View file

@ -18,7 +18,7 @@
]; ];
chaotic.mesa-git = { chaotic.mesa-git = {
enable = true; enable = false;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
mesa_git.opencl mesa_git.opencl
libva-vdpau-driver libva-vdpau-driver
@ -52,7 +52,7 @@
}; };
systemd.services.lactd = { systemd.services.lactd = {
enable = false; enable = true;
description = "Radeon GPU monitor"; description = "Radeon GPU monitor";
after = [ "syslog.target" "systemd-modules-load.service" ]; after = [ "syslog.target" "systemd-modules-load.service" ];
@ -67,12 +67,12 @@
}; };
# Force radv # Force radv
# environment.variables.AMD_VULKAN_ICD = "RADV"; environment.variables.AMD_VULKAN_ICD = "RADV";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
## MONITORING TOOLS ## ## MONITORING TOOLS ##
# nvtopPackages.amd # for AMD GPUs # broken ? # nvtopPackages.amd # for AMD GPUs # broken ?
# lact lact
vulkan-tools vulkan-tools
libva-utils libva-utils
glxinfo # TODO right place here or in desktop ? glxinfo # TODO right place here or in desktop ?

6
os-mods/network/default.nix
View file

@ -50,11 +50,11 @@
# }; # };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# keybase-gui keybase-gui
]; ];
services = { services = {
# keybase.enable = true; keybase.enable = true;
# kbfs.enable = true; kbfs.enable = true;
# kbfs.enableRedirector = true; # kbfs.enableRedirector = true;
resolved = { resolved = {
enable = true; enable = true;

27
systems/nixos-fw16/default.nix
View file

@ -97,7 +97,7 @@
# Power mgmt # Power mgmt
services.input-remapper.enable = true; services.input-remapper.enable = true;
services.power-profiles-daemon.enable = true; services.power-profiles-daemon.enable = true;
# powerManagement.powertop.enable = true; powerManagement.powertop.enable = true;
programs.corectrl.gpuOverclock.enable = lib.mkForce false; # TODO Check if needed programs.corectrl.gpuOverclock.enable = lib.mkForce false; # TODO Check if needed
programs.adb.enable = true; programs.adb.enable = true;
#### ####
@ -107,9 +107,6 @@
"big-parallel" "big-parallel"
"kvm" "kvm"
"nixos-test" "nixos-test"
"gccarch-znver1"
"gccarch-znver2"
"gccarch-znver3"
"gccarch-znver4" "gccarch-znver4"
]; ];
# nixpkgs.hostPlatform.gcc.arch = "znver2"; # nixpkgs.hostPlatform.gcc.arch = "znver2";
@ -134,10 +131,8 @@
# kernelPackages = pkgs.pkgsAMD64Microarchs.znver4.linuxPackages_cachyos; # kernelPackages = pkgs.pkgsAMD64Microarchs.znver4.linuxPackages_cachyos;
# 6.14 rc wohooo # 6.14 rc wohooo
# kernelPackages = pkgs.linuxPackages_cachyos-rc; kernelPackages = pkgs.linuxPackages_cachyos-rc;
kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos-rc; # kernelPackages = pkgs.pkgsAMD64Microarchs.znver4.linuxPackages_cachyos-rc;
# kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos;
# kernelPackages = pkgs.linuxPackages_cachyos;
kernelPatches = [ ]; kernelPatches = [ ];
kernelParams = [ kernelParams = [
@ -238,7 +233,7 @@
systemd = { systemd = {
services = { services = {
ryzenadj = { ryzenadj = {
enable = false; enable = true;
description = "RyzenAdj Autoset"; description = "RyzenAdj Autoset";
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
@ -249,13 +244,13 @@
}; };
# Do not manage HID devices with powertop to prevent annoying keyboard/mouse sleeps # Do not manage HID devices with powertop to prevent annoying keyboard/mouse sleeps
# powertop.postStart = '' powertop.postStart = ''
# HIDDEVICES=$(ls /sys/bus/usb/drivers/usbhid | grep -oE '^[0-9]+-[0-9\.]+' | sort -u) HIDDEVICES=$(ls /sys/bus/usb/drivers/usbhid | grep -oE '^[0-9]+-[0-9\.]+' | sort -u)
# for i in $HIDDEVICES; do for i in $HIDDEVICES; do
# echo -n "Enabling " | cat - /sys/bus/usb/devices/$i/product echo -n "Enabling " | cat - /sys/bus/usb/devices/$i/product
# echo 'on' > /sys/bus/usb/devices/$i/power/control echo 'on' > /sys/bus/usb/devices/$i/power/control
# done done
# ''; '';
# This manually configures the automatically created network-adresses service to be more flexible # This manually configures the automatically created network-adresses service to be more flexible
# regarding booting without the the device being available on boot # regarding booting without the the device being available on boot