summaryrefslogtreecommitdiff
path: root/env/wsl
diff options
context:
space:
mode:
Diffstat (limited to 'env/wsl')
-rwxr-xr-xenv/wsl/bootstrap-configuration.nix3
-rwxr-xr-xenv/wsl/flake.lock136
-rwxr-xr-xenv/wsl/flake.nix36
-rw-r--r--env/wsl/kitty_new_window.bat2
-rw-r--r--env/wsl/settings.nix3
-rwxr-xr-xenv/wsl/wsl-dev-host.nix80
6 files changed, 31 insertions, 229 deletions
diff --git a/env/wsl/bootstrap-configuration.nix b/env/wsl/bootstrap-configuration.nix
index 86464c8..03f4bbf 100755
--- a/env/wsl/bootstrap-configuration.nix
+++ b/env/wsl/bootstrap-configuration.nix
@@ -1,5 +1,4 @@
-{ config, lib, pkgs, ... }:
-{
+{ pkgs, ... }: {
imports = [ <nixos-wsl/modules> ];
wsl.enable = true;
diff --git a/env/wsl/flake.lock b/env/wsl/flake.lock
deleted file mode 100755
index 42c0437..0000000
--- a/env/wsl/flake.lock
+++ /dev/null
@@ -1,136 +0,0 @@
-{
- "nodes": {
- "flake-compat": {
- "flake": false,
- "locked": {
- "lastModified": 1696426674,
- "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
- "flake-utils": {
- "inputs": {
- "systems": "systems"
- },
- "locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "home-manager": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1723986931,
- "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
- "owner": "nix-community",
- "repo": "home-manager",
- "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "ref": "master",
- "repo": "home-manager",
- "type": "github"
- }
- },
- "nixos-wsl": {
- "inputs": {
- "flake-compat": "flake-compat",
- "flake-utils": "flake-utils",
- "nixpkgs": "nixpkgs"
- },
- "locked": {
- "lastModified": 1723124175,
- "narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=",
- "owner": "nix-community",
- "repo": "NixOS-WSL",
- "rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "ref": "main",
- "repo": "NixOS-WSL",
- "type": "github"
- }
- },
- "nixpkgs": {
- "locked": {
- "lastModified": 1722087241,
- "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "8c50662509100d53229d4be607f1a3a31157fa12",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-24.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_2": {
- "locked": {
- "lastModified": 1723637854,
- "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "root": {
- "inputs": {
- "home-manager": "home-manager",
- "nixos-wsl": "nixos-wsl",
- "nixpkgs": "nixpkgs_2"
- }
- },
- "systems": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- }
- },
- "root": "root",
- "version": 7
-}
diff --git a/env/wsl/flake.nix b/env/wsl/flake.nix
deleted file mode 100755
index dc8c0b1..0000000
--- a/env/wsl/flake.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- inputs = {
- nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
- home-manager = {
- url = "github:nix-community/home-manager/master";
- inputs.nixpkgs.follows = "nixpkgs";
- };
- nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
- };
-
- outputs = { self, nixpkgs, home-manager, nixos-wsl }: {
- nixosConfigurations.wsl-dev = let
- system = "x86_64-linux";
- source-pkgs = nixpkgs.legacyPackages.${system};
- nixpkgs-patched = source-pkgs.applyPatches {
- name = "nixpkgs-patched";
- src = nixpkgs;
- #patches = [
- # ./noto_cjk_no_variable.diff
- #];
- };
- nixosSystem = import (nixpkgs-patched + "/nixos/lib/eval-config.nix");
- in nixosSystem {
- system = system;
- modules = [
- ({ pkgs, ... }: { nixpkgs.overlays = [ ]; })
- home-manager.nixosModules.home-manager {
- home-manager.useGlobalPkgs = true;
- home-manager.useUserPackages = true;
- }
- nixos-wsl.nixosModules.wsl
- ./wsl-dev-host.nix
- ];
- };
- };
-}
diff --git a/env/wsl/kitty_new_window.bat b/env/wsl/kitty_new_window.bat
index 698137c..8ebfa8d 100644
--- a/env/wsl/kitty_new_window.bat
+++ b/env/wsl/kitty_new_window.bat
@@ -1,2 +1,2 @@
@echo off
-wscript .\run_hidden.vbs wsl -- sh -c "cd ../..; nix develop .#wsl"
+wscript .\run_hidden.vbs wsl -- sh -c "cd ../..; nix develop .#default; kitty"
diff --git a/env/wsl/settings.nix b/env/wsl/settings.nix
index 362ed1c..51ae8d0 100644
--- a/env/wsl/settings.nix
+++ b/env/wsl/settings.nix
@@ -1,7 +1,8 @@
{
+ user = "john";
font = {
name = "Consolas";
- size = "12";
+ size = 12;
baseline = "-1";
};
scheme = import ./ssdog.nix;
diff --git a/env/wsl/wsl-dev-host.nix b/env/wsl/wsl-dev-host.nix
index afef6a8..fd9a1db 100755
--- a/env/wsl/wsl-dev-host.nix
+++ b/env/wsl/wsl-dev-host.nix
@@ -1,33 +1,30 @@
{ config, lib, pkgs, ... }:
let
- inherit (import ./settings.nix) scheme font;
+ inherit (import ./settings.nix) user font scheme;
in {
- imports = [ ];
+ wsl = {
+ enable = true;
+ defaultUser = user;
+ useWindowsDriver = true;
+ nativeSystemd = true;
+ };
- system.stateVersion = "24.11";
+ users.users.${user}.extraGroups = [ "audio" "video" ];
nix = {
settings = {
experimental-features = [ "nix-command" "flakes" ];
- trusted-users = [ "john" ];
+ trusted-users = [ user ];
};
};
- wsl = {
- enable = true;
- defaultUser = "john";
- useWindowsDriver = true;
- };
-
- users.users.john.extraGroups = [ "audio" "video" ];
-
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
- nixpkgs.config.allowUnfree = true;
- hardware.enableRedistributableFirmware = true;
-
boot.supportedFilesystems = [ "ntfs" "nfs" ];
boot.kernelParams = [ "mitigations=off" ];
+ nixpkgs.config.allowUnfree = true;
+ hardware.enableRedistributableFirmware = true;
+
networking.hostName = "wsl-dev";
networking.firewall.enable = false;
@@ -57,7 +54,6 @@ in {
vistafonts
noto-fonts
noto-fonts-extra
- noto-fonts-cjk
noto-fonts-cjk-sans
noto-fonts-cjk-serif
noto-fonts-emoji-blob-bin
@@ -86,62 +82,38 @@ in {
TERMINAL = "kitty";
};
- programs.zsh.enable = true;
- environment.shells = [ pkgs.zsh ];
- environment.pathsToLink = [ "/share/zsh" ];
- users.defaultUserShell = pkgs.zsh;
-
- home-manager.users.john = let
- homeDir = "${config.users.users.john.home}";
+ home-manager.users.${user} = let
+ homeDir = "${config.users.users.${user}.home}";
in {
- programs.zsh = {
+ programs.bash = {
enable = true;
- shellAliases = {
- sudo = "nocorrect sudo ";
- cmv-next = "cmv-add NEXT";
- cmv-prev = "cmv-add PREV";
- cmv-shuffle = "cmv-add SHUFFLE";
- cmc = "./src/fruits/cmc/cmc";
- };
- defaultKeymap = "emacs";
- history = {
- save = 10000;
- size = 10000;
- path = "${homeDir}/.histfile";
- share = false;
- };
- enableCompletion = true;
+ enableCompletion = false;
initExtra = ''
- autoload -U colors && colors
- setopt prompt_subst
- if [[ -v NIX_SHELL ]]; then
- PS1="%B($NIX_SHELL) %{$fg[blue]%}%n%{$fg[red]%}@%{$fg[light\ red]%}%M%{$fg[magenta]%}:%~%{$reset_color%}%b "
- else
- PS1="%B%{$fg[blue]%}%n%{$fg[red]%}@%{$fg[light\ red]%}%M%{$fg[magenta]%}:%~%{$reset_color%}%b "
- fi
+ PS1="\u@\H:\w > "
'';
};
programs.kitty = {
enable = true;
font = {
name = font.name;
- size = lib.toInt font.size;
+ size = font.size;
};
shellIntegration = {
mode = "enabled";
- enableZshIntegration = true;
+ enableBashIntegration = true;
};
extraConfig = ''
- enable_audio_bell no
- disable_ligatures always
- confirm_os_window_close 0
+ shell ${pkgs.bashInteractive}/bin/bash --login
update_check_interval 0
+ confirm_os_window_close 0
+ enable_audio_bell no
allow_remote_control yes
linux_display_server x11
- initial_window_width 640
- initial_window_height 480
+ initial_window_width 800
+ initial_window_height 600
remember_window_size yes
placement_strategy top-left
+ disable_ligatures always
modify_font baseline ${font.baseline}
cursor #${scheme.foreground}
foreground #${scheme.foreground}
@@ -180,4 +152,6 @@ in {
};
home.stateVersion = "${config.system.stateVersion}";
};
+
+ system.stateVersion = "25.05";
}
generated by cgit v1.2.3-101-g0448 (git 2.54.0) at 2026-07-25 19:47:03 +0000