diff --git a/flake.nix b/flake.nix index ee517b6..fa87496 100644 --- a/flake.nix +++ b/flake.nix @@ -13,19 +13,24 @@ }; outputs = { nixpkgs, home-manager, hyprland, ... }: - let - system = "x86_64-linux"; - pkgs = import nixpkgs { - inherit system; - }; - lib = nixpkgs.lib; - mkConf = import ./lib/mkconf.nix; + let + system = "x86_64-linux"; + pkgs = import nixpkgs { + inherit system; + }; + lib = nixpkgs.lib; + mkConf = import ./lib/mkconf.nix; - user = "tristan"; - in { - nixosConfigurations = { - zenix = mkConf "zenix" { inherit nixpkgs system user home-manager hyprland; }; - FCS-Tristan-Nixbook = mkConf "work" { inherit nixpkgs system user home-manager hyprland; }; + user = "tristan"; + in + { + nixosConfigurations = { + zenix = mkConf "zenix" { + inherit pkgs nixpkgs system user home-manager hyprland; + }; + FCS-Tristan-Nixbook = mkConf "work" { + inherit pkgs nixpkgs system user home-manager hyprland; + }; + }; }; - }; } diff --git a/lib/mkconf.nix b/lib/mkconf.nix index 447cea1..c6c6daa 100644 --- a/lib/mkconf.nix +++ b/lib/mkconf.nix @@ -7,14 +7,15 @@ nixpkgs.lib.nixosSystem rec { { nix.settings = { - substituters = ["https://hyprland.cachix.org"]; - trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; + substituters = [ "https://hyprland.cachix.org" ]; + trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; }; } ../system/global/system.nix ../system/${name}/system.nix ../system/${name}/hardware.nix - home-manager.nixosModules.home-manager { + home-manager.nixosModules.home-manager + { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.${user}.imports = [ diff --git a/system/global/home.nix b/system/global/home.nix index b8ef1e3..f18a4e5 100644 --- a/system/global/home.nix +++ b/system/global/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, user, name, ... }: +{ config, pkgs, user, name, editor, ... }: # https://nix-community.github.io/home-manager/options.html let my-deps = { @@ -56,7 +56,7 @@ let open-code = (pkgs.writeShellScriptBin "open-code" '' code_dir=~/Documents/code - ls $code_dir/ | ${my-deps.menu} | ${my-deps.xargs} -I_ codium $code_dir/_ + ls $code_dir/ | ${my-deps.menu} | ${my-deps.xargs} -I_ my-editor $code_dir/_ ''); }; diff --git a/system/work/home.nix b/system/work/home.nix index c71e5e9..3240bf8 100644 --- a/system/work/home.nix +++ b/system/work/home.nix @@ -19,6 +19,9 @@ in libreoffice ansible thunderbird + (pkgs.writeShellScriptBin "my-editor" '' + code + '') (pkgs.makeDesktopItem { name = "teams"; desktopName = "Microsoft Teams"; @@ -69,9 +72,6 @@ in programs.firefox.enable = true; - home.shellAliases = { - codium = lib.mkForce "code"; - }; programs.vscode = { package = lib.mkForce pkgs.vscode; extensions = with pkgs; [ diff --git a/system/zenix/home.nix b/system/zenix/home.nix index 009fc6f..0b95464 100644 --- a/system/zenix/home.nix +++ b/system/zenix/home.nix @@ -15,6 +15,9 @@ handbrake monero-gui xmrig + (pkgs.writeShellScriptBin "my-editor" '' + codium + '') ]; services.nextcloud-client.enable = true;