summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix2
-rw-r--r--hosts/glados-wsl/config.nix22
-rw-r--r--hosts/glados-wsl/default.nix53
-rw-r--r--hosts/glados-wsl/packages.nix1
4 files changed, 39 insertions, 39 deletions
diff --git a/flake.nix b/flake.nix
index 3c5931c..4df3c5d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,7 +25,7 @@
enable = true;
defaultUser = "seth";
nativeSystemd = true;
- wslConf.network.hostname = "glados";
+ wslConf.network.hostname = "glados-wsl";
startMenuLaunchers = false;
interop.includePath = false;
};
diff --git a/hosts/glados-wsl/config.nix b/hosts/glados-wsl/config.nix
deleted file mode 100644
index 7a649af..0000000
--- a/hosts/glados-wsl/config.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, pkgs, ...}:
-
-{
- # hardware = {
- # nvidia.package = boot.kernelPackages.nvidiaPackages.stable;
- # xserver = {
- # videoDrivers = [ "nvidia" ];
- # };
- # opengl.enable = true;
- # };
-
- networking.hostName = "glados-wsl";
-
- programs = {
- gnupg = {
- agent = {
- enable = true;
- pinentryFlavor = "curses";
- };
- };
- };
-}
diff --git a/hosts/glados-wsl/default.nix b/hosts/glados-wsl/default.nix
index 2846100..b7efacd 100644
--- a/hosts/glados-wsl/default.nix
+++ b/hosts/glados-wsl/default.nix
@@ -1,19 +1,40 @@
-{ config, modulesPath, pkgs, ...}:
-
{
- imports = [
- (modulesPath + "/profiles/minimal.nix")
- ./config.nix
- ./packages.nix
- ../../users/seth
- ];
+ config,
+ modulesPath,
+ pkgs,
+ ...
+}: {
+ imports = [
+ (modulesPath + "/profiles/minimal.nix")
+ ./packages.nix
+ ../../users/seth
+ ];
+
+ # enable non-free packages
+ nixpkgs.config.allowUnfree = true;
+
+ # Enable nix flakes
+ nix.package = pkgs.nixFlakes;
+ nix.settings.experimental-features = ["nix-command" "flakes"];
+
+ system.stateVersion = "22.11";
+
+ # hardware = {
+ # nvidia.package = boot.kernelPackages.nvidiaPackages.stable;
+ # xserver = {
+ # videoDrivers = [ "nvidia" ];
+ # };
+ # opengl.enable = true;
+ # };
+
+ networking.hostName = "glados-wsl";
- # enable non-free packages
- nixpkgs.config.allowUnfree = true;
-
- # Enable nix flakes
- nix.package = pkgs.nixFlakes;
- nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
- system.stateVersion = "22.11";
+ programs = {
+ gnupg = {
+ agent = {
+ enable = true;
+ pinentryFlavor = "curses";
+ };
+ };
+ };
}
diff --git a/hosts/glados-wsl/packages.nix b/hosts/glados-wsl/packages.nix
index bfca6df..9478ac5 100644
--- a/hosts/glados-wsl/packages.nix
+++ b/hosts/glados-wsl/packages.nix
@@ -5,6 +5,7 @@
git
neofetch
nixos-option
+ pinentry-curses
python310
vim
];