diff --git a/enviroments/common/default.nix b/enviroments/common/default.nix
index db1549d0..3dd24c1 100644
--- a/enviroments/common/default.nix
+++ b/enviroments/common/default.nix
@@ -122,7 +122,7 @@
automatic-timezoned = {
enable = true;
};
-
+
openssh = {
enable = true;
ports = [22];
@@ -154,7 +154,7 @@
iputils
dnsutils
];
-
+
sessionVariables = rec {
SOPS_AGE_KEY_DIRECTORY = "/var/lib/sops-nix";
SOPS_AGE_KEY_FILE = "${SOPS_AGE_KEY_DIRECTORY}/key.txt";
diff --git a/flake.nix b/flake.nix
index 7567deb..982ca67 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,11 +69,12 @@
horizon = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = [
- home-manager.nixosModules.home-manager {
+ home-manager.nixosModules.home-manager
+ {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.backupFileExtension = "backup";
- home-manager.extraSpecialArgs = { inherit inputs; };
+ home-manager.extraSpecialArgs = {inherit inputs;};
}
./hosts/horizon/configuration.nix
nixos-hardware.nixosModules.framework-11th-gen-intel
@@ -83,11 +84,12 @@
twilight = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = [
- home-manager.nixosModules.home-manager {
+ home-manager.nixosModules.home-manager
+ {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.backupFileExtension = "backup";
- home-manager.extraSpecialArgs = { inherit inputs; };
+ home-manager.extraSpecialArgs = {inherit inputs;};
}
./hosts/twilight/configuration.nix
];
@@ -97,11 +99,12 @@
specialArgs = {inherit inputs;};
modules = [
disko.nixosModules.disko
- home-manager.nixosModules.home-manager {
+ home-manager.nixosModules.home-manager
+ {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.backupFileExtension = "backup";
- home-manager.extraSpecialArgs = { inherit inputs; };
+ home-manager.extraSpecialArgs = {inherit inputs;};
}
./hosts/defiant/disko-config.nix
./hosts/defiant/configuration.nix
diff --git a/hosts/defiant/configuration.nix b/hosts/defiant/configuration.nix
index 2faa378..59744c8 100644
--- a/hosts/defiant/configuration.nix
+++ b/hosts/defiant/configuration.nix
@@ -14,7 +14,6 @@
../../enviroments/server
];
-
home-manager.users.leyla.config = {
isThinUser = true;
};
diff --git a/users/home.nix b/users/home.nix
index 62be450..0571905 100644
--- a/users/home.nix
+++ b/users/home.nix
@@ -2,4 +2,4 @@
leyla = import ./leyla/home.nix;
# ester = import ./ester/home.nix;
# eve = import ./eve/home.nix;
-}
\ No newline at end of file
+}
diff --git a/users/leyla/default.nix b/users/leyla/default.nix
index 0089d35..102e029 100644
--- a/users/leyla/default.nix
+++ b/users/leyla/default.nix
@@ -57,7 +57,6 @@ in {
acceleration = lib.mkIf cfg.hasGPU "cuda";
};
-
# TODO: this should reference the home directory from the user config
openssh.hostKeys = [
{
diff --git a/users/leyla/home.nix b/users/leyla/home.nix
index 9644e62..f8d4c42 100644
--- a/users/leyla/home.nix
+++ b/users/leyla/home.nix
@@ -105,7 +105,7 @@
nix-direnv.enable = true;
};
bash.enable = true; # see note on other shells below
-
+
# firefox = {
# enable = true;
# profiles.leyla = {
diff --git a/users/leyla/packages.nix b/users/leyla/packages.nix
index e14f157..294cad5 100644
--- a/users/leyla/packages.nix
+++ b/users/leyla/packages.nix
@@ -5,8 +5,7 @@
pkgs,
inputs,
...
-}:
-{
+}: {
nixpkgs = {
overlays = [
inputs.nix-vscode-extensions.overlays.default
@@ -18,14 +17,13 @@
code = "codium";
};
- vscode = let
+ vscode = let
extensions = inputs.nix-vscode-extensions.extensions.${pkgs.system};
open-vsx = extensions.open-vsx;
vscode-marketplace = extensions.vscode-marketplace;
- in
- {
+ in {
enable = true;
-
+
package = pkgs.vscodium;
mutableExtensionsDir = false;
@@ -36,44 +34,44 @@
"workbench.colorTheme" = "Atom One Dark";
};
- extensions = with extensions.open-vsx; [
- # vs code feel extensions
- ms-vscode.atom-keybindings
- akamud.vscode-theme-onedark
- streetsidesoftware.code-spell-checker
- streetsidesoftware.code-spell-checker-german
- streetsidesoftware.code-spell-checker-italian
- jeanp413.open-remote-ssh
+ extensions = with extensions.open-vsx;
+ [
+ # vs code feel extensions
+ ms-vscode.atom-keybindings
+ akamud.vscode-theme-onedark
+ streetsidesoftware.code-spell-checker
+ streetsidesoftware.code-spell-checker-german
+ streetsidesoftware.code-spell-checker-italian
+ jeanp413.open-remote-ssh
- # nix extensions
- pinage404.nix-extension-pack
- jnoortheen.nix-ide
+ # nix extensions
+ pinage404.nix-extension-pack
+ jnoortheen.nix-ide
- # html extensions
- formulahendry.auto-rename-tag
- ms-vscode.live-server
+ # html extensions
+ formulahendry.auto-rename-tag
+ ms-vscode.live-server
- # js extensions
- dsznajder.es7-react-js-snippets
- dbaeumer.vscode-eslint
- standard.vscode-standard
- firsttris.vscode-jest-runner
- stylelint.vscode-stylelint
- tauri-apps.tauri-vscode
+ # js extensions
+ dsznajder.es7-react-js-snippets
+ dbaeumer.vscode-eslint
+ standard.vscode-standard
+ firsttris.vscode-jest-runner
+ stylelint.vscode-stylelint
+ tauri-apps.tauri-vscode
- # misc extensions
- bungcip.better-toml
+ # misc extensions
+ bungcip.better-toml
- # the number at the start of the name here doesnt resolve nicely so we have to refernce it as a part of open-vsx directly instead of though with
- open-vsx."10nates".ollama-autocoder
- ]
- ++ (with extensions.vscode-marketplace; [
- # js extensions
- karyfoundation.nearley
- ]);
+ # the number at the start of the name here doesnt resolve nicely so we have to refernce it as a part of open-vsx directly instead of though with
+ open-vsx."10nates".ollama-autocoder
+ ]
+ ++ (with extensions.vscode-marketplace; [
+ # js extensions
+ karyfoundation.nearley
+ ]);
};
-
# steam = lib.mkIf config.isFullUser {
# enable = true;
# remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play