diff options
| -rw-r--r-- | flake.lock | 186 | ||||
| -rw-r--r-- | flake.nix | 29 | ||||
| -rw-r--r-- | user-mora.nix | 4 |
3 files changed, 158 insertions, 61 deletions
@@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1740786007, - "narHash": "sha256-R263ls8DSU84dBBEi/UvHxffJUySD4igHcbGmDSUtEs=", + "lastModified": 1741183046, + "narHash": "sha256-5Oqn4voPvBaRS+oYGPQ3GqBxlQTf0z0PYedbQcg/X0Q=", "owner": "Aylur", "repo": "astal", - "rev": "dfd1f23c7562694e571d44c45aa74fcea9b1ba01", + "rev": "db51a2bfdb726405660d300936cb6c7251785a0b", "type": "github" }, "original": { @@ -45,11 +45,11 @@ }, "crane": { "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", + "lastModified": 1739936662, + "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=", "owner": "ipetkov", "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", + "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7", "type": "github" }, "original": { @@ -67,11 +67,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1740551776, - "narHash": "sha256-CkcCb2hGSL1owuZpjuNB6UQzlyaXgvuRXmjY6jLqjPc=", + "lastModified": 1740897281, + "narHash": "sha256-lUCeMKV8sUn8Y4R+4OzFMqH0k00KqvbIu0vSIMsWpH0=", "owner": "nix-community", "repo": "fenix", - "rev": "07a730bc80e8a4106df5b2341aa5602a240ee112", + "rev": "2a4bbf46e00e06967f55b3a55a685d2039f2b572", "type": "github" }, "original": { @@ -238,11 +238,11 @@ ] }, "locked": { - "lastModified": 1740845322, - "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=", + "lastModified": 1741174782, + "narHash": "sha256-dYRebJk58/d5Ej1G6xTOadTfG6tU5zFgXYrLsRJlrgw=", "owner": "nix-community", "repo": "home-manager", - "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d", + "rev": "def0dbbcea715d4514ca343ab4d6d7f3a1742da0", "type": "github" }, "original": { @@ -260,11 +260,11 @@ ] }, "locked": { - "lastModified": 1740553144, - "narHash": "sha256-ujQ/f3mcYECH1o0vzakMLAQRCMeF/SXd8w4uBFHxYO8=", + "lastModified": 1740892961, + "narHash": "sha256-RpuRrwn4Iu3ColOUfQJITSB3Pu8p979zELXv1zihWwU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "14a125ea5c440c57310dc1bb3acf7641078d783a", + "rev": "483fc372ebcc522ef0226bf5a211942203edda90", "type": "github" }, "original": { @@ -291,11 +291,11 @@ ] }, "locked": { - "lastModified": 1740440383, - "narHash": "sha256-w8ixbqOGrVWMQZFFs4uAwZpuwuGMzFoKjocMFxTR5Ts=", + "lastModified": 1741001137, + "narHash": "sha256-XxWib5eI3rgMPA4VzDHOx89WT76IN/ZNb+votz5gakw=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "6321bc060d757c137c1fbae2057c7e941483878f", + "rev": "cc9786aa8158437facead0d8e21ac0c03be91dc8", "type": "github" }, "original": { @@ -359,20 +359,52 @@ }, "niri": { "inputs": { - "nix-filter": [ - "nix-filter" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": [] + "niri-stable": "niri-stable", + "niri-unstable": "niri-unstable", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1740898912, - "narHash": "sha256-oDQWpeYkJ2xzGJOCq+m+uMp8urW/37B7NbTndYKIME4=", + "lastModified": 1741170398, + "narHash": "sha256-l0oWdaphJuzGPePsOZG6YBwRxrGqrZPZ3Ee+QPrEEyY=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "7db97394c187e2a23127a45bf7ce8b969055c0db", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1740117926, + "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", "owner": "YaLTeR", "repo": "niri", - "rev": "9f205d465c46928b95702447194faeb342a57965", + "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.02", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1741001804, + "narHash": "sha256-rMc6olQE1pT8M9wxapgDLLROBgUUX11SmAcPMRSivsA=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "26618f8d50dffda41791a211fd2aa02479a6d6a9", "type": "github" }, "original": { @@ -421,11 +453,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740695751, - "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", + "lastModified": 1741010256, + "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", + "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "type": "github" }, "original": { @@ -437,16 +469,32 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "lastModified": 1741048562, + "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1741010256, + "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -462,11 +510,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1740898148, - "narHash": "sha256-QETBJHO+HOKPbqT+TeWqsS3kHMN0xBxO6TAP3qZ+i7E=", + "lastModified": 1741183493, + "narHash": "sha256-TQ6gdiUe1TYQVpt8CYN/aDoO3YontdajG8erohtE40I=", "owner": "nix-community", "repo": "NUR", - "rev": "1e0113bf56a2b7f7127e2136390e76cb7cb455eb", + "rev": "3d07fa697a9b93bf21ebddbf3018c500cecb6bbb", "type": "github" }, "original": { @@ -488,11 +536,11 @@ ] }, "locked": { - "lastModified": 1740830256, - "narHash": "sha256-zIbj10wCKJMUjyVs5L/VTyrptA1Z3gk63YaOnhUu6QQ=", + "lastModified": 1741052738, + "narHash": "sha256-vxoPbZlCUVMEIMLtQ2UC7ONGFerwkSnf16AIShxs56k=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "af9b9bd6669b623f724aaaf59d0c2f90f58025db", + "rev": "3fa233e8abd1ce2479a30d8d34df678aad1711d6", "type": "github" }, "original": { @@ -511,15 +559,14 @@ "nixpkgs": [ "lanzaboote", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -541,7 +588,7 @@ "musnix": "musnix", "niri": "niri", "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nurpkgs": "nurpkgs", "nyxpkgs": "nyxpkgs", "rust-overlay": "rust-overlay", @@ -551,11 +598,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1740470570, - "narHash": "sha256-iYjLS4jy/IJScOHZfbQ31vkrS5tl0bjXtzYP4XKA2Pc=", + "lastModified": 1740851167, + "narHash": "sha256-sFRsGYrI2Z4X+P9jkvb7XZJG6DImVhz8BSELBT2mLdo=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "89255449982473939a4f8ee954512d339225c182", + "rev": "76567ee28dacac2636aeb6e5b6a9560ffca21d87", "type": "github" }, "original": { @@ -572,11 +619,11 @@ ] }, "locked": { - "lastModified": 1740882709, - "narHash": "sha256-VC+8GxWK4p08jjIbmsNfeFQajW2lsiOR/XQiOOvqgvs=", + "lastModified": 1741141853, + "narHash": "sha256-FauVtC+FbOgkKpGVuQTNxSqrvgbmVc7hFkjn/DacwMo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f4d5a693c18b389f0d58f55b6f7be6ef85af186f", + "rev": "02edad1f19d6dec824e0812e4cdc0aa7930ff8ae", "type": "github" }, "original": { @@ -653,6 +700,39 @@ "type": "github" } }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.5.1", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1741140299, + "narHash": "sha256-Y2bPO92Yg5HcH5ORvrVOQb4wRGEapGEteHXGtNvboxk=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "10cb041a80bb815cc1789cfa305923f1f9e3713d", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } + }, "zlib": { "flake": false, "locked": { @@ -72,20 +72,25 @@ fjordlauncher = { url = "github:unmojang/FjordLauncher"; + # NOTE: re-following inputs breaks Cachix inputs.nixpkgs.follows = "nixpkgs"; inputs.nix-filter.follows = "nix-filter"; inputs.flake-compat.follows = "flake-compat"; }; niri = { - url = "github:YaLTeR/niri"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.nix-filter.follows = "nix-filter"; - inputs.rust-overlay.follows = ""; # NOTE: for end user is not requried + # NOTE: using this repo to use cachix binaries + url = "github:sodiboo/niri-flake"; + + # url = "github:YaLTeR/niri"; + # inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nix-filter.follows = "nix-filter"; + # inputs.rust-overlay.follows = ""; # NOTE: for end user is not requried }; wezterm = { url = "github:wezterm/wezterm?dir=nix"; + # NOTE: re-following inputs breaks Cachix inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; inputs.rust-overlay.follows = "rust-overlay"; @@ -94,15 +99,21 @@ nixConfig = { extra-substituters = [ - "https://nix-community.cachix.org/" - "https://chaotic-nyx.cachix.org/" + # NOTE: Some of the cachix repositories do not work for some reason :^( + "https://nix-community.cachix.org" + "https://chaotic-nyx.cachix.org" "https://unmojang.cachix.org" + "https://wezterm.cachix.org" + "https://niri.cachix.org" ]; extra-trusted-public-keys = [ + # NOTE: Some of the cachix repositories do not work for some reason :^( "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" "unmojang.cachix.org-1:OfHnbBNduZ6Smx9oNbLFbYyvOWSoxb2uPcnXPj4EDQY=" + "wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0=" + "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" ]; }; @@ -143,10 +154,14 @@ { nixpkgs.overlays = [ fjordlauncher.overlays.default - niri.overlays.default + niri.overlays.niri ]; } + { + nix.trustedUsers = [ "root" "mora" ]; + } + # System Configuration ./system-sapphire.nix diff --git a/user-mora.nix b/user-mora.nix index 39cd827..5f3f639 100644 --- a/user-mora.nix +++ b/user-mora.nix @@ -119,13 +119,15 @@ python3 # Applications - niri + niri-unstable fuzzel inputs.wezterm.packages.${pkgs.system}.default inputs.aylurs-gtk-shell.packages.${pkgs.system}.agsFull floorp + + fjordlauncher ]; ### |