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

updates and nh

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-01-12 14:13:18 -05:00
parent 5cd5ed3f84
commit 829c535f5c
12 changed files with 62 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dotfiles/dot_config/fish/functions/nixgc.fish
View file

@ -1,5 +1,5 @@
#!/usr/bin/env fish #!/usr/bin/env fish
function nixgc --description 'update home manager' function nixgc --description 'update home manager'
nix-collect-garbage $argv && sudo nix-collect-garbage $argv nix-collect-garbage $argv
end end

24
flake.lock generated
View file

@ -134,11 +134,11 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1736455421, "lastModified": 1736695299,
"narHash": "sha256-TsDbQIHOi84hTjb0SSLSyX27P1MA1DVLagX8uik+WGk=", "narHash": "sha256-928g4bGGkrd2Ls74kkeKpu0TRNPLXhBnhXv36lkl1/A=",
"owner": "ghostty-org", "owner": "ghostty-org",
"repo": "ghostty", "repo": "ghostty",
"rev": "6ef757a8f85db7a124d370378850339a899c9e65", "rev": "caddf59db547112a18b5fe908eabb12da6624372",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -366,11 +366,11 @@
}, },
"nixpkgs-unstable_2": { "nixpkgs-unstable_2": {
"locked": { "locked": {
"lastModified": 1736344531, "lastModified": 1736523798,
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "rev": "130595eba61081acde9001f43de3248d8888ac4a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -398,11 +398,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1736200483, "lastModified": 1736549401,
"narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -476,11 +476,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736203741, "lastModified": 1736515725,
"narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125",
"type": "github" "type": "github"
}, },
"original": { "original": {

39
home/home.nix
View file

@ -48,23 +48,21 @@
readline readline
gnupg gnupg
imagemagick imagemagick
gcc # gcc
gnutls gnutls
gettext gettext
xorg.libX11 xorg.libX11
xorg.libxcb xorg.libxcb
freetype.dev freetype
gnumake gnumake
flex flex
bison bison
mesa mesa
neofetch neofetch
nvd nvd
xwayland
nitch nitch
ripgrep-all ripgrep-all
silver-searcher silver-searcher
# xclip
maestral maestral
maestral-gui maestral-gui
nix-index nix-index
@ -87,10 +85,10 @@
util-linux util-linux
coreutils coreutils
binutils binutils
libgcc # libgcc
cmake # cmake
libuv.dev # libuv.dev
SDL2.dev # SDL2.dev
protonplus protonplus
ispell ispell
aspell aspell
@ -101,9 +99,9 @@
libappimage libappimage
transmission_4-gtk transmission_4-gtk
lsof lsof
ruby # ruby
janet # janet
jpm # jpm
guile guile
python311 python311
python311Packages.pip python311Packages.pip
@ -129,11 +127,10 @@
gdu gdu
poppler_utils poppler_utils
editorconfig-core-c editorconfig-core-c
clang-tools # clang-tools
cljfmt cljfmt
libxml2 libxml2
gdtoolkit_4 gdtoolkit_4
zulu
openssl.out openssl.out
nixfmt-rfc-style nixfmt-rfc-style
wl-clipboard wl-clipboard
@ -146,7 +143,7 @@
libsecret libsecret
samba4Full samba4Full
shellcheck shellcheck
waylandpp.dev # waylandpp.dev
wayland-utils wayland-utils
libffi.dev libffi.dev
nodejs_18 nodejs_18
@ -158,9 +155,9 @@
ftgl ftgl
gperf gperf
numbat numbat
libGLU # libGLU
glpng glpng
libGL # libGL
nurl nurl
freecad freecad
procs procs
@ -214,7 +211,7 @@
gnomeExtensions.just-perfection gnomeExtensions.just-perfection
gnomeExtensions.dash-to-dock gnomeExtensions.dash-to-dock
gnomeExtensions.solaar-extension # gnomeExtensions.solaar-extension
gnomeExtensions.paperwm gnomeExtensions.paperwm
gnomeExtensions.media-controls gnomeExtensions.media-controls
gnomeExtensions.looking-glass-button gnomeExtensions.looking-glass-button
@ -226,20 +223,15 @@
gpaste gpaste
ulauncher ulauncher
xdg-desktop-portal-gnome
xdg-desktop-portal-gtk
xdg-desktop-portal
soundconverter soundconverter
gtop gtop
wmctrl wmctrl
sushi
colloid-gtk-theme colloid-gtk-theme
colloid-icon-theme colloid-icon-theme
whitesur-gtk-theme whitesur-gtk-theme
whitesur-cursors whitesur-cursors
whitesur-icon-theme whitesur-icon-theme
bibata-cursors bibata-cursors
piper
icloudpd icloudpd
squirreldisk squirreldisk
@ -266,8 +258,6 @@
spice-protocol spice-protocol
virt-viewer virt-viewer
virt-manager virt-manager
solaar
logitech-udev-rules
bfg-repo-cleaner bfg-repo-cleaner
# opensnitch # opensnitch
# opensnitch-ui # opensnitch-ui
@ -292,7 +282,6 @@
plexamp plexamp
amberol amberol
carla carla
# wireplumber
# audacity # audacity
tenacity tenacity
supercollider-with-plugins supercollider-with-plugins

2
packages/amplocker/package.nix
View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "latest"; version = "latest";
src = fetchurl { src = fetchurl {
url = "https://audioassaultdownloads.s3.amazonaws.com/AmpLocker/AmpLocker109/AmpLockerLinux.zip"; url = "https://audioassaultdownloads.s3.amazonaws.com/AmpLocker/AmpLocker109/AmpLockerLinux.zip";
sha256 = "sha256-H36j6w4BrFe+0hStVNGs4FoHnIlQE+D++osq+trHYh0="; sha256 = "sha256-adHle4A59DxJFR3KiLyuZp79vUK0QkGDnHRu6PWMVJQ=";
}; };
nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [

2
packages/tal/bassline.nix
View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.9.4"; version = "3.9.4";
src = fetchurl { src = fetchurl {
url = "https://tal-software.com/downloads/plugins/TAL-BassLine-101_64_linux.zip"; url = "https://tal-software.com/downloads/plugins/TAL-BassLine-101_64_linux.zip";
sha256 = "sha256-szlmaaCIbkCTLa23vrAICSq4dgorHfPWjOxiF6M2Xzk="; sha256 = "sha256-J2nAoxL3XO1+k3f/sZA/K9sQ75Ivj4Vxumg2jxD1Sro=";
}; };
nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [

2
packages/tal/j8.nix
View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "latest"; version = "latest";
src = fetchurl { src = fetchurl {
url = "https://tal-software.com/downloads/plugins/TAL-J-8_64_linux.zip"; url = "https://tal-software.com/downloads/plugins/TAL-J-8_64_linux.zip";
sha256 = "sha256-Z1ASlR4aqUh0yFzW0sOJLocXk1RPOnGmKCri2n/qcWc="; sha256 = "sha256-gBzlkqBzWHv1QhbzzOb2uWy1eyvPQqyRQzXMKWIunCc=";
}; };
nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [

2
packages/the-usual-suspects/osirus/osirus.nix
View file

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "osirus"; pname = "osirus";
version = "latest"; version = "latest";
src = fetchurl { src = fetchurl {
url = "https://futurenoize.com/dsp56300/builds/osirus/beta/DSP56300Emu-1.4.1-Linux_x86_64-Osirus-CLAP.zip"; url = "https://futurenoize.com/dsp56300/builds/osirus/DSP56300Emu-1.4.1-Linux_x86_64-Osirus-CLAP.zip";
sha256 = "sha256-+LkyQAaW/yTaLUxiou/Srk9KAhJDQ660u5P9584o4JU="; sha256 = "sha256-+LkyQAaW/yTaLUxiou/Srk9KAhJDQ660u5P9584o4JU=";
}; };
nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ];

2
packages/the-usual-suspects/ostirus/ostirus.nix
View file

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "ostirus"; pname = "ostirus";
version = "latest"; version = "latest";
src = fetchurl { src = fetchurl {
url = "https://futurenoize.com/dsp56300/builds/ostirus/beta/DSP56300Emu-1.4.1-Linux_x86_64-OsTIrus-CLAP.zip"; url = "https://futurenoize.com/dsp56300/builds/ostirus/DSP56300Emu-1.4.1-Linux_x86_64-OsTIrus-CLAP.zip";
sha256 = "sha256-0qMqeT5L87AuGgj4UmumhE5YYL4Zba6Ev/NHoemkjW8="; sha256 = "sha256-0qMqeT5L87AuGgj4UmumhE5YYL4Zba6Ev/NHoemkjW8=";
}; };
nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ];

2
packages/the-usual-suspects/vavra/vavra.nix
View file

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "vavra"; pname = "vavra";
version = "latest"; version = "latest";
src = fetchurl { src = fetchurl {
url = "https://futurenoize.com/dsp56300/builds/vavra/beta/DSP56300Emu-1.4.1-Linux_x86_64-Vavra-CLAP.zip"; url = "https://futurenoize.com/dsp56300/builds/vavra/DSP56300Emu-1.4.1-Linux_x86_64-Vavra-CLAP.zip";
sha256 = "sha256-dWEyzdLyMdkx3XeH4q9U8ko7aslfRROlsJI1DYgLBA4="; sha256 = "sha256-dWEyzdLyMdkx3XeH4q9U8ko7aslfRROlsJI1DYgLBA4=";
}; };
nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ];

2
packages/the-usual-suspects/xenia/xenia.nix
View file

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "xenia"; pname = "xenia";
version = "latest"; version = "latest";
src = fetchurl { src = fetchurl {
url = "https://futurenoize.com/dsp56300/builds/xenia/beta/DSP56300Emu-1.4.1-Linux_x86_64-Xenia-CLAP.zip"; url = "https://futurenoize.com/dsp56300/builds/xenia/DSP56300Emu-1.4.1-Linux_x86_64-Xenia-CLAP.zip";
sha256 = "sha256-E+nSzawztU6L8Cxp3o59TG+oUJkvdZNcn8fqopbj7Ac="; sha256 = "sha256-E+nSzawztU6L8Cxp3o59TG+oUJkvdZNcn8fqopbj7Ac=";
}; };
nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ];

34
system/eddie/configuration.nix
View file

@ -30,11 +30,11 @@
flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs; flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
in { in {
gc = { # gc = {
automatic = true; # automatic = true;
dates = "daily"; # dates = "daily";
options = "--delete-older-than +3"; # options = "--delete-older-than +3";
}; # };
settings = { settings = {
# Enable flakes and new 'nix' command # Enable flakes and new 'nix' command
@ -72,8 +72,10 @@
freetype freetype
egl-wayland egl-wayland
glfw-wayland glfw-wayland
libGL.dev # libGL.dev
openssl openssl
# solaar
# logitech-udev-rules
linuxKernel.packages.linux_6_12.openrazer linuxKernel.packages.linux_6_12.openrazer
]; ];
@ -162,7 +164,7 @@
security.polkit.enable = true; security.polkit.enable = true;
security.rtkit.enable = true; security.rtkit.enable = true;
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" "modesetting" ];
networking = { networking = {
hostName = "eddie"; hostName = "eddie";
@ -195,6 +197,7 @@
services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome.enable = true; services.xserver.desktopManager.gnome.enable = true;
services.xserver.deviceSection = ''Option "TearFree" "true"''; # For amdgpu. services.xserver.deviceSection = ''Option "TearFree" "true"''; # For amdgpu.
services.xserver.enableTearFree = true;
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
services.picom = { services.picom = {
@ -202,8 +205,16 @@
vSync = true; vSync = true;
}; };
programs.nh = {
enable = true;
clean.enable = true;
clean.extraArgs = "--keep-since 4d --keep 3";
flake = "/home/emenel/source/nixos-config";
};
programs.dconf.enable = true; programs.dconf.enable = true;
programs.gpaste.enable = true; programs.gpaste.enable = true;
programs.xwayland.enable = true;
services.xserver.xkb = { services.xserver.xkb = {
layout = "us"; layout = "us";
@ -220,7 +231,13 @@
services.tailscale.enable = true; services.tailscale.enable = true;
services.envfs.enable = true; services.envfs.enable = true;
services.gnome.gnome-remote-desktop.enable = false; services.gnome.sushi.enable = true;
xdg.portal.extraPortals = [
pkgs.xdg-desktop-portal-gnome
pkgs.xdg-desktop-portal-gtk
pkgs.xdg-desktop-portal
];
# Enable sound with pipewire. # Enable sound with pipewire.
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
@ -312,7 +329,6 @@
}; };
services.flatpak.enable = true; services.flatpak.enable = true;
services.ratbagd.enable = true;
services.dbus.implementation = "broker"; services.dbus.implementation = "broker";
#programs.gnupg.enable = true; #programs.gnupg.enable = true;

6
system/eddie/razer-speaker-fix.nix
View file

@ -2011,9 +2011,9 @@ hda-verb /dev/snd/hwC2D0 0x20 0x400 0x0
hda-verb /dev/snd/hwC2D0 0x20 0x500 0x23 hda-verb /dev/snd/hwC2D0 0x20 0x500 0x23
hda-verb /dev/snd/hwC2D0 0x20 0x400 0xdd00 hda-verb /dev/snd/hwC2D0 0x20 0x400 0xdd00
# amixer sset Master unmute amixer sset Master unmute
# amixer sset Speaker unmute amixer sset Speaker unmute
# amixer sset Headphone unmute amixer sset Headphone unmute
''; '';