diff --git a/flake.nix b/flake.nix index fcf328c..071f8b8 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + niri = { + url = "github:sodiboo/niri-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # Declarative partitioning and formatting disko = { url = "github:nix-community/disko"; @@ -47,7 +52,7 @@ }; - outputs = { nixpkgs, ... }@attrs: + outputs = { nixpkgs, ... }@inputs: let lib = nixpkgs.lib; in @@ -61,21 +66,22 @@ specialArgs = { hostname = "Lenni"; - inherit attrs; + inherit inputs; inherit system; }; modules = [ - attrs.home-manager.nixosModules.home-manager + inputs.home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; } - attrs.sops-nix.nixosModules.sops - attrs.disko.nixosModules.disko - attrs.stylix.nixosModules.stylix - attrs.nixvim.nixosModules.nixvim - attrs.nixos-hardware.nixosModules.framework-12th-gen-intel + inputs.niri.nixosModules.niri + inputs.sops-nix.nixosModules.sops + inputs.disko.nixosModules.disko + inputs.stylix.nixosModules.stylix + inputs.nixvim.nixosModules.nixvim + inputs.nixos-hardware.nixosModules.framework-12th-gen-intel ./hosts/Lenni ./pkgs ]; @@ -89,23 +95,24 @@ specialArgs = { hostname = "Puenktchen"; - inherit attrs; + inherit inputs; inherit system; }; modules = [ - attrs.home-manager.nixosModules.home-manager + inputs.home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; } - attrs.sops-nix.nixosModules.sops - attrs.disko.nixosModules.disko - attrs.stylix.nixosModules.stylix - attrs.nixvim.nixosModules.nixvim - attrs.nixos-hardware.nixosModules.common-cpu-amd - attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate - attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower + inputs.niri.nixosModules.niri + inputs.sops-nix.nixosModules.sops + inputs.disko.nixosModules.disko + inputs.stylix.nixosModules.stylix + inputs.nixvim.nixosModules.nixvim + inputs.nixos-hardware.nixosModules.common-cpu-amd + inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate + inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower ./hosts/Puenktchen ./pkgs ]; @@ -119,23 +126,23 @@ specialArgs = { hostname = "Anton"; - inherit attrs; + inherit inputs; inherit system; }; modules = [ - attrs.home-manager.nixosModules.home-manager + inputs.home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; } - attrs.sops-nix.nixosModules.sops - attrs.disko.nixosModules.disko - attrs.stylix.nixosModules.stylix - attrs.nixvim.nixosModules.nixvim - attrs.nixos-hardware.nixosModules.common-cpu-amd - attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate - attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower + inputs.sops-nix.nixosModules.sops + inputs.disko.nixosModules.disko + inputs.stylix.nixosModules.stylix + inputs.nixvim.nixosModules.nixvim + inputs.nixos-hardware.nixosModules.common-cpu-amd + inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate + inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower ./hosts/Anton ./pkgs ]; @@ -149,21 +156,22 @@ specialArgs = { hostname = "Lillie"; - inherit attrs; + inherit inputs; inherit system; }; modules = [ - attrs.home-manager.nixosModules.home-manager + inputs.home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; } - attrs.sops-nix.nixosModules.sops - attrs.disko.nixosModules.disko - attrs.stylix.nixosModules.stylix - attrs.nixvim.nixosModules.nixvim - attrs.jovian.nixosModules.default + inputs.niri.nixosModules.niri + inputs.sops-nix.nixosModules.sops + inputs.disko.nixosModules.disko + inputs.stylix.nixosModules.stylix + inputs.nixvim.nixosModules.nixvim + inputs.jovian.nixosModules.default ./hosts/Lillie ./pkgs ]; diff --git a/modules/default/common/desktop/applications.nix b/modules/default/common/desktop/applications.nix index 8a0a4b4..fd0a4d2 100644 --- a/modules/default/common/desktop/applications.nix +++ b/modules/default/common/desktop/applications.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, attrs, system, ... }: +{ lib, config, pkgs, inputs, system, ... }: lib.mkIf config.desktop.enable { environment.systemPackages = @@ -33,7 +33,7 @@ lib.mkIf config.desktop.enable { ]) ++ [ - attrs.zen.packages.${system}.specific + inputs.zen.packages.${system}.specific ]; } diff --git a/modules/default/home-manager/desktop/default.nix b/modules/default/home-manager/desktop/default.nix index 3f495e6..dcca27c 100644 --- a/modules/default/home-manager/desktop/default.nix +++ b/modules/default/home-manager/desktop/default.nix @@ -3,6 +3,7 @@ imports = [ ./hyprland + ./niri ./options.nix ./kitty.nix diff --git a/modules/default/home-manager/desktop/niri/default.nix b/modules/default/home-manager/desktop/niri/default.nix new file mode 100644 index 0000000..a17f8d3 --- /dev/null +++ b/modules/default/home-manager/desktop/niri/default.nix @@ -0,0 +1,8 @@ +{ inputs, ... }: +{ + nixpkgs.overlays = [ inputs.niri.overlays.niri ]; + + imports = [ + ./niri.nix + ]; +} diff --git a/modules/default/home-manager/desktop/niri/niri.nix b/modules/default/home-manager/desktop/niri/niri.nix new file mode 100644 index 0000000..9d8a4b1 --- /dev/null +++ b/modules/default/home-manager/desktop/niri/niri.nix @@ -0,0 +1,11 @@ +{ ... }: +{ + home-manager.users.willifan = { + programs.niri = { + enable = true; + settings = { + outputs."eDP-1".scale = 1.6; + }; + }; + }; +}