From 829c535f5cb797b2c14a77b1c2e13946f24c0601 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Sun, 12 Jan 2025 14:13:18 -0500 Subject: [PATCH] updates and nh --- dotfiles/dot_config/fish/functions/nixgc.fish | 2 +- flake.lock | 24 ++++++------ home/home.nix | 39 +++++++------------ packages/amplocker/package.nix | 2 +- packages/tal/bassline.nix | 2 +- packages/tal/j8.nix | 2 +- packages/the-usual-suspects/osirus/osirus.nix | 2 +- .../the-usual-suspects/ostirus/ostirus.nix | 2 +- packages/the-usual-suspects/vavra/vavra.nix | 2 +- packages/the-usual-suspects/xenia/xenia.nix | 2 +- system/eddie/configuration.nix | 34 +++++++++++----- system/eddie/razer-speaker-fix.nix | 6 +-- 12 files changed, 62 insertions(+), 57 deletions(-) diff --git a/dotfiles/dot_config/fish/functions/nixgc.fish b/dotfiles/dot_config/fish/functions/nixgc.fish index 791137f..3ad9038 100644 --- a/dotfiles/dot_config/fish/functions/nixgc.fish +++ b/dotfiles/dot_config/fish/functions/nixgc.fish @@ -1,5 +1,5 @@ #!/usr/bin/env fish function nixgc --description 'update home manager' - nix-collect-garbage $argv && sudo nix-collect-garbage $argv + nix-collect-garbage $argv end diff --git a/flake.lock b/flake.lock index d0445cc..3f8ea9a 100644 --- a/flake.lock +++ b/flake.lock @@ -134,11 +134,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1736455421, - "narHash": "sha256-TsDbQIHOi84hTjb0SSLSyX27P1MA1DVLagX8uik+WGk=", + "lastModified": 1736695299, + "narHash": "sha256-928g4bGGkrd2Ls74kkeKpu0TRNPLXhBnhXv36lkl1/A=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "6ef757a8f85db7a124d370378850339a899c9e65", + "rev": "caddf59db547112a18b5fe908eabb12da6624372", "type": "github" }, "original": { @@ -366,11 +366,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1736523798, + "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "130595eba61081acde9001f43de3248d8888ac4a", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736200483, - "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "lastModified": 1736549401, + "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899", "type": "github" }, "original": { @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1736203741, - "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", + "lastModified": 1736515725, + "narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", + "rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index 47a6c68..8a87828 100644 --- a/home/home.nix +++ b/home/home.nix @@ -48,23 +48,21 @@ readline gnupg imagemagick - gcc + # gcc gnutls gettext xorg.libX11 xorg.libxcb - freetype.dev + freetype gnumake flex bison mesa neofetch nvd - xwayland nitch ripgrep-all silver-searcher - # xclip maestral maestral-gui nix-index @@ -87,10 +85,10 @@ util-linux coreutils binutils - libgcc - cmake - libuv.dev - SDL2.dev + # libgcc + # cmake + # libuv.dev + # SDL2.dev protonplus ispell aspell @@ -101,9 +99,9 @@ libappimage transmission_4-gtk lsof - ruby - janet - jpm + # ruby + # janet + # jpm guile python311 python311Packages.pip @@ -129,11 +127,10 @@ gdu poppler_utils editorconfig-core-c - clang-tools + # clang-tools cljfmt libxml2 gdtoolkit_4 - zulu openssl.out nixfmt-rfc-style wl-clipboard @@ -146,7 +143,7 @@ libsecret samba4Full shellcheck - waylandpp.dev + # waylandpp.dev wayland-utils libffi.dev nodejs_18 @@ -158,9 +155,9 @@ ftgl gperf numbat - libGLU + # libGLU glpng - libGL + # libGL nurl freecad procs @@ -214,7 +211,7 @@ gnomeExtensions.just-perfection gnomeExtensions.dash-to-dock - gnomeExtensions.solaar-extension + # gnomeExtensions.solaar-extension gnomeExtensions.paperwm gnomeExtensions.media-controls gnomeExtensions.looking-glass-button @@ -226,20 +223,15 @@ gpaste ulauncher - xdg-desktop-portal-gnome - xdg-desktop-portal-gtk - xdg-desktop-portal soundconverter gtop wmctrl - sushi colloid-gtk-theme colloid-icon-theme whitesur-gtk-theme whitesur-cursors whitesur-icon-theme bibata-cursors - piper icloudpd squirreldisk @@ -266,8 +258,6 @@ spice-protocol virt-viewer virt-manager - solaar - logitech-udev-rules bfg-repo-cleaner # opensnitch # opensnitch-ui @@ -292,7 +282,6 @@ plexamp amberol carla - # wireplumber # audacity tenacity supercollider-with-plugins diff --git a/packages/amplocker/package.nix b/packages/amplocker/package.nix index 1e8b629..edc5fd7 100644 --- a/packages/amplocker/package.nix +++ b/packages/amplocker/package.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "latest"; src = fetchurl { url = "https://audioassaultdownloads.s3.amazonaws.com/AmpLocker/AmpLocker109/AmpLockerLinux.zip"; - sha256 = "sha256-H36j6w4BrFe+0hStVNGs4FoHnIlQE+D++osq+trHYh0="; + sha256 = "sha256-adHle4A59DxJFR3KiLyuZp79vUK0QkGDnHRu6PWMVJQ="; }; nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; buildInputs = with pkgs; [ diff --git a/packages/tal/bassline.nix b/packages/tal/bassline.nix index 51f9d9a..571d35e 100644 --- a/packages/tal/bassline.nix +++ b/packages/tal/bassline.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.9.4"; src = fetchurl { 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 ]; buildInputs = with pkgs; [ diff --git a/packages/tal/j8.nix b/packages/tal/j8.nix index 5442f8d..ab0cdf6 100644 --- a/packages/tal/j8.nix +++ b/packages/tal/j8.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "latest"; src = fetchurl { url = "https://tal-software.com/downloads/plugins/TAL-J-8_64_linux.zip"; - sha256 = "sha256-Z1ASlR4aqUh0yFzW0sOJLocXk1RPOnGmKCri2n/qcWc="; + sha256 = "sha256-gBzlkqBzWHv1QhbzzOb2uWy1eyvPQqyRQzXMKWIunCc="; }; nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; buildInputs = with pkgs; [ diff --git a/packages/the-usual-suspects/osirus/osirus.nix b/packages/the-usual-suspects/osirus/osirus.nix index 506badc..f6aa3e1 100644 --- a/packages/the-usual-suspects/osirus/osirus.nix +++ b/packages/the-usual-suspects/osirus/osirus.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "osirus"; version = "latest"; 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="; }; nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; diff --git a/packages/the-usual-suspects/ostirus/ostirus.nix b/packages/the-usual-suspects/ostirus/ostirus.nix index 50b65c0..a9bea2f 100644 --- a/packages/the-usual-suspects/ostirus/ostirus.nix +++ b/packages/the-usual-suspects/ostirus/ostirus.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "ostirus"; version = "latest"; 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="; }; nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; diff --git a/packages/the-usual-suspects/vavra/vavra.nix b/packages/the-usual-suspects/vavra/vavra.nix index a3e41df..7793071 100644 --- a/packages/the-usual-suspects/vavra/vavra.nix +++ b/packages/the-usual-suspects/vavra/vavra.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "vavra"; version = "latest"; 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="; }; nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; diff --git a/packages/the-usual-suspects/xenia/xenia.nix b/packages/the-usual-suspects/xenia/xenia.nix index 5a5ffaa..65e32e1 100644 --- a/packages/the-usual-suspects/xenia/xenia.nix +++ b/packages/the-usual-suspects/xenia/xenia.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "xenia"; version = "latest"; 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="; }; nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index 38363eb..1b71d47 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -30,11 +30,11 @@ flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs; in { - gc = { - automatic = true; - dates = "daily"; - options = "--delete-older-than +3"; - }; + # gc = { + # automatic = true; + # dates = "daily"; + # options = "--delete-older-than +3"; + # }; settings = { # Enable flakes and new 'nix' command @@ -72,8 +72,10 @@ freetype egl-wayland glfw-wayland - libGL.dev + # libGL.dev openssl + # solaar + # logitech-udev-rules linuxKernel.packages.linux_6_12.openrazer ]; @@ -162,7 +164,7 @@ security.polkit.enable = true; security.rtkit.enable = true; - services.xserver.videoDrivers = [ "nvidia" ]; + services.xserver.videoDrivers = [ "nvidia" "modesetting" ]; networking = { hostName = "eddie"; @@ -195,6 +197,7 @@ services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; services.xserver.deviceSection = ''Option "TearFree" "true"''; # For amdgpu. + services.xserver.enableTearFree = true; services.gnome.gnome-keyring.enable = true; services.picom = { @@ -202,8 +205,16 @@ 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.gpaste.enable = true; + programs.xwayland.enable = true; services.xserver.xkb = { layout = "us"; @@ -220,7 +231,13 @@ services.tailscale.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. hardware.pulseaudio.enable = false; @@ -312,7 +329,6 @@ }; services.flatpak.enable = true; - services.ratbagd.enable = true; services.dbus.implementation = "broker"; #programs.gnupg.enable = true; diff --git a/system/eddie/razer-speaker-fix.nix b/system/eddie/razer-speaker-fix.nix index 491f50e..46dddd7 100644 --- a/system/eddie/razer-speaker-fix.nix +++ b/system/eddie/razer-speaker-fix.nix @@ -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 0x400 0xdd00 -# amixer sset Master unmute -# amixer sset Speaker unmute -# amixer sset Headphone unmute +amixer sset Master unmute +amixer sset Speaker unmute +amixer sset Headphone unmute '';