diff --git a/common.nix b/common.nix index 54e2dcf..4f63327 100644 --- a/common.nix +++ b/common.nix @@ -20,8 +20,6 @@ with builtins; htmlq - gnucobol - intiface-central ausweisapp @@ -44,8 +42,6 @@ with builtins; jdk - gpu-screen-recorder - libsecret fzf ripgrep @@ -73,7 +69,7 @@ with builtins; scc speedtest-rs - (pkgs.callPackage ./programs/edname.nix { }) + (pkgs.callPackage ./programs/edname.nix {}) ]; }; @@ -133,6 +129,7 @@ with builtins; "adbusers" "dialout" "plugdev" + "wireshark" ]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOaE8TFsIazpn4OnHvHcRpOFr9FfvMaWOiEjmHsmnAoE cardno:000F_70CD7D05" diff --git a/flake.lock b/flake.lock index e426b5d..687655e 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ }, "crane": { "locked": { - "lastModified": 1777689689, - "narHash": "sha256-HGdYOOU4j7w5I/Tlve6z/Q/P9cGHZMhSlALlgfikjsU=", + "lastModified": 1774313767, + "narHash": "sha256-hy0XTQND6avzGEUFrJtYBBpFa/POiiaGBr2vpU6Y9tY=", "owner": "ipetkov", "repo": "crane", - "rev": "709b316b6ba9424932b33761549e2117bbb3c5ae", + "rev": "3d9df76e29656c679c744968b17fbaf28f0e923d", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1777708550, - "narHash": "sha256-Qif3UXT0l5OQq8H9pRWt4/ia4gF48MWK2oHKL8uVx8U=", + "lastModified": 1774423251, + "narHash": "sha256-g/PP8G9WcP4vtZVOBNYwfGxLnwLQoTERHnef8irAMeQ=", "owner": "nix-community", "repo": "fenix", - "rev": "74c1591efaff494756b8d35ebe357c6c2bbdca96", + "rev": "b70d7535088cd8a9e4322c372a475f66ffa18adf", "type": "github" }, "original": { @@ -144,11 +144,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1775176642, - "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "179704030c5286c729b5b0522037d1d51341022c", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -176,11 +176,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1777678872, - "narHash": "sha256-EPIFsulyon7Z1vLQq5Fk64GR8L7cQsT+IPhcsukVbgk=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "5250617bffd85403b14dbf43c3870e7f255d2c16", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -197,11 +197,11 @@ ] }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -247,18 +247,20 @@ "gnome-shell": { "flake": false, "locked": { + "host": "gitlab.gnome.org", "lastModified": 1767737596, "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", + "ref": "gnome-49", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -268,11 +270,11 @@ ] }, "locked": { - "lastModified": 1777760447, - "narHash": "sha256-6Tq5I0u85ROgesFWvFUrWsJvPtIn51nsPU+EgXAMl/0=", + "lastModified": 1774379316, + "narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "561bd674646db26ebfccc79b4fbef89f335505db", + "rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7", "type": "github" }, "original": { @@ -289,11 +291,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1777740049, - "narHash": "sha256-O8rXPZaARIjp4fh20wkeRWeElYbp4Dgp8pKk3Ikkj40=", + "lastModified": 1774376318, + "narHash": "sha256-4qPK1/nTax4RJ4VClNBdDpz9o3uh5KTQwz+2e3XFOn4=", "owner": "kaylorben", "repo": "nixcord", - "rev": "853aa014283c1d3e58df7213c36d3a739cab1b6f", + "rev": "1e20d00ccb0fd2ed9ae7a9cce953ea74c430f318", "type": "github" }, "original": { @@ -304,11 +306,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1776983936, - "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=", + "lastModified": 1774422943, + "narHash": "sha256-o1xgNumjljdBBfOrcQX95hhKGFOJQYNZqpF3EfaScMk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61", + "rev": "632e4bfc21c01e5be900d0d8255a5368a5d6082f", "type": "github" }, "original": { @@ -318,11 +320,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1777428379, - "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=", + "lastModified": 1773222311, + "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "755f5aa91337890c432639c60b6064bb7fe67769", + "rev": "0590cd39f728e129122770c029970378a79d076a", "type": "github" }, "original": { @@ -334,11 +336,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1777168982, - "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", "type": "github" }, "original": { @@ -361,11 +363,11 @@ }, "nixpkgs-nixcord": { "locked": { - "lastModified": 1777428379, - "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=", + "lastModified": 1773222311, + "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "755f5aa91337890c432639c60b6064bb7fe67769", + "rev": "0590cd39f728e129122770c029970378a79d076a", "type": "github" }, "original": { @@ -377,11 +379,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1777428379, - "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=", + "lastModified": 1774244481, + "narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "755f5aa91337890c432639c60b6064bb7fe67769", + "rev": "4590696c8693fea477850fe379a01544293ca4e2", "type": "github" }, "original": { @@ -392,11 +394,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1777718177, - "narHash": "sha256-qq56SczKpUNKcm8xdOsXYLzaX37p1bLS0fFaCMB7s3Y=", + "lastModified": 1774422283, + "narHash": "sha256-Hli+qOgWID+eatqY5KBaoj80hNyIbeTwiAr/SGrPHpg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e59d8bfa2cc42b1e1104595ac4292cfedce7f1a4", + "rev": "2b772c21c564364cfb5ea92c930178f0400a645c", "type": "github" }, "original": { @@ -407,11 +409,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1777578337, - "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": { @@ -422,11 +424,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { @@ -464,11 +466,11 @@ ] }, "locked": { - "lastModified": 1775228139, - "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=", + "lastModified": 1767810917, + "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", "owner": "nix-community", "repo": "NUR", - "rev": "601971b9c89e0304561977f2c28fa25e73aa7132", + "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", "type": "github" }, "original": { @@ -494,11 +496,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1777639980, - "narHash": "sha256-6d7Hdurvbjc5uwJuc0YiK7rZBGj6Gs3uzfBFcTs+xCc=", + "lastModified": 1774376228, + "narHash": "sha256-7oA0u4aghFjjIcIDKZ26NUpXH7hVXGPC0sI1OfK7NUk=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "64cdaeb06f69b6b769a492edd88b022ae88e8ca2", + "rev": "eabb84b771420b8396ab4bb4747694302d9be277", "type": "github" }, "original": { @@ -549,17 +551,18 @@ "nixpkgs": "nixpkgs_3", "nur": "nur", "systems": "systems", + "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1777580129, - "narHash": "sha256-6buSTzDtHYCJP1JNAIZCmgNcOs76oN03j+21CxdijVo=", + "lastModified": 1774124764, + "narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=", "owner": "danth", "repo": "stylix", - "rev": "20ff51f523e2dd67e5f31a321719d30708c1b771", + "rev": "e31c79f571c5595a155f84b9d77ce53a84745494", "type": "github" }, "original": { @@ -598,6 +601,23 @@ "type": "github" } }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, "tinted-kitty": { "flake": false, "locked": { @@ -617,11 +637,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1772661346, - "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=", + "lastModified": 1767710407, + "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", "owner": "tinted-theming", "repo": "schemes", - "rev": "13b5b0c299982bb361039601e2d72587d6846294", + "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", "type": "github" }, "original": { @@ -633,11 +653,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1772934010, - "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -649,11 +669,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1772909925, - "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { diff --git a/hosts/denkbrett/configuration.nix b/hosts/denkbrett/configuration.nix index 293d86e..c217277 100644 --- a/hosts/denkbrett/configuration.nix +++ b/hosts/denkbrett/configuration.nix @@ -43,6 +43,8 @@ systemd.services."ModemManager".wants = [ "NetworkManager.service" ]; systemd.services."ModemManager".wantedBy = [ "multi-user.target" ]; + programs.wireshark.enable = true; + boot.resumeDevice = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694"; boot.kernelParams = [ "resume_offset=7380652" @@ -59,6 +61,7 @@ pkgs.mqttui pkgs.mobile-broadband-provider-info pkgs.modem-manager-gui + pkgs.wireshark ]; # Bootloader. diff --git a/hosts/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix index 186c407..713da5d 100644 --- a/hosts/monosodium-glutamate-g/configuration.nix +++ b/hosts/monosodium-glutamate-g/configuration.nix @@ -32,9 +32,6 @@ "10-clock-rate" = { "context.properties" = { "default.clock.allowed-rates" = "[ 48000 44100 ]"; - "default.clock.quantum" = "128"; - "default.clock.min-quantum" = "32"; - "default.clock.max-quantum" = "256"; "log.level" = "4"; }; }; @@ -75,17 +72,20 @@ zenstates zenmonitor tea - # pkgsRocm.blender + blender-hip jdk8 jdk11 ]; programs = { + wireshark.enable = true; + wireshark.package = pkgs.wireshark-qt; seahorse.enable = true; }; 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/justfile b/justfile index b9d27b4..827e65e 100644 --- a/justfile +++ b/justfile @@ -9,9 +9,6 @@ test: init-live build: init-live sudo nixos-rebuild switch --flake . --log-format multiline -build-boot: init-live - sudo nixos-rebuild boot --flake . --log-format multiline - tbuild: init-live sudo nixos-rebuild switch --flake . --no-reexec --log-format multiline-with-logs --show-trace diff --git a/modules/desktop-legacy/gaming.nix b/modules/desktop-legacy/gaming.nix index a48353c..94f60fa 100644 --- a/modules/desktop-legacy/gaming.nix +++ b/modules/desktop-legacy/gaming.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: let @@ -14,22 +13,13 @@ with lib; }; config = mkIf cfg.enable { programs.steam.enable = true; - programs.gamemode.enable = true; - programs.gamescope = { - enable = true; - package = pkgs.gamescope.overrideAttrs (_: { - NIX_CFLAGS_COMPILE = [ "-fno-fast-math" ]; - }); - }; home-manager.users.jade = { pkgs, ... }: { home.packages = with pkgs; [ - gamemode prismlauncher dxvk_2 vkd3d-proton - mangohud ]; }; }; diff --git a/modules/desktop-legacy/social.nix b/modules/desktop-legacy/social.nix index 4da31e1..22f80f0 100644 --- a/modules/desktop-legacy/social.nix +++ b/modules/desktop-legacy/social.nix @@ -60,7 +60,6 @@ with lib; element-desktop pkgs.evolution-data-server-gtk4 deltachat-desktop - # stoat-desktop ]; }; programs.evolution = { diff --git a/modules/desktop/home/niri/kdl/privacy.kdl b/modules/desktop/home/niri/kdl/privacy.kdl index 5fba8f1..1190aeb 100644 --- a/modules/desktop/home/niri/kdl/privacy.kdl +++ b/modules/desktop/home/niri/kdl/privacy.kdl @@ -6,7 +6,6 @@ layer-rule { window-rule { match app-id="^signal|Element|org.gnome.Evolution$" match title="^.*(Discord|Beispiel Screenshare block Bug|Bitwarden|Träwelling).*$" - match app-id="steam" title="^notificationtoasts_[\\d]+_desktop$" exclude title="^.*((Schrottkatze|Statistics|Leaderboard) - Träwelling|chaos.social|Nekoverse|catgirl.cloud).*$" exclude is-floating=true block-out-from "screen-capture" diff --git a/modules/desktop/home/niri/kdl/quirks.kdl b/modules/desktop/home/niri/kdl/quirks.kdl index 86c018a..556dbc5 100644 --- a/modules/desktop/home/niri/kdl/quirks.kdl +++ b/modules/desktop/home/niri/kdl/quirks.kdl @@ -1,7 +1,6 @@ // handle steam grabbing focus 1000 times on startup -// Edit: FUCK YOU STEAM FUCK YOU STEAM FUCK YOU STEAM window-rule { - match app-id="steam" + match app-id="steam" title="Steam" open-focused false } diff --git a/modules/desktop/home/niri/kdl/style.kdl b/modules/desktop/home/niri/kdl/style.kdl index 59f658f..fccf795 100644 --- a/modules/desktop/home/niri/kdl/style.kdl +++ b/modules/desktop/home/niri/kdl/style.kdl @@ -1,3 +1,5 @@ +prefer-no-csd + cursor { xcursor-theme "phinger-cursors-dark" xcursor-size 32 diff --git a/modules/editors/helix/default.nix b/modules/editors/helix/default.nix index 408fef7..99170c7 100644 --- a/modules/editors/helix/default.nix +++ b/modules/editors/helix/default.nix @@ -10,6 +10,7 @@ pkgs.wl-clipboard-rs pkgs.nil pkgs.vscode-langservers-extracted + pkgs.nodePackages.typescript-language-server pkgs.emmet-language-server pkgs.jdt-language-server pkgs.tinymist diff --git a/modules/media/default.nix b/modules/media/default.nix index 3ef1a22..450040b 100644 --- a/modules/media/default.nix +++ b/modules/media/default.nix @@ -23,6 +23,7 @@ with lib; home.packages = with pkgs; [ # creative software basics pastel + krita gimp drawing inkscape-with-extensions diff --git a/modules/shell/elvish/lib/direnv.elv b/modules/shell/elvish/lib/direnv.elv index decc271..15babb0 100644 --- a/modules/shell/elvish/lib/direnv.elv +++ b/modules/shell/elvish/lib/direnv.elv @@ -1,7 +1,7 @@ ## hook for direnv set @edit:before-readline = $@edit:before-readline { try { - var m = [("direnv" export elvish | from-json)] + var m = [("/nix/store/kv03kmfwkinhv4ar2hvh79jfkm1n5id5-direnv-2.37.1/bin/direnv" export elvish | from-json)] if (> (count $m) 0) { set m = (all $m) keys $m | each { |k|