From 3ed9b836ee75ee5454ab63e0ff01c07fadc48724 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Sat, 20 Dec 2025 19:20:12 +0100 Subject: [PATCH] meow --- 0001-add-edname.patch | 78 +++++++++++++++++++ common.nix | 15 ---- .../monosodium-glutamate-g/configuration.nix | 2 + .../modules/default.nix | 1 + hosts/monosodium-glutamate-g/modules/fah.nix | 25 ++++++ .../modules/graphics.nix | 6 ++ modules/default.nix | 1 + modules/desktop/audio.nix | 4 +- modules/desktop/locale.nix | 1 - modules/shell/btop.nix | 7 ++ modules/time.nix | 17 ++++ 11 files changed, 139 insertions(+), 18 deletions(-) create mode 100644 0001-add-edname.patch create mode 100644 hosts/monosodium-glutamate-g/modules/fah.nix create mode 100644 modules/time.nix diff --git a/0001-add-edname.patch b/0001-add-edname.patch new file mode 100644 index 0000000..cd6aecb --- /dev/null +++ b/0001-add-edname.patch @@ -0,0 +1,78 @@ +From 491ad6f41d9335bad450e8be18c2ee24ac5f4e32 Mon Sep 17 00:00:00 2001 +From: TudbuT +Date: Mon, 8 Dec 2025 21:24:18 +0100 +Subject: [PATCH] add edname + +--- + common.nix | 2 ++ + programs/edname.nix | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 47 insertions(+) + create mode 100644 programs/edname.nix + +diff --git a/common.nix b/common.nix +index d64c4d4..3f23075 100644 +--- a/common.nix ++++ b/common.nix +@@ -71,6 +71,8 @@ with builtins; + ungoogled-chromium + scc + speedtest-rs ++ ++ (pkgs.callPackage ./programs/edname.nix {}) + ]; + }; + +diff --git a/programs/edname.nix b/programs/edname.nix +new file mode 100644 +index 0000000..0ba5b21 +--- /dev/null ++++ b/programs/edname.nix +@@ -0,0 +1,45 @@ ++{ ++ stdenv, ++ coreutils, ++ findutils, ++ gnused, ++ lib, ++ fetchFromGitea, ++ makeWrapper, ++}: ++stdenv.mkDerivation rec { ++ ++ pname = "edname"; ++ version = "1.0.2"; ++ ++ nativeBuildInputs = [ makeWrapper ]; ++ ++ src = fetchFromGitea { ++ domain = "git.tudbut.de"; ++ owner = "TudbuT"; ++ repo = "edname"; ++ rev = "v${version}"; ++ hash = "sha256-8aT/xwdx/ORyCFfOu4LZuxUiErZ9ZiCdhJ/WKAiQwe0="; ++ }; ++ ++ installPhase = '' ++ mkdir -p $out/bin ++ cp edname.sh "$out/bin/edname" ++ wrapProgram "$out/bin/edname" \ ++ --prefix PATH : "${ ++ lib.makeBinPath [ ++ coreutils ++ findutils ++ gnused ++ ] ++ }" ++ ''; ++ ++ meta = with lib; { ++ description = "Mass renamer using $EDITOR"; ++ license = licenses.mit; ++ maintainers = [ maintainers.tudbut ]; ++ homepage = "https://git.tudbut.de/TudbuT/edname"; ++ mainProgram = "edname"; ++ }; ++} +-- +2.51.2 + diff --git a/common.nix b/common.nix index d64c4d4..ab5a257 100644 --- a/common.nix +++ b/common.nix @@ -34,7 +34,6 @@ with builtins; unzip gnutar iw - btop nodejs nautilus @@ -118,20 +117,6 @@ with builtins; bluetooth.enable = true; }; - services.chrony = { - enable = true; - enableNTS = true; - servers = [ - "0.de.pool.ntp.org" - "1.de.pool.ntp.org" - "2.de.pool.ntp.org" - "3.de.pool.ntp.org" - ]; - serverOption = "offline"; - extraFlags = [ "-s" ]; - extraConfig = "makestep 1 -1"; - }; - security.rtkit.enable = true; users.users.jade = { diff --git a/hosts/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix index 9f4c428..95a94e2 100644 --- a/hosts/monosodium-glutamate-g/configuration.nix +++ b/hosts/monosodium-glutamate-g/configuration.nix @@ -66,6 +66,7 @@ # missing: menu-qalc picom-jonaburg environment.systemPackages = with pkgs; [ + fahclient uhk-agent # TODO: clean up. zenstates @@ -83,6 +84,7 @@ home-manager.users.jade = { ... }: { + programs.btop.package = pkgs.btop-rocm; programs.git.signing.key = "${pkgs.writeText "msg_id_ed25519.pub" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICR+WyklOASIymOiT+aIVjiLSAM1r3HdRADz2zT6bHfX jade@monosodium-glutamate-g"}"; }; diff --git a/hosts/monosodium-glutamate-g/modules/default.nix b/hosts/monosodium-glutamate-g/modules/default.nix index bbddfc4..1f899a9 100644 --- a/hosts/monosodium-glutamate-g/modules/default.nix +++ b/hosts/monosodium-glutamate-g/modules/default.nix @@ -3,5 +3,6 @@ imports = [ ./graphics.nix ./input.nix + ./fah.nix ]; } diff --git a/hosts/monosodium-glutamate-g/modules/fah.nix b/hosts/monosodium-glutamate-g/modules/fah.nix new file mode 100644 index 0000000..aa596ef --- /dev/null +++ b/hosts/monosodium-glutamate-g/modules/fah.nix @@ -0,0 +1,25 @@ +{ pkgs, ... }: +{ + hardware.graphics = { + enable = true; + enable32Bit = pkgs.lib.mkForce false; + extraPackages = with pkgs; [ + rocmPackages.clr.icd + rocmPackages.clr + rocmPackages.rocminfo + rocmPackages.rocm-runtime + ]; + }; + + systemd.tmpfiles.rules = [ + "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" + ]; + home-manager.users.jade = + { pkgs, ... }: + { + systemd.user.services.fah.Service = { + Environment = [ "OCL_ICD_VENDORS=${pkgs.rocmPackages.clr.icd}/etc/OpenCL/vendors/" ]; + ExecStart = [ "${pkgs.fahclient}/bin/fah-client" ]; + }; + }; +} diff --git a/hosts/monosodium-glutamate-g/modules/graphics.nix b/hosts/monosodium-glutamate-g/modules/graphics.nix index da9b07c..9b0c534 100644 --- a/hosts/monosodium-glutamate-g/modules/graphics.nix +++ b/hosts/monosodium-glutamate-g/modules/graphics.nix @@ -5,4 +5,10 @@ pkgs.radeontop # pkgs.rgp ]; + + home-manager.users.jade = + { ... }: + { + programs.btop.settings.custom_gpu_name0 = "AMD Radeon RX 6700 XT"; + }; } diff --git a/modules/default.nix b/modules/default.nix index 286f879..260fdfc 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -10,5 +10,6 @@ ./input ./media ./nix.nix + ./time.nix ]; } diff --git a/modules/desktop/audio.nix b/modules/desktop/audio.nix index d939f79..2354ae8 100644 --- a/modules/desktop/audio.nix +++ b/modules/desktop/audio.nix @@ -6,9 +6,9 @@ services = { pipewire = { enable = true; - alsa.enable = false; + alsa.enable = true; + alsa.support32Bit = true; pulse.enable = true; - jack.enable = false; }; }; environment.systemPackages = with pkgs; [ diff --git a/modules/desktop/locale.nix b/modules/desktop/locale.nix index b24593c..a8f5054 100644 --- a/modules/desktop/locale.nix +++ b/modules/desktop/locale.nix @@ -1,6 +1,5 @@ { ... }: { - time.timeZone = "Europe/Berlin"; i18n.extraLocaleSettings = { LC_LANG = "en_US.UTF-8"; # LC_LANGUAGE = "en_DE:en_US:en_GB:de_DE"; diff --git a/modules/shell/btop.nix b/modules/shell/btop.nix index ee5df43..fa05556 100644 --- a/modules/shell/btop.nix +++ b/modules/shell/btop.nix @@ -6,8 +6,15 @@ programs.btop = { enable = true; settings = { + shown_boxes = "cpu mem net proc gpu0"; color_theme = "gruvbox_dark"; vim_keys = true; + proc_per_core = true; + proc_filter_kernel = true; + proc_aggregate = true; + cpu_graph_upper = "total"; + cpu_graph_lower = "user"; + update_ms = 500; }; }; }; diff --git a/modules/time.nix b/modules/time.nix new file mode 100644 index 0000000..1418b19 --- /dev/null +++ b/modules/time.nix @@ -0,0 +1,17 @@ +{ ... }: +{ + services.chrony = { + enable = true; + # enableNTS = true; + # servers = [ + # "0.de.pool.ntp.org" + # "1.de.pool.ntp.org" + # "2.de.pool.ntp.org" + # "3.de.pool.ntp.org" + # ]; + serverOption = "iburst"; + extraFlags = [ "-s" ]; + extraConfig = "makestep 1 -1"; + }; + time.timeZone = "Europe/Berlin"; +}