diff --git a/flake.lock b/flake.lock index 1ddf163..9e6983a 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1757075491, - "narHash": "sha256-a+NMGl5tcvm+hyfSG2DlVPa8nZLpsumuRj1FfcKb2mQ=", + "lastModified": 1756579987, + "narHash": "sha256-duCce8zGsaMsrqqOmLOsuaV1PVIw/vXWnKuLKZClsGg=", "owner": "nix-community", "repo": "home-manager", - "rev": "f56bf065f9abedc7bc15e1f2454aa5c8edabaacf", + "rev": "99a69bdf8a3c6bf038c4121e9c4b6e99706a187a", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1757183725, - "narHash": "sha256-oZaONTM5A7AhRaXvGr8PNyVL7qbFNIZpMXpsYdTOPmc=", + "lastModified": 1756630712, + "narHash": "sha256-Rzr++5ZpaGWTaXwYLcksUtclSH703XLpquLoLRoFdlI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "32d7f54892a516be2060a1e106cde7b47a733c62", + "rev": "dd88a1da72300083ff6ee4ad15fe30e7b2c7ad30", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1756926064, - "narHash": "sha256-5/1vyFRLvJWxhBgpPaV2orC0pjSgIny6JM6+joLyZok=", + "lastModified": 1756628420, + "narHash": "sha256-GWuU2XP+/72ybXSMXDugP3/qNbgyQWSFE9ZG5euk8cc=", "owner": "YaLTeR", "repo": "niri", - "rev": "c69464c1288789020d9a086f86c970a7dc49b8c7", + "rev": "db419b4fc7dbfb32a5c954502839c2331bcb4ecc", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1757020766, - "narHash": "sha256-PLoSjHRa2bUbi1x9HoXgTx2AiuzNXs54c8omhadyvp0=", + "lastModified": 1756469547, + "narHash": "sha256-YvtD2E7MYsQ3r7K9K2G7nCslCKMPShoSEAtbjHLtH0k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fe83bbdde2ccdc2cb9573aa846abe8363f79a97a", + "rev": "41d292bfc37309790f70f4c120b79280ce40af16", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -184,11 +184,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -204,11 +204,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1757175473, - "narHash": "sha256-zi5d9XZMqZwsnEOFn2mgNQTAVp7oifTNtdqAzSsNZbc=", + "lastModified": 1756630008, + "narHash": "sha256-weZiVKbiWQzTifm6qCxzhxghEu5mbh9mWNUdkzOLCR0=", "owner": "nix-community", "repo": "NUR", - "rev": "56a58305f2668b2d5519f64eaac93e8d1cef1827", + "rev": "f6a5a7b60dd6065e78ef06390767e689ffa3c23f", "type": "github" }, "original": { @@ -247,11 +247,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1757179758, - "narHash": "sha256-TIvyWzRt1miQj6Cf5Wy8Qz43XIZX7c4vTVwRLAT5S4Y=", + "lastModified": 1756570086, + "narHash": "sha256-vnbIvAqSt+hSd6blDc9IMvZKxAcHpqLhy25tDvosrug=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "970728d0d9d1eada342bb8860af214b601139e58", + "rev": "1d156aa8d30b124ff770488e5e34289a08ff4207", "type": "github" }, "original": { diff --git a/home-manager/config.kdl b/home-manager/config.kdl index 8537573..1dd2ee5 100644 --- a/home-manager/config.kdl +++ b/home-manager/config.kdl @@ -14,7 +14,6 @@ input { // For example: layout "ch" - options "compose:rctrl" // options "grp:win_space_toggle,compose:ralt,ctrl:nocaps" } } @@ -97,10 +96,6 @@ input { position x=1280 y=0 } -output "Samsung Electric Company LC27G7xT H1AK500000" { - // variable-refresh-rate -} - // Settings that influence how windows are positioned and sized. // Find more information on the wiki: // https://github.com/YaLTeR/niri/wiki/Configuration:-Layout @@ -251,7 +246,9 @@ layout { // Note that running niri as a session supports xdg-desktop-autostart, // which may be more convenient to use. // See the binds section below for more spawn examples. +spawn-at-startup "xwayland-satellite" environment { + DISPLAY ":0" ELECTRON_OZONE_PLATFORM_HINT "auto" } @@ -260,7 +257,7 @@ environment { // Additionally, clients will be informed that they are tiled, removing some client-side rounded corners. // This option will also fix border/focus ring drawing behind some semitransparent windows. // After enabling or disabling this, you need to restart the apps for this to take effect. -prefer-no-csd +// prefer-no-csd // You can change the path where screenshots are saved. // A ~ at the front will be expanded to the home directory. @@ -323,17 +320,6 @@ window-rule { clip-to-geometry true } -window-rule { - match app-id="Spotify" - open-on-output "Samsung Electric Company SMS24A450/460 HVMBA01140" -} - - -window-rule { - match app-id="discord" - open-on-output "Lenovo Group Limited LEN G25-10 U4B30R14" -} - binds { // Keys consist of modifiers separated by + signs, followed by an XKB key name // in the end. To find an XKB name for a particular key, you may use a program @@ -364,9 +350,6 @@ binds { XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; } XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; } XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; } - XF86AudioPlay allow-when-locked=true { spawn "playerctl" "play-pause"; } - XF86AudioPrev allow-when-locked=true { spawn "playerctl" "previous"; } - XF86AudioNext allow-when-locked=true { spawn "playerctl" "next"; } Mod+Q { close-window; } diff --git a/home-manager/home.nix b/home-manager/home.nix index afc330b..76070f4 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -50,9 +50,8 @@ in obsidian prismlauncher spotify - rustup # rustup from nix for rust :) - gamescope # so i can put it in steam startup command lines - wl-clipboard + # rustup from nix for rust :) + rustup (pkgs.writeShellApplication { name = "lock-and-power-off-screen"; text = '' diff --git a/home-manager/waybar.nix b/home-manager/waybar.nix index 7ff41bf..1190ca8 100644 --- a/home-manager/waybar.nix +++ b/home-manager/waybar.nix @@ -88,7 +88,7 @@ format = " {status}"; format-disabled = ""; # an empty format will hide the module format-connected = " {num_connections} connected"; - on-click = lib.getExe' pkgs.blueberry "blueberry"; + on-click = lib.getExe pkgs.blueberry; }; pulseaudio = { # "scroll-step": 1, // %, can be a float diff --git a/nixos/desktop.nix b/nixos/desktop.nix index cdfffa4..d638775 100644 --- a/nixos/desktop.nix +++ b/nixos/desktop.nix @@ -82,7 +82,6 @@ environment.systemPackages = with pkgs; [ tailscale os-prober - usbutils # steam client logs complain about lsusb ]; networking.firewall = {