diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock
index 763f981..2c7cd0e 100644
--- a/etcnixos/flake.lock
+++ b/etcnixos/flake.lock
@@ -49,11 +49,11 @@
},
"crane": {
"locked": {
- "lastModified": 1728776144,
- "narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=",
+ "lastModified": 1730060262,
+ "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=",
"owner": "ipetkov",
"repo": "crane",
- "rev": "f876e3d905b922502f031aeec1a84490122254b7",
+ "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76",
"type": "github"
},
"original": {
@@ -233,11 +233,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
- "lastModified": 1729064530,
- "narHash": "sha256-oSr/w/5dvf/8ll6NvQlL7+rrK8wzjIcEMP1LvI4Ag08=",
+ "lastModified": 1730107060,
+ "narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=",
"owner": "nix-community",
"repo": "lanzaboote",
- "rev": "2fa1368f938b50e35ca87334b5aeba38a3402165",
+ "rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2",
"type": "github"
},
"original": {
@@ -271,11 +271,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1729742320,
- "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=",
+ "lastModified": 1730161780,
+ "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda",
+ "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8",
"type": "github"
},
"original": {
@@ -287,11 +287,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1729878015,
- "narHash": "sha256-CNWmKiA00tGw+N+fDnt4+JfLF500oofJ7BikcVxg0zw=",
+ "lastModified": 1730218704,
+ "narHash": "sha256-rAurlpnoe4bbg73RZRHjnAwVtz2LBWH/uEi9UY2sQyQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6dbbd5a2622d9abf9263a5cb0a85ca218974b085",
+ "rev": "963f723f4c5cf8267e0798630705eb87c1ac33fb",
"type": "github"
},
"original": {
@@ -331,11 +331,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1728778939,
- "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
+ "lastModified": 1729104314,
+ "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
+ "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
"type": "github"
},
"original": {
@@ -362,11 +362,11 @@
]
},
"locked": {
- "lastModified": 1728959392,
- "narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=",
+ "lastModified": 1729996302,
+ "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b",
+ "rev": "a1b337569f334ff0a01b57627f17b201d746d24c",
"type": "github"
},
"original": {
@@ -392,11 +392,11 @@
},
"wivrn": {
"locked": {
- "lastModified": 1729447101,
- "narHash": "sha256-+amYWj/GpgYyYU1R2TTojPAXMNbCr93DVgVGcdIXgaQ=",
+ "lastModified": 1729988849,
+ "narHash": "sha256-5t+ZPFtNPpcNi02JOKLtvT0wx2IcaTWatJlJCb+rf0o=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "1c41a27405aa44b94ba10c2002c20209e4911ff5",
+ "rev": "adeeaf07e2742999b826a3126edd6ef366766464",
"type": "github"
},
"original": {
diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix
index ebadbc8..527bce2 100644
--- a/etcnixos/vr.nix
+++ b/etcnixos/vr.nix
@@ -5,17 +5,7 @@
openFirewall = true;
# WiVRn 0.20
- package = (
- inputs.wivrn.legacyPackages.${pkgs.system}.wivrn.overrideAttrs (old: {
- patches = [
- # Fixes build, see: https://github.com/NixOS/nixpkgs/pull/350069#issuecomment-2425149854
- (pkgs.fetchurl {
- url = "https://github.com/WiVRn/WiVRn/commit/d85916b6aaba3b4e9a7367e973b14f60507701fd.diff";
- sha256 = "vm25kWfu2q1d7lL1zW8FNDUxUn25YpuoEYFbNChCWas=";
- })
- ];
- })
- );
+ package = inputs.wivrn.legacyPackages.${pkgs.system}.wivrn.overrideAttrs;
# Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications
# will automatically read this and work with wivrn
diff --git a/home-manager/flake.lock b/home-manager/flake.lock
index 1c568ab..23a6986 100644
--- a/home-manager/flake.lock
+++ b/home-manager/flake.lock
@@ -72,11 +72,11 @@
]
},
"locked": {
- "lastModified": 1729864948,
- "narHash": "sha256-CeGSqbN6S8JmzYJX/HqZjr7dMGlvHLLnJJarwB45lPs=",
+ "lastModified": 1730016908,
+ "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "0c0268a3c80d30b989d0aadbd65f38d4fa27a9a0",
+ "rev": "e83414058edd339148dc142a8437edb9450574c8",
"type": "github"
},
"original": {
@@ -98,11 +98,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
- "lastModified": 1729841254,
- "narHash": "sha256-KywrT/D1yMOLxc2xDJAPx9Z+qVoQw5rCScQR/lU3NTc=",
+ "lastModified": 1730208970,
+ "narHash": "sha256-Rz6l5qHcMZ8YfPfoFaC1GTVP2LaYjrjy85eH/2cxxQI=",
"owner": "sodiboo",
"repo": "niri-flake",
- "rev": "d7c058c0c0b8cd5b799a3a3ac4f8a1090454155e",
+ "rev": "7e336c90d8e6ff2ea4b7f1db599cdf529a137770",
"type": "github"
},
"original": {
@@ -131,11 +131,11 @@
"niri-unstable": {
"flake": false,
"locked": {
- "lastModified": 1729744939,
- "narHash": "sha256-QbfaNQa93yt4KKg5XNi1tUIfGoDIohxFp/PmHi8sruU=",
+ "lastModified": 1730139178,
+ "narHash": "sha256-qivw/zu3aaRl8g3Y3VGpu1WwGr6/uPehIP8K4YTsirg=",
"owner": "YaLTeR",
"repo": "niri",
- "rev": "c8044a9b5dbdb3e0648c86a00bfb63acfc06a559",
+ "rev": "6ecbf2db8a31484fe88b8faa399b9832da6c8a6a",
"type": "github"
},
"original": {
@@ -146,11 +146,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1729878015,
- "narHash": "sha256-CNWmKiA00tGw+N+fDnt4+JfLF500oofJ7BikcVxg0zw=",
+ "lastModified": 1730220530,
+ "narHash": "sha256-CRihEEXQNWxeo1uYmXWFR5RGUFiABbhFvuYX4RKX1J0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6dbbd5a2622d9abf9263a5cb0a85ca218974b085",
+ "rev": "885c7a77d4d1762cf456d4a7a77cb7061d412221",
"type": "github"
},
"original": {
@@ -174,11 +174,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1729691686,
- "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=",
+ "lastModified": 1730137625,
+ "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37",
+ "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
"type": "github"
},
"original": {
@@ -205,11 +205,11 @@
]
},
"locked": {
- "lastModified": 1729823394,
- "narHash": "sha256-RiinJqorqSLKh1oSpiMHnBe6nQdJzE45lX6fSnAuDnI=",
+ "lastModified": 1730169013,
+ "narHash": "sha256-rvgF03ODu1uEYbdEsloN4fQrJ+k1NOv/7MJvCpHHnBk=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "7e52e80f5faa374ad4c607d62c6d362589cb523f",
+ "rev": "92eb1268cc19609f2fe24311b871f37bf3dc5afd",
"type": "github"
},
"original": {
@@ -253,11 +253,11 @@
"xwayland-satellite-unstable": {
"flake": false,
"locked": {
- "lastModified": 1729838433,
- "narHash": "sha256-o9D859STqawTSe6mkXpm3xR/gitYgOHy32xOhOfT3vw=",
+ "lastModified": 1730166465,
+ "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
- "rev": "67efa2c559b53d3ca90c131c06c247278783880d",
+ "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98",
"type": "github"
},
"original": {
@@ -268,16 +268,16 @@
},
"zen-browser": {
"locked": {
- "lastModified": 1729379018,
- "narHash": "sha256-lyGz9ul5QzJ40tUNXlHyvVowz3tbCgUPdfoi6ogq+DY=",
- "owner": "matthewpi",
+ "lastModified": 1730058145,
+ "narHash": "sha256-msuIkiOd3D2bz/4zzCIKsoVDMp822HyMjE7s46nMX2Q=",
+ "owner": "NixOS",
"repo": "nixpkgs",
- "rev": "d607bf5d03a31601893680192c85eec359649ea2",
+ "rev": "f7aceec47e062f753d0c53ca245da58576997354",
"type": "github"
},
"original": {
- "owner": "matthewpi",
- "ref": "zen-browser",
+ "owner": "NixOS",
+ "ref": "pull/347222/head",
"repo": "nixpkgs",
"type": "github"
}
diff --git a/home-manager/flake.nix b/home-manager/flake.nix
index b99e053..ae5106d 100644
--- a/home-manager/flake.nix
+++ b/home-manager/flake.nix
@@ -28,7 +28,7 @@
zen-browser = {
# https://github.com/NixOS/nixpkgs/pull/347222
- url = "github:matthewpi/nixpkgs/zen-browser";
+ url = "github:NixOS/nixpkgs/pull/347222/head";
};
};
diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix
index 15524e3..eba8111 100644
--- a/home-manager/progs/niri.nix
+++ b/home-manager/progs/niri.nix
@@ -21,7 +21,7 @@
};
spawn-at-startup = [
- # waybar
+ # waybar (status bar)
{ command = [ "${pkgs.waybar}/bin/waybar" ]; }
# swaybg works on more than just sway (sets a wallpaper)
@@ -47,18 +47,27 @@
window-rules = [
{ draw-border-with-background = false; }
{
- geometry-corner-radius = {
- top-left = 10.0;
- top-right = 10.0;
- bottom-right = 10.0;
- bottom-left = 10.0;
- };
+ geometry-corner-radius =
+ let
+ radius = 10.0;
+ in
+ {
+ top-left = radius;
+ top-right = radius;
+ bottom-right = radius;
+ bottom-left = radius;
+ };
}
{ clip-to-geometry = true; }
];
+ # https://github.com/sodiboo/niri-flake/issues/591
+ # switch-events = with config.lib.niri.actions; {
+ # "lid-close" = spawn [ "${pkgs.swaylock}/bin/swaylock"];
+ # };
+
binds = with config.lib.niri.actions; {
- # application launcher
+ # Application launcher
"Mod+Space".action = spawn [
"${pkgs.rofi-wayland}/bin/rofi"
"-show"
@@ -82,37 +91,38 @@
"-u"
"up"
];
+
"XF86AudioLowerVolume".action = spawn [
"${pkgs.avizo}/bin/volumectl"
"-u"
"down"
];
+
"XF86AudioMute".action = spawn [
"${pkgs.avizo}/bin/volumectl"
"toggle-mute"
];
- "XF86AudioMicMute".action = spawn [
- "${pkgs.avizo}/bin/volumectl"
- "-m"
- "toggle-mute"
- ];
#Display Brightness control
"XF86MonBrightnessUp".action = spawn [
"${pkgs.avizo}/bin/lightctl"
"up"
];
+
"XF86MonBrightnessDown".action = spawn [
"${pkgs.avizo}/bin/lightctl"
"down"
];
+ # "Framework" key (F12)
+ # "XF86AudioMedia".action = spawn [];
+
# Force close a window
"Mod+Q".action = close-window;
"Mod+Shift+Q".action = quit;
- # bindings for like window management ig
+ # bindings for window management
"Mod+Left".action = focus-column-left;
"Mod+Down".action = focus-window-down;
@@ -177,7 +187,7 @@
"Mod+Ctrl+U".action = move-column-to-workspace-down;
"Mod+Ctrl+I".action = move-column-to-workspace-up;
- #does little squeeze thing into the left or right position with another window
+ # does little squeeze thing into the left or right position with another window
"Mod+BracketLeft".action = consume-or-expel-window-left;
"Mod+BracketRight".action = consume-or-expel-window-right;
diff --git a/home-manager/progs/waybar.nix b/home-manager/progs/waybar.nix
index 0ee2610..5b3f0ed 100644
--- a/home-manager/progs/waybar.nix
+++ b/home-manager/progs/waybar.nix
@@ -11,9 +11,10 @@
margin-bottom = -1;
# passthrough = false;
height = 32;
- modules-left =
- [
- ];
+ modules-left = [
+ "niri/workspaces"
+ "niri/window"
+ ];
modules-center = [ "clock" ];
modules-right = [
"cpu"
@@ -24,11 +25,27 @@
"network"
"battery"
];
+
+ "niri/workspaces" = {
+ format = "{icon}";
+ format-icons = {
+
+ # Icons by state
+ active = "";
+ default = "";
+ };
+ };
+
+ "niri/window" = {
+ format = "{}";
+ };
+
cpu = {
interval = 5;
format = " {usage}%";
max-length = 10;
};
+
memory = {
interval = 10;
format = " {percentage}%";
@@ -36,10 +53,12 @@
tooltip = true;
tooltip-format = "RAM - {used:0.1f}GiB used";
};
+
tray = {
icon-size = 18;
spacing = 3;
};
+
clock = {
format = " {:%R\n %d.%m.%Y}";
tooltip-format = "{calendar}";
@@ -57,6 +76,7 @@
today = "{}";
};
};
+
actions = {
on-click-right = "mode";
on-click-forward = "tz_up";
diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix
index 6d469ec..d83ef97 100644
--- a/home-manager/system-mreow.nix
+++ b/home-manager/system-mreow.nix
@@ -22,10 +22,14 @@
wdisplays
intel-gpu-tools
+ blueman
+
# used by /etc/nixos logic to launch niri
config.programs.niri.package
];
+ services.blueman-applet.enable = true;
+
# media controls
systemd.user.services.mpris-proxy = {
Unit.Description = "Mpris proxy";