From 662c47fba573e056bc6d4d8dd4c64d80a49c2e25 Mon Sep 17 00:00:00 2001 From: foglar Date: Sat, 25 Jan 2025 17:51:01 +0100 Subject: [PATCH] cleanup --- ginoza/configuration.nix | 3 ++- kogami/configuration.nix | 7 ++++--- kogami/home.nix | 1 + nixos/home/apps/applications.nix | 2 ++ nixos/home/apps/programming.nix | 3 ++- nixos/home/packages/tools/shell.nix | 1 + 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ginoza/configuration.nix b/ginoza/configuration.nix index c357ecf..b1cdd7b 100644 --- a/ginoza/configuration.nix +++ b/ginoza/configuration.nix @@ -3,6 +3,7 @@ pkgs, pkgs-stable, userSettings, + system, ... }: { imports = [ @@ -16,7 +17,7 @@ # Home manager home-manager = { - extraSpecialArgs = {inherit inputs pkgs pkgs-stable userSettings;}; + extraSpecialArgs = {inherit inputs system pkgs pkgs-stable userSettings;}; backupFileExtension = "backup"; users = { ${userSettings.username} = import ./home.nix; diff --git a/kogami/configuration.nix b/kogami/configuration.nix index cd2b25e..17ccdd8 100644 --- a/kogami/configuration.nix +++ b/kogami/configuration.nix @@ -3,6 +3,7 @@ pkgs, pkgs-stable, userSettings, + system, ... }: { imports = [ @@ -17,7 +18,7 @@ # Home manager home-manager = { - extraSpecialArgs = {inherit inputs pkgs pkgs-stable userSettings;}; + extraSpecialArgs = {inherit inputs system pkgs pkgs-stable userSettings;}; backupFileExtension = "backup"; users = { ${userSettings.username} = import ./home.nix; @@ -80,8 +81,8 @@ }; environment.systemPackages = [ - inputs.install-script.packages.x86_64-linux.default - inputs.shinya-nvf.packages.x86_64-linux.nvf + inputs.install-script.packages.${system}.default + inputs.shinya-nvf.packages.${system}.nvf ]; #services.twingate.enable = true; diff --git a/kogami/home.nix b/kogami/home.nix index 7ea43cd..9ec1d10 100644 --- a/kogami/home.nix +++ b/kogami/home.nix @@ -1,5 +1,6 @@ { userSettings, + pkgs, ... }: { # Home manager configuration diff --git a/nixos/home/apps/applications.nix b/nixos/home/apps/applications.nix index 66cf743..e3cb911 100644 --- a/nixos/home/apps/applications.nix +++ b/nixos/home/apps/applications.nix @@ -10,6 +10,8 @@ }; config = lib.mkIf config.app_list.applications.enable { + services.arrpc.enable = true; + home.packages = (with pkgs; [ librewolf-wayland diff --git a/nixos/home/apps/programming.nix b/nixos/home/apps/programming.nix index 2744d4a..4bca05c 100644 --- a/nixos/home/apps/programming.nix +++ b/nixos/home/apps/programming.nix @@ -3,6 +3,7 @@ lib, config, inputs, + system, ... }: { options = { @@ -24,7 +25,7 @@ lazygit ]) ++ ( - with inputs.ghostty.packages.x86_64-linux; [ + with inputs.ghostty.packages.${system}; [ default ] ); diff --git a/nixos/home/packages/tools/shell.nix b/nixos/home/packages/tools/shell.nix index 1ccbfcc..f8b7749 100644 --- a/nixos/home/packages/tools/shell.nix +++ b/nixos/home/packages/tools/shell.nix @@ -12,6 +12,7 @@ open = "rifle"; ip = "ip -c"; s = "kitten ssh"; + icat = "kitten icat"; diff = "diff --color"; respawn = "clear; ${pkgs.pfetch}/bin/pfetch"; mkdir = "mkdir -p";