0xa/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

toaster: back to niri

Browse source
This commit is contained in:
Grisha Shipunov 2025-06-02 20:12:09 +02:00
parent a285366611
commit 6f12893309
4 changed files with 43 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
flake.lock generated
View file

@ -224,6 +224,26 @@
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1748830238,
"narHash": "sha256-EB+LzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R+6wMKU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c7fdb7e90bff1a51b79c1eed458fb39e6649a82a",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"lanzaboote": {
"inputs": {
"crane": "crane",
@ -513,6 +533,7 @@
"inputs": {
"authentik-nix": "authentik-nix",
"flake-utils": "flake-utils_2",
"home-manager": "home-manager",
"lanzaboote": "lanzaboote",
"lix": "lix",
"lix-module": "lix-module",

16
flake.nix
View file

@ -46,6 +46,11 @@
inputs.flake-utils.follows = "flake-utils";
};
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
tmux-yank = {
url = "github:tmux-plugins/tmux-yank";
flake = false;
@ -54,6 +59,7 @@
outputs =
inputs@{
home-manager,
lanzaboote,
lix-module,
microvm,
@ -113,18 +119,24 @@
nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen3
lix-module.nixosModules.default
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users."0xa" = import ./hosts/toaster/0xa-home.nix;
}
./hosts/toaster
./modules/basic-tools
./modules/binary-caches.nix
./modules/devtools.nix
./modules/gnome.nix
./modules/niri.nix
./modules/gnupg.nix
./modules/radio.nix
./modules/science.nix
./modules/tlp.nix
./modules/virtualization.nix
./modules/emacs.nix
./modules/mail
./modules/wg
];

2
hosts/toaster/default.nix
View file

@ -4,7 +4,7 @@
./amd.nix
./hardware-configuration.nix
./irc.nix
./network
./network/full-networkd.nix
./secure-boot.nix
./zfs.nix
];

17
modules/niri.nix
View file

@ -1,8 +1,5 @@
# General Desktop-related config
{ pkgs, inputs, ... }:
{ pkgs, ... }:
{
nixpkgs.overlays = [ inputs.niri.overlays.niri ];
programs.niri.enable = true;
imports = [
@ -13,15 +10,15 @@
let
xwayland-satellite-git = pkgs.xwayland-satellite.overrideAttrs (
final: _prev: {
version = "git";
cargoHash = "sha256-MaF2FyR3HvQAKkZKa8OO/5jbO64/Ncv7+JqHda4jN50=";
version = "0.6";
cargoHash = "sha256-R3xXyXpHQw/Vh5Y4vFUl7n7jwBEEqwUCIZGAf9+SY1M=";
src = pkgs.fetchFromGitHub {
owner = "Supreeeme";
repo = "xwayland-satellite";
rev = "cca74a5f6b23742d77dc5db4312dfc40fd4a0fcc";
sha256 = "sha256-YZ+axsuNsgIKWfnRkt6Qa9UoKfUOIWf42vNUonXxmxM=";
rev = "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73";
sha256 = "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=";
};
cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
inherit (final) pname src version;
hash = final.cargoHash;
};
@ -127,7 +124,7 @@
enable = true;
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting \"$(${pkgs.fortune}/bin/fortune -s)\" --cmd ${pkgs.niri-stable}/bin/niri-session";
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting \"$(${pkgs.fortune}/bin/fortune -s)\" --cmd ${pkgs.niri}/bin/niri-session";
};
};
};