diff --git a/flake.lock b/flake.lock index b6a9b09..642ddd0 100644 --- a/flake.lock +++ b/flake.lock @@ -456,11 +456,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1790294696, - "narHash": "sha256-bA+hNskqF72V2rv7UAR1xEObZRPi9ttpNlWxEMBI4jI=", + "lastModified": 1790381013, + "narHash": "sha256-vE1BM9nWfusQ437QX9beTLhs5S2zAvdlmnrT9XYbacs=", "ref": "refs/heads/main", - "rev": "2eec2d4c88015d35a4708b8df5ca48833ad8a9e7", - "revCount": 199, + "rev": "926ca86fab82738fd1461b022ee11b4d61b9bf2e", + "revCount": 200, "type": "git", "url": "https://codeberg.org/bananad3v/niri-nix" }, @@ -494,11 +494,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1790269524, - "narHash": "sha256-Hbyo311JiH9JjdCDKcA0/81LGyQ1fEiD/roeX/jQoDc=", + "lastModified": 1790353586, + "narHash": "sha256-oEvDG8PTqiy6lvKKWj9D+XZyPzYcl4rm5Qs7qKR0pSk=", "owner": "YaLTeR", "repo": "niri", - "rev": "c3e25664b36f820ae7d4ec9eecfbdd26bd1db088", + "rev": "1f03391ea644c2a43597de7f637269e26d1e1b49", "type": "github" }, "original": { @@ -507,18 +507,36 @@ "type": "github" } }, + "nix-index-database": { + "inputs": { + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1790499302, + "narHash": "sha256-Gbf/U9ptJhQh0qnDnJ/+a8MAcq1HXunbArUTHR2wNYk=", + "owner": "nix-community", + "repo": "nix-index-database", + "rev": "161d7c91accd93034bb3c295224d9d895a778573", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-index-database", + "type": "github" + } + }, "nix-minecraft": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "systems": "systems" }, "locked": { - "lastModified": 1790310854, - "narHash": "sha256-QuU33Sw5IjLKKq8xitpNSHnOUTgjTG9ZQdqOdIRz4F8=", + "lastModified": 1790571597, + "narHash": "sha256-YEZ+5EcNKF9eMstUgNMuwbAkezsgn6Gmu9+/YIPb6ts=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "8945905e42ce06b68464fcd7614937bb382a95f2", + "rev": "c2e3197abc8360366fc8fb5c928b37a2b047f674", "type": "github" }, "original": { @@ -529,7 +547,7 @@ }, "nix-monitored": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1778497292, @@ -547,14 +565,14 @@ }, "nix-vscode-extensions": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1790310797, - "narHash": "sha256-wp0ffhJ3ntGzTqqgqRajIcUceMVdzTr27kvdf8UdV+Y=", + "lastModified": 1790570935, + "narHash": "sha256-meDjn8IvYZpLxQpYOPB14+U/RI7/IbAT3JdMI9f0zMY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "86c56105e1e11b1d2a927e93bda8801088747aa2", + "rev": "8df87d543439ecba7eb58a10ac34e0760ae1a078", "type": "github" }, "original": { @@ -583,17 +601,17 @@ "inputs": { "flake-compat": "flake-compat_3", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "nvfetcher": "nvfetcher", "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1790307420, - "narHash": "sha256-UTlAWirXPkYPuMzdj2wMIckzIEWAErEK0dfh/l8hVbU=", + "lastModified": 1790567521, + "narHash": "sha256-Y2rDjx0Hzm8gY2eI0XNu9C9AbZI6fBmQ54GeqrnrKlU=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "cc334615aaa435a199ae6d344a0604580da5813b", + "rev": "7fd66fd13a4126588547264afce7125f93832afe", "type": "github" }, "original": { @@ -604,11 +622,27 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1790218706, - "narHash": "sha256-6e4Na3z008XpdVyOXgfasXIn1aN+z8AXFG+jXdQSyuI=", + "lastModified": 1784564315, + "narHash": "sha256-7OpsHHIZFUBLbeHNQ0oC40DZRQjsmGWodXge+OqgPgk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0c2094806c9e542f31785ef3569ab9e900e3ce9c", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0c2094806c9e542f31785ef3569ab9e900e3ce9c", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1790533781, + "narHash": "sha256-F+b8u43BVF5DlM0pz7JQSbtbwKy5PrHIT5zQUekXsD0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c508844df6c28fa6dabc1b6af70f3ccbd65c5201", + "rev": "cf5e76507c6e23b59f7e0ffcc7baa2a39ddd8442", "type": "github" }, "original": { @@ -618,13 +652,13 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { - "lastModified": 1790185690, - "narHash": "sha256-xJ+X4hBtOcAFGBOe5nAMyMUeF9foJBmIOu3NjBqBycU=", + "lastModified": 1790463110, + "narHash": "sha256-hKlVl12B1dF0Q5vd9dY3lIJM5mFGWYSlXwSLAqHZ1+s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4975466d324710c576dc11ad614684e6bd8cad8e", + "rev": "e158d9ed9b51c98974c5e66e1ba1c9e0255fecaa", "type": "github" }, "original": { @@ -634,39 +668,39 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { - "lastModified": 1789785513, - "narHash": "sha256-BMbikTjbh5H7ac/OjwGoJrlooh4dgNqhs51ABM83M7g=", - "rev": "20b1ddd1aa5ace70c9468305030aa4f9ef79671b", + "lastModified": 1790323409, + "narHash": "sha256-m4DGo58Fza5ImOegtWOeE18nhpSO1IGzsVA6Lpsb4zw=", + "rev": "e94cb152ed51bd6e24eb4a41f1460252beb52cd2", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1076192.20b1ddd1aa5a/nixexprs.tar.zst" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1079315.e94cb152ed51/nixexprs.tar.zst" }, "original": { "type": "tarball", "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { - "lastModified": 1789785513, - "narHash": "sha256-BMbikTjbh5H7ac/OjwGoJrlooh4dgNqhs51ABM83M7g=", - "rev": "20b1ddd1aa5ace70c9468305030aa4f9ef79671b", + "lastModified": 1790323409, + "narHash": "sha256-m4DGo58Fza5ImOegtWOeE18nhpSO1IGzsVA6Lpsb4zw=", + "rev": "e94cb152ed51bd6e24eb4a41f1460252beb52cd2", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1076192.20b1ddd1aa5a/nixexprs.tar.zst" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1079315.e94cb152ed51/nixexprs.tar.zst" }, "original": { "type": "tarball", "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { - "lastModified": 1790185690, - "narHash": "sha256-xJ+X4hBtOcAFGBOe5nAMyMUeF9foJBmIOu3NjBqBycU=", + "lastModified": 1790463110, + "narHash": "sha256-hKlVl12B1dF0Q5vd9dY3lIJM5mFGWYSlXwSLAqHZ1+s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4975466d324710c576dc11ad614684e6bd8cad8e", + "rev": "e158d9ed9b51c98974c5e66e1ba1c9e0255fecaa", "type": "github" }, "original": { @@ -676,13 +710,13 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_16": { "locked": { - "lastModified": 1789724158, - "narHash": "sha256-nlKgrm0dsVhOSopKheVBCcOpiIticufPPVLdVOI0euA=", + "lastModified": 1790480522, + "narHash": "sha256-fXrm/q9klVBtVq5rGQ+XpI/dokPuSB15ZK2CZvWxXOk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0a3468a402c449992505b6a9fc5b06580141b750", + "rev": "8d5d270900d3fc75655ea2d9d248b234f6631439", "type": "github" }, "original": { @@ -692,7 +726,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_17": { "locked": { "lastModified": 1781216227, "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=", @@ -708,7 +742,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_18": { "locked": { "lastModified": 1789286504, "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", @@ -803,15 +837,15 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", - "owner": "nixos", + "lastModified": 1790463110, + "narHash": "sha256-hKlVl12B1dF0Q5vd9dY3lIJM5mFGWYSlXwSLAqHZ1+s=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "e158d9ed9b51c98974c5e66e1ba1c9e0255fecaa", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -819,15 +853,15 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1777954456, - "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", - "owner": "NixOS", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -835,30 +869,30 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1784564315, - "narHash": "sha256-7OpsHHIZFUBLbeHNQ0oC40DZRQjsmGWodXge+OqgPgk=", - "owner": "nixos", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c2094806c9e542f31785ef3569ab9e900e3ce9c", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "0c2094806c9e542f31785ef3569ab9e900e3ce9c", "type": "github" } }, "noctalia": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1790364966, - "narHash": "sha256-RK9cwde0M0cZiGtyk/28CD7ZE7OeMHw8E9FwYkAMkzI=", + "lastModified": 1790595593, + "narHash": "sha256-cdaC08h4eUQ+GfkSeTKQajogAQveG62e91cRoluGs0U=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "f0339ef6c6e7a13b027bd623bd48201bbeda29ab", + "rev": "a804e30edc18f71f322d1f2543b43b2e05d2793f", "type": "github" }, "original": { @@ -869,14 +903,14 @@ }, "noctalia-greeter": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_14" }, "locked": { - "lastModified": 1790261545, - "narHash": "sha256-isUUxY1OmlfWox0lEHz0pbcs4TdEZ4/Pfkj/Fku5Q1s=", + "lastModified": 1790518002, + "narHash": "sha256-agpHRmhsUL4ZNFseCNilGSiC/cc0S2tC1ZvC5rXmgtY=", "owner": "noctalia-dev", "repo": "noctalia-greeter", - "rev": "212f559d9c1ca18295b786c2d54ef78ca6895659", + "rev": "44337ecba043749c29de6f3d563315b91987a908", "type": "github" }, "original": { @@ -925,10 +959,11 @@ "moppkgs": "moppkgs", "niri": "niri", "niri-legacy": "niri-legacy", + "nix-index-database": "nix-index-database", "nix-minecraft": "nix-minecraft", "nix-monitored": "nix-monitored", "nix-vscode-extensions": "nix-vscode-extensions", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_11", "nixpkgs-xr": "nixpkgs-xr", "noctalia": "noctalia", "noctalia-greeter": "noctalia-greeter", @@ -1024,7 +1059,7 @@ }, "scopebuddy": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1787088847, @@ -1042,14 +1077,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_15" + "nixpkgs": "nixpkgs_16" }, "locked": { - "lastModified": 1790247521, - "narHash": "sha256-TNfgoHsqsYYvaJImlWctfRkh4PseTagzegU1Dgdbehw=", + "lastModified": 1790498116, + "narHash": "sha256-rs9meAYxW3zzrh43yaW7htrqCD+X9+pupDPHN86fumI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2bd00bd9bb35fe6d114888c8f1c2e946c541dd8f", + "rev": "5efb5a6f4f5ab192817d28557dd4d650fa14d866", "type": "github" }, "original": { @@ -1126,11 +1161,11 @@ "stextPackageControl": { "flake": false, "locked": { - "lastModified": 1790369073, - "narHash": "sha256-EncJ9MTTmW4J/JY1+iCP0vrIZlXogdzLykn7YJS9GQM=", + "lastModified": 1790434256, + "narHash": "sha256-LLTEAdN/E39heskfkrEqP6JrEWvp0/h/F/WY9ijmHi8=", "owner": "wbond", "repo": "package_control", - "rev": "c9cd5a348f505a577673a491d77fb9f6f06cbcce", + "rev": "766956029e2e162444b8e74c787039db03295e88", "type": "github" }, "original": { @@ -1214,7 +1249,7 @@ "mathjax-src": "mathjax-src", "mermaid-src": "mermaid-src", "microvm": "microvm", - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_17", "sqlite-lib-src": "sqlite-lib-src", "tailwindcss-animated-src": "tailwindcss-animated-src" }, @@ -1255,11 +1290,11 @@ }, "unstable": { "locked": { - "lastModified": 1790185690, - "narHash": "sha256-xJ+X4hBtOcAFGBOe5nAMyMUeF9foJBmIOu3NjBqBycU=", + "lastModified": 1790463110, + "narHash": "sha256-hKlVl12B1dF0Q5vd9dY3lIJM5mFGWYSlXwSLAqHZ1+s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4975466d324710c576dc11ad614684e6bd8cad8e", + "rev": "e158d9ed9b51c98974c5e66e1ba1c9e0255fecaa", "type": "github" }, "original": { @@ -1272,11 +1307,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1790226849, - "narHash": "sha256-eFEjCCniMCKeWU0PcZNv+tDYe08SLFPjRplyPY8OFt4=", + "lastModified": 1790341322, + "narHash": "sha256-FBRBINpTMhkhVm9irSqeWKmI8/QMyXcTRxHeCMVvxdc=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "b83eab900644e4c7c77982ce3d44cb490f0c5e1d", + "rev": "63cdf17f17b4ee231ef862690048549f218e8e0e", "type": "github" }, "original": { @@ -1288,14 +1323,14 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_17" + "nixpkgs": "nixpkgs_18" }, "locked": { - "lastModified": 1790234305, - "narHash": "sha256-zgshjjI5uhmRQor+bmXH4EYx/E0LUdJEqv0L8WnTFOw=", + "lastModified": 1790568199, + "narHash": "sha256-h3AHjsOZr9iBEkNfK+Zh7/DoN5iMRpJd/6h/5NxCz9I=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "2b7fec6557495d97736f1b31904f79312671ca2a", + "rev": "e50ed94ebf28bae95397e482dbb1c020f50c20c1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0ef73ed..0b44f13 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,7 @@ import-tree.url = "github:denful/import-tree"; catppuccin.url = "github:catppuccin/nix/release-26.05"; home-manager.url = "github:nix-community/home-manager/release-26.05"; + nix-index-database.url = "github:nix-community/nix-index-database"; # To be removed in 26.11 niri.url = "git+https://codeberg.org/bananad3v/niri-nix"; @@ -109,6 +110,7 @@ (inputs.import-tree ./homeModules) inputs.catppuccin.homeModules.catppuccin inputs.niri.homeModules.default + inputs.nix-index-database.homeModules.default inputs.noctalia.homeModules.default inputs.zen-browser.homeModules.default ]; diff --git a/hosts/kaoru/home/home.nix b/hosts/kaoru/home/home.nix index 9aa3461..cd963b5 100644 --- a/hosts/kaoru/home/home.nix +++ b/hosts/kaoru/home/home.nix @@ -23,6 +23,7 @@ programs = { surfer.enable = true; gtkwave.enable = true; + nix-index.enable = true; vscodium = { profiles.default = { extensions = with pkgs.vsxExtensionsFor config.programs.vscodium.package; [ diff --git a/hosts/kaoru/home/monitors.nix b/hosts/kaoru/home/monitors.nix index 9340c17..8d07957 100644 --- a/hosts/kaoru/home/monitors.nix +++ b/hosts/kaoru/home/monitors.nix @@ -10,6 +10,15 @@ let laptop = "n=eDP-1"; zowie = "d%ZOWIE"; ultrawide = "d%P40w-20"; + switchTo = + layout: + "niri msg action switch-layout ${ + toString ( + lib.lists.findFirstIndex (x: x == layout) + (throw "keyboard layout ${layout} not found in osConfig.services.xserver.xkb.layout") + (lib.splitString "," osConfig.services.xserver.xkb.layout) + ) + }"; in { wayland.windowManager.niri.settings.output = [ @@ -23,6 +32,7 @@ in settings.profile = [ { name = "Docked at Workstation"; + exec = [ (switchTo "us") ]; output = [ { search = laptop; @@ -46,6 +56,7 @@ in } { name = "Undocked"; + exec = [ (switchTo "gb") ]; output = [ { search = laptop; diff --git a/hosts/kaoru/os/configuration.nix b/hosts/kaoru/os/configuration.nix index c437f13..31e8a11 100644 --- a/hosts/kaoru/os/configuration.nix +++ b/hosts/kaoru/os/configuration.nix @@ -19,6 +19,7 @@ services = { supergfxd.enable = true; asusd.enable = true; + xserver.xkb.layout = "gb,us"; }; catppuccin = { enable = true;