From 887cd0486ee6ca827144c13e7434b8551bc218aa Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Wed, 16 Jul 2025 17:54:22 +0100 Subject: [PATCH] added niri (doesnt work yet) and updated flake --- flake.lock | 96 ++++++++++++++-------------- flake.nix | 1 + home-manager/niri.nix | 27 +++++++- home-manager/packages.nix | 2 +- hosts/gabbielaptop/configuration.nix | 3 + 5 files changed, 79 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index 8d126cb..783f880 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ }, "crane": { "locked": { - "lastModified": 1750266157, - "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", + "lastModified": 1751562746, + "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=", "owner": "ipetkov", "repo": "crane", - "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", + "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd", "type": "github" }, "original": { @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1752113600, - "narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=", + "lastModified": 1752541678, + "narHash": "sha256-dyhGzkld6jPqnT/UfGV2oqe7tYn7hppAqFvF3GZTyXY=", "owner": "nix-community", "repo": "disko", - "rev": "79264292b7e3482e5702932949de9cbb69fedf6d", + "rev": "2bf3421f7fed5c84d9392b62dcb9d76ef09796a7", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -338,11 +338,11 @@ ] }, "locked": { - "lastModified": 1752402455, - "narHash": "sha256-mCHfZhQKdTj2JhCFcqfOfa3uKZbwUkPQbd0/zPnhOE8=", + "lastModified": 1752603129, + "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf893ad4cbf46610dd1b620c974f824e266cd1df", + "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", "type": "github" }, "original": { @@ -363,11 +363,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1751381593, - "narHash": "sha256-js1XwtJpYhvQrrTaVzViybpztkHJVZ63aXOlFAcTENM=", + "lastModified": 1752673703, + "narHash": "sha256-9Cc0YqL9ZUpaybJsrRJfXex91QlPmQNqpTLgw/KvJGA=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f4eb75540307c2b33521322c04b7fea74e48a66f", + "rev": "5a776450d904b7ccd377c2a759703152b2553e98", "type": "github" }, "original": { @@ -421,11 +421,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1752421961, - "narHash": "sha256-9uTU9mZO3SOSKgn/Qz4RVJqwsoNpM1Bx2e7bNfHALs0=", + "lastModified": 1752659960, + "narHash": "sha256-AP/Gds8b1hhU50prgLjYSv5qpy9D8E6Xre/r/gb3K8M=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c97425d44edb8879e8c4a3d1991e4442c03395ea", + "rev": "8e3f7bbada0cf637d23de4200c6e1a5a157de9cc", "type": "github" }, "original": { @@ -454,11 +454,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1752418007, - "narHash": "sha256-3DyujBgCewh7r5fz4L0ZRw28BJBqfqeDSVpeTud/aEU=", + "lastModified": 1752656275, + "narHash": "sha256-tTRMyGxqHF5IkYcnvHbwCgRBRUBhvRapxtuUfrN/8Ic=", "owner": "YaLTeR", "repo": "niri", - "rev": "bb40a35ccf6edbe2c838686562cbdad1ef98ce72", + "rev": "7b065f8618f63b7cf761ebe05a2cebd556113a6c", "type": "github" }, "original": { @@ -501,11 +501,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1752422695, - "narHash": "sha256-y8HQ2baUdXlp6z4N/PdRc4OoNaRDr76o74GuxCZnVg4=", + "lastModified": 1752681971, + "narHash": "sha256-ciJicjJDu9ajnAuUqGhTK57igsCF+ofCbdpmBbIj8u4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a144e808919d8c3e547a25146f269a6805dffe0f", + "rev": "ca573e60c6173cb20d6466b21cc2541d91abad90", "type": "github" }, "original": { @@ -517,11 +517,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1752162966, - "narHash": "sha256-3MxxkU8ZXMHXcbFz7UE4M6qnIPTYGcE/7EMqlZNnVDE=", + "lastModified": 1752436162, + "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10e687235226880ed5e9f33f1ffa71fe60f2638a", + "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8", "type": "github" }, "original": { @@ -533,11 +533,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1752162966, - "narHash": "sha256-3MxxkU8ZXMHXcbFz7UE4M6qnIPTYGcE/7EMqlZNnVDE=", + "lastModified": 1752436162, + "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10e687235226880ed5e9f33f1ffa71fe60f2638a", + "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8", "type": "github" }, "original": { @@ -549,11 +549,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -565,11 +565,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -585,11 +585,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1752421718, - "narHash": "sha256-epf+PdlVdvMLgXpCN9qtEPBjKlQc5VrjcnjIuxcfj9g=", + "lastModified": 1752681032, + "narHash": "sha256-fIg1Is15tmAfFTwY7hcrLPhYpwoSKg8to6Z7GHzDLsg=", "owner": "nix-community", "repo": "NUR", - "rev": "e38a134b32b1a9b1dc96a3e8c549467e7329024a", + "rev": "94dad3767581f59690021eb4f459c457e3205eb6", "type": "github" }, "original": { @@ -634,11 +634,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1752417534, - "narHash": "sha256-06CASFKAxc81QycTSsTw26EJOKi6VgMie6wp0ZUnvqE=", + "lastModified": 1752672660, + "narHash": "sha256-tuJDd2ZPvK+A1PmX0DdZgmxOHCePMkPNDCW+CMQGlic=", "owner": "notashelf", "repo": "nvf", - "rev": "5e2df2dd5b83c07bad3d5e17dc056b52541ecb9c", + "rev": "08bbe925325f4a1fc6f888212963e5588d8ed4eb", "type": "github" }, "original": { @@ -723,11 +723,11 @@ ] }, "locked": { - "lastModified": 1751165203, - "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", + "lastModified": 1751769931, + "narHash": "sha256-QR2Rp/41NkA5YxcpvZEKD1S2QE1Pb9U415aK8M/4tJc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", + "rev": "3ac4f630e375177ea8317e22f5c804156de177e8", "type": "github" }, "original": { @@ -799,11 +799,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1752422722, - "narHash": "sha256-4iP54tgAYwpZwdA67Z1b4QH7+SK4BG9aCQZrrh0pGFw=", + "lastModified": 1752673382, + "narHash": "sha256-GxyHdgZqn6LJVsN9H6kTwMAu703wVaoequXP7f14NJk=", "owner": "nix-community", "repo": "stylix", - "rev": "2947a83755d206553fb88116058f5322f3bc2d0e", + "rev": "8c854fe383fda20e8befefc31ecf248988a40bcc", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 41f926c..1ff9f92 100644 --- a/flake.nix +++ b/flake.nix @@ -143,6 +143,7 @@ modules = genericModules ++ [ inputs.disko.nixosModules.disko inputs.satisfactory-server.nixosModules.satisfactory + inputs.niri.nixosModules.niri ./hosts/biggerpi/configuration.nix ./modules/satisfactory-server.nix ]; diff --git a/home-manager/niri.nix b/home-manager/niri.nix index b1e705e..85e85bd 100644 --- a/home-manager/niri.nix +++ b/home-manager/niri.nix @@ -1,6 +1,31 @@ {...}: { programs.niri = { enable = true; - + settings = { + outputs = { + "eDP-2" = { + position = { + x = 0; + y = 0; + }; + }; + # "lenovo-1" = { + # position = { + # x = -960; + # y = -1080; + # }; + # }; + # "lenovo-2" = { + # position = { + # x = 960; + # y = 1080; + # }; + # }; + }; + binds = { + "Mod+1".action.spawn = "alacritty"; + "Mod+1".hotkey-overlay.hidden = false; + }; + }; }; } diff --git a/home-manager/packages.nix b/home-manager/packages.nix index 450095f..447b211 100644 --- a/home-manager/packages.nix +++ b/home-manager/packages.nix @@ -27,7 +27,7 @@ unzip # lets you unzip files vlc # media player vial # gui for qmk stuff - qmk # qmk configurator + stable.qmk # qmk configurator wl-clipboard # command-line copy/paste lutris # game launcher tenacity # small DAW diff --git a/hosts/gabbielaptop/configuration.nix b/hosts/gabbielaptop/configuration.nix index 673f89a..574dcd6 100644 --- a/hosts/gabbielaptop/configuration.nix +++ b/hosts/gabbielaptop/configuration.nix @@ -87,6 +87,9 @@ # Enable plasma 6 services.desktopManager.plasma6.enable = true; + + # Enable niri + programs.niri.enable = true; # Enable fwupd for BIOS updates services.fwupd.enable = true;