From 6a22db2f12329221c74fe2092e3a76d02339d21b Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Wed, 9 Apr 2025 15:06:48 -0400 Subject: [PATCH] niri and session vars --- flake.lock | 60 ++++++------------- homes/emenel/default.nix | 2 + modules/home/niri.nix | 5 -- modules/home/shell-conf.nix | 3 + .../bitwig-studio5-3-unwrapped.nix | 6 +- 5 files changed, 27 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index 92d7c2a..33c87aa 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1744129624, - "narHash": "sha256-4l8Sy5bb4qWruXO9XNGiDlhan63hHPH1PWdFzh4wzQE=", + "lastModified": 1744218590, + "narHash": "sha256-C4fQbqgiRN5hpM4oUnvm/xYAPXeT1tNvMqVKwQU4iEI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1a0e36d797582e1a3fc82a36f151ef3d9409fd3c", + "rev": "8d01f801846716f6ec32547c32d3f09a31ef3f05", "type": "github" }, "original": { @@ -354,15 +354,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" + ] }, "locked": { - "lastModified": 1744127405, - "narHash": "sha256-Cqkmsb3CDcUREjszRe2/qkvztFzEujkaaqV5/nqfdlk=", + "lastModified": 1744208565, + "narHash": "sha256-vG3JJOar/r8ognz7wuwMtOJ8Knu1MMlOzHB1N6R2MbY=", "owner": "nix-community", "repo": "home-manager", - "rev": "fefb6ae1b301b620a81645789e19945092b079da", + "rev": "542efdf2dfac351498f534eb71671525b9bd45ed", "type": "github" }, "original": { @@ -745,11 +744,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1744068309, - "narHash": "sha256-4RAoQhztUI+M3XKzINEozxXWom4HOr+rvVfYaHk1Brw=", + "lastModified": 1744170273, + "narHash": "sha256-r4Nu/TlnNGsNDLy/lOggGewVupLC2T1sQqmbbNv4yHw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b1beb4d118baf1a31c9744ab58402ff9eeb6a333", + "rev": "94b2a1a84883e45d97e07b415e8785938d5a5da7", "type": "github" }, "original": { @@ -1014,11 +1013,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1743975612, - "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=", + "lastModified": 1744168086, + "narHash": "sha256-S9M4HddBCxbbX1CKSyDYgZ8NCVyHcbKnBfoUXeRu2jQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928", + "rev": "60e405b241edb6f0573f3d9f944617fe33ac4a73", "type": "github" }, "original": { @@ -1076,11 +1075,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1743964447, - "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=", + "lastModified": 1744098102, + "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", + "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", "type": "github" }, "original": { @@ -1410,27 +1409,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "home-manager", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743748085, - "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "uv2nix": { "inputs": { "nixpkgs": [ @@ -1584,11 +1562,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1744112829, - "narHash": "sha256-oxO7nT4AZJilxA2DliYk57NETHu78xQ8nFdV+UwyKHE=", + "lastModified": 1744215954, + "narHash": "sha256-7hynNio9B/AiOYK0/yilaq3QwJIeqWhGQRVn5j1f2XQ=", "owner": "sxyazi", "repo": "yazi", - "rev": "99ea3b74c4260a724b43af812df0f68ef59395b7", + "rev": "7cc250180f61e0e4e8a5d0aa0271d31c3fc797b7", "type": "github" }, "original": { diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index 0e1fa6d..615dc3a 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -151,11 +151,13 @@ startServices = "sd-switch"; # auto reload services when home is rebuilt sessionVariables = { GSK_RENDERER = "ngl"; + QT_QPA_PLATFORM = "xcb"; MOZ_ENABLE_WAYLAND = 1; XCURSOR_SIZE = 32; XCURSOR_THEME = "Bibata-Modern-Classic"; DISPLAY = ":0"; WAYLAND_DISPLAY="wayland-1"; + ELECTRON_OZONE_PLATFORM_HINT = "auto"; }; }; diff --git a/modules/home/niri.nix b/modules/home/niri.nix index 3422f9c..45ffa60 100644 --- a/modules/home/niri.nix +++ b/modules/home/niri.nix @@ -13,7 +13,6 @@ in programs = { niri = { settings = { - # hotkey-overlay.skip-at-startup = true; screenshot-path = "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"; prefer-no-csd = true; @@ -93,12 +92,8 @@ in environment = { DISPLAY = ":0"; - QT_QPA_PLATFORM = "xcb"; XDG_CURRENT_DESKTOP = "niri"; XDG_SESSION_TYPE = "wayland"; - MOZ_ENABLE_WAYLAND = "1"; - ELECTRON_OZONE_PLATFORM_HINT = "auto"; - EDITOR = "emacsclient -r -n"; }; cursor = { diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix index c414eb8..022b456 100644 --- a/modules/home/shell-conf.nix +++ b/modules/home/shell-conf.nix @@ -78,6 +78,9 @@ ]; programs = { + bash = { + enable = true; + }; nix-index = { enable = true; enableFishIntegration = true; diff --git a/packages/bitwig-studio/bitwig-studio5-3-unwrapped.nix b/packages/bitwig-studio/bitwig-studio5-3-unwrapped.nix index df80b81..cac58a4 100644 --- a/packages/bitwig-studio/bitwig-studio5-3-unwrapped.nix +++ b/packages/bitwig-studio/bitwig-studio5-3-unwrapped.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio5-3-unwrapped"; - version = "5.3"; + version = "5.3.5"; src = fetchurl { - url = "https://downloads-secure.bitwig.com/5.3.1/bitwig-studio-5.3.1.deb?__token__=st=1740197111.0~exp=1740197711.0~hmac=2e5de6388d4f0df89ed9cbbfa8735ff21c6792a818f061eccd8bbe54438a61cf&source_url=/dl/Bitwig%20Studio/5.3.1/installer_linux/"; - sha256 = "sha256-mxodFCu4SDzofnoZZZ7TPDUIrRc3UJt8TuEBwDOo2wQ="; + url = "https://downloads-secure.bitwig.com/5.3.5/bitwig-studio-5.3.5.deb?__token__=st=1744219621.0~exp=1744220221.0~hmac=26cea3c7a55d59f7e0748e41ac78f7874c17edd82aa2fc7b2b43a041887cd13e&source_url=/dl/Bitwig%20Studio/5.3.5/installer_linux/"; + sha256 = "sha256-dfEWOQTZVMUb6v+u2wQlFgTXupokFTjWgKKA6W/Rrzc="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];