fix different vscode, the brain dead way

This commit is contained in:
Tristan 2023-04-25 18:13:50 +01:00
parent be05c654bc
commit 782e7da908
5 changed files with 30 additions and 21 deletions

View file

@ -22,10 +22,15 @@
mkConf = import ./lib/mkconf.nix; mkConf = import ./lib/mkconf.nix;
user = "tristan"; user = "tristan";
in { in
{
nixosConfigurations = { nixosConfigurations = {
zenix = mkConf "zenix" { inherit nixpkgs system user home-manager hyprland; }; zenix = mkConf "zenix" {
FCS-Tristan-Nixbook = mkConf "work" { inherit nixpkgs system user home-manager hyprland; }; inherit pkgs nixpkgs system user home-manager hyprland;
};
FCS-Tristan-Nixbook = mkConf "work" {
inherit pkgs nixpkgs system user home-manager hyprland;
};
}; };
}; };
} }

View file

@ -7,14 +7,15 @@ nixpkgs.lib.nixosSystem rec {
{ {
nix.settings = { nix.settings = {
substituters = ["https://hyprland.cachix.org"]; substituters = [ "https://hyprland.cachix.org" ];
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
}; };
} }
../system/global/system.nix ../system/global/system.nix
../system/${name}/system.nix ../system/${name}/system.nix
../system/${name}/hardware.nix ../system/${name}/hardware.nix
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.${user}.imports = [ home-manager.users.${user}.imports = [

View file

@ -1,4 +1,4 @@
{ config, pkgs, user, name, ... }: { config, pkgs, user, name, editor, ... }:
# https://nix-community.github.io/home-manager/options.html # https://nix-community.github.io/home-manager/options.html
let let
my-deps = { my-deps = {
@ -56,7 +56,7 @@ let
open-code = (pkgs.writeShellScriptBin "open-code" '' open-code = (pkgs.writeShellScriptBin "open-code" ''
code_dir=~/Documents/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/_
''); '');
}; };

View file

@ -19,6 +19,9 @@ in
libreoffice libreoffice
ansible ansible
thunderbird thunderbird
(pkgs.writeShellScriptBin "my-editor" ''
code
'')
(pkgs.makeDesktopItem { (pkgs.makeDesktopItem {
name = "teams"; name = "teams";
desktopName = "Microsoft Teams"; desktopName = "Microsoft Teams";
@ -69,9 +72,6 @@ in
programs.firefox.enable = true; programs.firefox.enable = true;
home.shellAliases = {
codium = lib.mkForce "code";
};
programs.vscode = { programs.vscode = {
package = lib.mkForce pkgs.vscode; package = lib.mkForce pkgs.vscode;
extensions = with pkgs; [ extensions = with pkgs; [

View file

@ -15,6 +15,9 @@
handbrake handbrake
monero-gui monero-gui
xmrig xmrig
(pkgs.writeShellScriptBin "my-editor" ''
codium
'')
]; ];
services.nextcloud-client.enable = true; services.nextcloud-client.enable = true;