fix different vscode, the brain dead way
This commit is contained in:
parent
be05c654bc
commit
782e7da908
5 changed files with 30 additions and 21 deletions
31
flake.nix
31
flake.nix
|
|
@ -13,19 +13,24 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { nixpkgs, home-manager, hyprland, ... }:
|
outputs = { nixpkgs, home-manager, hyprland, ... }:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
};
|
};
|
||||||
lib = nixpkgs.lib;
|
lib = nixpkgs.lib;
|
||||||
mkConf = import ./lib/mkconf.nix;
|
mkConf = import ./lib/mkconf.nix;
|
||||||
|
|
||||||
user = "tristan";
|
user = "tristan";
|
||||||
in {
|
in
|
||||||
nixosConfigurations = {
|
{
|
||||||
zenix = mkConf "zenix" { inherit nixpkgs system user home-manager hyprland; };
|
nixosConfigurations = {
|
||||||
FCS-Tristan-Nixbook = mkConf "work" { inherit nixpkgs system user home-manager hyprland; };
|
zenix = mkConf "zenix" {
|
||||||
|
inherit pkgs nixpkgs system user home-manager hyprland;
|
||||||
|
};
|
||||||
|
FCS-Tristan-Nixbook = mkConf "work" {
|
||||||
|
inherit pkgs nixpkgs system user home-manager hyprland;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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 = [
|
||||||
|
|
|
||||||
|
|
@ -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/_
|
||||||
'');
|
'');
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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; [
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue