From 1d6ac4d9303ed5afa526186536c3e6c326c0e7d7 Mon Sep 17 00:00:00 2001 From: autumn Date: Wed, 24 Sep 2025 15:54:47 +0000 Subject: [PATCH] wsl stuff --- flake.lock | 9 ++++----- home/autumn/bundles/langs.nix | 4 ++++ home/autumn/sysconfs/wsl-hive.nix | 2 +- home/packages/zellij/zellij.nix | 2 +- system/defaults/users.nix | 1 + system/wsl-hive/configuration.nix | 2 ++ 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index c919c96..27467e3 100644 --- a/flake.lock +++ b/flake.lock @@ -182,15 +182,14 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1, - "narHash": "sha256-wBVLwFjGszsaibW+oPRSRFq6vzKPxSmfsh1evEQ56Ow=", - "path": "/nix/store/ybygwf15aa782f1310fmxjzhw093fzm9-source/system/extras/pydev", + "path": "./system/extras/pydev/", "type": "path" }, "original": { - "path": "/nix/store/ybygwf15aa782f1310fmxjzhw093fzm9-source/system/extras/pydev", + "path": "./system/extras/pydev/", "type": "path" - } + }, + "parent": [] }, "pyproject-build-systems": { "inputs": { diff --git a/home/autumn/bundles/langs.nix b/home/autumn/bundles/langs.nix index c338591..d7d9c1d 100644 --- a/home/autumn/bundles/langs.nix +++ b/home/autumn/bundles/langs.nix @@ -3,6 +3,7 @@ { home.packages = with pkgs; [ ccls + cmake docker-language-server ember-cli ember-language-server @@ -10,14 +11,17 @@ gcc libgcc gleam + glib kdlfmt lessc + meson nil nim-2_0 nimlangserver odin ols # python314 + pkg-config python313 ruby rubyPackages_3_4.solargraph diff --git a/home/autumn/sysconfs/wsl-hive.nix b/home/autumn/sysconfs/wsl-hive.nix index 16f4646..f5919a6 100644 --- a/home/autumn/sysconfs/wsl-hive.nix +++ b/home/autumn/sysconfs/wsl-hive.nix @@ -1,7 +1,7 @@ {config, pkgs, ...}: { - programs.bash.initExtra= ''zsh''; + # home.shell = pkgs.zsh; imports = [ ../../packages/zsh/zsh.nix ../../packages/zellij/zellij.nix diff --git a/home/packages/zellij/zellij.nix b/home/packages/zellij/zellij.nix index 4a529b0..37d0381 100644 --- a/home/packages/zellij/zellij.nix +++ b/home/packages/zellij/zellij.nix @@ -3,7 +3,7 @@ { programs.zellij = { enable = true; - enableZshIntegration = true; + # enableZshIntegration = true; # exitShellOnExit = true; settings = { themes = { diff --git a/system/defaults/users.nix b/system/defaults/users.nix index 6c7f17e..d25e989 100644 --- a/system/defaults/users.nix +++ b/system/defaults/users.nix @@ -6,4 +6,5 @@ description = "Autumn"; extraGroups = [ "networkmanager" "wheel" ]; }; + users.defaultUserShell = pkgs.zsh; } diff --git a/system/wsl-hive/configuration.nix b/system/wsl-hive/configuration.nix index 85cc79c..f344f8b 100644 --- a/system/wsl-hive/configuration.nix +++ b/system/wsl-hive/configuration.nix @@ -10,6 +10,7 @@ { imports = [ # include NixOS-WSL modules + ../defaults/users.nix ]; @@ -17,6 +18,7 @@ wsl.defaultUser = "autumn"; networking.hostName = "wsl-hive"; environment.systemPackages = [pkgs.git]; + programs.zsh.enable = true; nix.settings.experimental-features = ["nix-command" "flakes"]; # This value determines the NixOS release from which the default