diff --git a/common.nix b/common.nix index c8cc674..4f63327 100644 --- a/common.nix +++ b/common.nix @@ -68,6 +68,8 @@ with builtins; ungoogled-chromium scc speedtest-rs + + (pkgs.callPackage ./programs/edname.nix {}) ]; }; diff --git a/hosts/denkbrett/modules/input.nix b/hosts/denkbrett/modules/input.nix index f4c9c0b..12a7b9e 100644 --- a/hosts/denkbrett/modules/input.nix +++ b/hosts/denkbrett/modules/input.nix @@ -28,6 +28,7 @@ devices."AT Translated Set 2 keyboard" = default; devices."Razer Razer Huntsman" = default; devices."Razer Razer DeathAdder V2" = default; + devices."Microsoft Microsoft Ergonomic Keyboard" = default; }; hardware.trackpoint = { diff --git a/hosts/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix index 95a94e2..713da5d 100644 --- a/hosts/monosodium-glutamate-g/configuration.nix +++ b/hosts/monosodium-glutamate-g/configuration.nix @@ -78,6 +78,7 @@ ]; programs = { wireshark.enable = true; + wireshark.package = pkgs.wireshark-qt; seahorse.enable = true; }; diff --git a/justfile b/justfile index 4666fa8..827e65e 100644 --- a/justfile +++ b/justfile @@ -1,12 +1,15 @@ upgrade: update build -test: +init-live: + touch ~/.config/niri/live.kdl + +test: init-live sudo nixos-rebuild test --flake . --log-format multiline -build: +build: init-live sudo nixos-rebuild switch --flake . --log-format multiline -tbuild: +tbuild: init-live sudo nixos-rebuild switch --flake . --no-reexec --log-format multiline-with-logs --show-trace update: diff --git a/modules/desktop/home/default.nix b/modules/desktop/home/default.nix index 55cb35d..28f036e 100644 --- a/modules/desktop/home/default.nix +++ b/modules/desktop/home/default.nix @@ -30,6 +30,7 @@ pkgs.bemoji pkgs.librsvg pkgs.cairo + pkgs.xwayland-satellite ]; services.gpg-agent = { diff --git a/modules/desktop/home/niri/default.nix b/modules/desktop/home/niri/default.nix index af46172..dbc5557 100644 --- a/modules/desktop/home/niri/default.nix +++ b/modules/desktop/home/niri/default.nix @@ -2,6 +2,10 @@ # else it will be ugly { pkgs, lib, ... }: { + home.packages = with pkgs; [ + zenity + xwayland-satellite + ]; home.file."config" = let kdlfiles = @@ -10,23 +14,9 @@ |> lib.mapAttrsToList (filename: _value: "include \"${./kdl}/${filename}\""); startups = [ - [ - "eww" - "open-many" - "topBar" - "bottomBar" - ] - [ - "${pkgs.swaybg}/bin/swaybg" - "-i" - "${./wallpaper.jpg}" - "-m" - "fill" - ] - [ - "touch" - ".config/niri/live.kdl" - ] + [ "eww" "open-many" "topBar" "bottomBar" ] + [ "${pkgs.swaybg}/bin/swaybg" "-i" "${./wallpaper.jpg}" "-m" "fill" ] + [ "touch" ".config/niri/live.kdl" ] ] |> map (map (word: "\"${word}\"")) |> map (lib.concatStringsSep " ") diff --git a/modules/desktop/home/niri/kdl/quirks.kdl b/modules/desktop/home/niri/kdl/quirks.kdl index ecf8e75..556dbc5 100644 --- a/modules/desktop/home/niri/kdl/quirks.kdl +++ b/modules/desktop/home/niri/kdl/quirks.kdl @@ -23,10 +23,20 @@ window-rule { } window-rule { - match app-id="vesktop" is-floating=true title="vesktop" - geometry-corner-radius 5 + match app-id="chromium-browser" + geometry-corner-radius 6 6 1 1 +} + +window-rule { + match app-id="vesktop" is-floating=true + geometry-corner-radius 6 } environment { ELECTRON_OZONE_PLATFORM_HINT "auto" } + +window-rule { + match app-id="zenity" + geometry-corner-radius 16 +} diff --git a/modules/desktop/home/niri/kdl/screenshot.kdl b/modules/desktop/home/niri/kdl/screenshot.kdl index 9458bdc..f99e15c 100644 --- a/modules/desktop/home/niri/kdl/screenshot.kdl +++ b/modules/desktop/home/niri/kdl/screenshot.kdl @@ -1,9 +1,6 @@ screenshot-path "~/Pictures/screenshots/%Y-%m-%dT%H:%M:%S.png" binds { - Ctrl+Print { screenshot-screen; } Mod+Ctrl+S { screenshot-screen; } Mod+Shift+S { screenshot-window; } - Shift+Print { screenshot-window; } Mod+S { screenshot; } - Print { screenshot; } } diff --git a/modules/shell/btop.nix b/modules/shell/btop.nix index fa05556..39b96dc 100644 --- a/modules/shell/btop.nix +++ b/modules/shell/btop.nix @@ -5,6 +5,7 @@ { programs.btop = { enable = true; + package = pkgs.btop-rocm; settings = { shown_boxes = "cpu mem net proc gpu0"; color_theme = "gruvbox_dark"; 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"; + }; +}