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

added niri flake

Browse source
This commit is contained in:
willifan 2024-12-29 14:30:24 +01:00
parent b9c0d470c3
commit ba25d03fae
5 changed files with 63 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

74
flake.nix
View file

@ -13,6 +13,11 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
niri = {
url = "github:sodiboo/niri-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
# Declarative partitioning and formatting # Declarative partitioning and formatting
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
@ -47,7 +52,7 @@
}; };
outputs = { nixpkgs, ... }@attrs: outputs = { nixpkgs, ... }@inputs:
let let
lib = nixpkgs.lib; lib = nixpkgs.lib;
in in
@ -61,21 +66,22 @@
specialArgs = { specialArgs = {
hostname = "Lenni"; hostname = "Lenni";
inherit attrs; inherit inputs;
inherit system; inherit system;
}; };
modules = [ modules = [
attrs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
} }
attrs.sops-nix.nixosModules.sops inputs.niri.nixosModules.niri
attrs.disko.nixosModules.disko inputs.sops-nix.nixosModules.sops
attrs.stylix.nixosModules.stylix inputs.disko.nixosModules.disko
attrs.nixvim.nixosModules.nixvim inputs.stylix.nixosModules.stylix
attrs.nixos-hardware.nixosModules.framework-12th-gen-intel inputs.nixvim.nixosModules.nixvim
inputs.nixos-hardware.nixosModules.framework-12th-gen-intel
./hosts/Lenni ./hosts/Lenni
./pkgs ./pkgs
]; ];
@ -89,23 +95,24 @@
specialArgs = { specialArgs = {
hostname = "Puenktchen"; hostname = "Puenktchen";
inherit attrs; inherit inputs;
inherit system; inherit system;
}; };
modules = [ modules = [
attrs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
} }
attrs.sops-nix.nixosModules.sops inputs.niri.nixosModules.niri
attrs.disko.nixosModules.disko inputs.sops-nix.nixosModules.sops
attrs.stylix.nixosModules.stylix inputs.disko.nixosModules.disko
attrs.nixvim.nixosModules.nixvim inputs.stylix.nixosModules.stylix
attrs.nixos-hardware.nixosModules.common-cpu-amd inputs.nixvim.nixosModules.nixvim
attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate inputs.nixos-hardware.nixosModules.common-cpu-amd
attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
./hosts/Puenktchen ./hosts/Puenktchen
./pkgs ./pkgs
]; ];
@ -119,23 +126,23 @@
specialArgs = { specialArgs = {
hostname = "Anton"; hostname = "Anton";
inherit attrs; inherit inputs;
inherit system; inherit system;
}; };
modules = [ modules = [
attrs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
} }
attrs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
attrs.disko.nixosModules.disko inputs.disko.nixosModules.disko
attrs.stylix.nixosModules.stylix inputs.stylix.nixosModules.stylix
attrs.nixvim.nixosModules.nixvim inputs.nixvim.nixosModules.nixvim
attrs.nixos-hardware.nixosModules.common-cpu-amd inputs.nixos-hardware.nixosModules.common-cpu-amd
attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
./hosts/Anton ./hosts/Anton
./pkgs ./pkgs
]; ];
@ -149,21 +156,22 @@
specialArgs = { specialArgs = {
hostname = "Lillie"; hostname = "Lillie";
inherit attrs; inherit inputs;
inherit system; inherit system;
}; };
modules = [ modules = [
attrs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
} }
attrs.sops-nix.nixosModules.sops inputs.niri.nixosModules.niri
attrs.disko.nixosModules.disko inputs.sops-nix.nixosModules.sops
attrs.stylix.nixosModules.stylix inputs.disko.nixosModules.disko
attrs.nixvim.nixosModules.nixvim inputs.stylix.nixosModules.stylix
attrs.jovian.nixosModules.default inputs.nixvim.nixosModules.nixvim
inputs.jovian.nixosModules.default
./hosts/Lillie ./hosts/Lillie
./pkgs ./pkgs
]; ];

4
modules/default/common/desktop/applications.nix
View file

@ -1,4 +1,4 @@
{ lib, config, pkgs, attrs, system, ... }: { lib, config, pkgs, inputs, system, ... }:
lib.mkIf config.desktop.enable { lib.mkIf config.desktop.enable {
environment.systemPackages = environment.systemPackages =
@ -33,7 +33,7 @@ lib.mkIf config.desktop.enable {
]) ])
++ ++
[ [
attrs.zen.packages.${system}.specific inputs.zen.packages.${system}.specific
]; ];
} }

1
modules/default/home-manager/desktop/default.nix
View file

@ -3,6 +3,7 @@
imports = [ imports = [
./hyprland ./hyprland
./niri
./options.nix ./options.nix
./kitty.nix ./kitty.nix

8
modules/default/home-manager/desktop/niri/default.nix Normal file
View file

@ -0,0 +1,8 @@
{ inputs, ... }:
{
nixpkgs.overlays = [ inputs.niri.overlays.niri ];
imports = [
./niri.nix
];
}

11
modules/default/home-manager/desktop/niri/niri.nix Normal file
View file

@ -0,0 +1,11 @@
{ ... }:
{
home-manager.users.willifan = {
programs.niri = {
enable = true;
settings = {
outputs."eDP-1".scale = 1.6;
};
};
};
}