larstvei/nix-config
1
0
Fork 0
mirror of https://github.com/larstvei/nix-config.git synced 2025-10-13 14:30:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pass all inputs

Browse Source
This commit is contained in:
larstvei 2025-09-30 14:15:24 +02:00
parent 4ad67653d0
commit 8f247b2e6b
6 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flake.nix
View File

@ -31,17 +31,14 @@
nixpkgs, nixpkgs,
home-manager, home-manager,
nix-rosetta-builder, nix-rosetta-builder,
nanostatus,
emacs-larstvei,
zen-browser,
... ...
}: }@inputs:
{ {
darwinConfigurations = { darwinConfigurations = {
larstvei-macbookpro = darwin.lib.darwinSystem { larstvei-macbookpro = darwin.lib.darwinSystem {
system = "aarch64-darwin"; system = "aarch64-darwin";
specialArgs = { inherit emacs-larstvei; }; specialArgs = { inherit inputs; };
modules = [ modules = [
home-manager.darwinModules.default home-manager.darwinModules.default
@ -54,7 +51,7 @@
nixosConfigurations.thinkpad = nixpkgs.lib.nixosSystem { nixosConfigurations.thinkpad = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit emacs-larstvei nanostatus zen-browser; }; specialArgs = { inherit inputs; };
modules = [ modules = [
home-manager.nixosModules.default home-manager.nixosModules.default
./machines/thinkpad ./machines/thinkpad

4
machines/macbook/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, emacs-larstvei, ... }: { pkgs, inputs, ... }:
{ {
imports = [ imports = [
../../modules/base ../../modules/base
@ -17,7 +17,7 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { inherit emacs-larstvei; }; extraSpecialArgs = { inherit inputs; };
users.larstvei.imports = [ ../../modules/home/full ]; users.larstvei.imports = [ ../../modules/home/full ];
}; };
} }

4
modules/desktop/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, zen-browser, ... }: { pkgs, inputs, ... }:
{ {
home.packages = [ home.packages = [
@ -11,7 +11,7 @@
]; ];
imports = [ imports = [
zen-browser.homeModules.beta inputs.zen-browser.homeModules.beta
./hypr ./hypr
./theme ./theme
]; ];

7
modules/desktop/hypr/bindings/default.nix
View File

@ -1,4 +1,7 @@
{ pkgs, nanostatus, ... }: { pkgs, inputs, ... }:
let
nanostatus = inputs.nanostatus.packages.${pkgs.system}.default;
in
{ {
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
input = { input = {
@ -51,7 +54,7 @@
"$mod, -, resizeactive, -10" "$mod, -, resizeactive, -10"
"$mod, D, exec, darkman toggle" "$mod, D, exec, darkman toggle"
"$mod, space, exec, ${nanostatus.packages.${pkgs.system}.default}/bin/nanostatus-toggle" "$mod, space, exec, ${nanostatus}/bin/nanostatus-toggle"
"$mod, backspace, exec, hyprlock" "$mod, backspace, exec, hyprlock"
# Text input (macOS-like way of producing Norwegian characters) # Text input (macOS-like way of producing Norwegian characters)

10
modules/nixos/default.nix
View File

@ -1,10 +1,4 @@
{ { pkgs, inputs, ... }:
pkgs,
nanostatus,
emacs-larstvei,
zen-browser,
...
}:
{ {
imports = [ imports = [
@ -14,7 +8,7 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { inherit nanostatus emacs-larstvei zen-browser; }; extraSpecialArgs = { inherit inputs; };
}; };
users.users.larstvei = { users.users.larstvei = {

4
modules/tools/editor/default.nix
View File

@ -1,6 +1,6 @@
{ pkgs, emacs-larstvei, ... }: { pkgs, inputs, ... }:
{ {
home.packages = [ home.packages = [
emacs-larstvei.defaultPackage.${pkgs.system} inputs.emacs-larstvei.defaultPackage.${pkgs.system}
]; ];
} }