winston/dotfiles
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

feat: slim down wsl install

Browse source
This commit is contained in:
winston 2024-02-23 10:13:54 +01:00
parent a68e0ca317
commit 48c895adae
Signed by: winston
GPG key ID: 3786770EDBC2B481
9 changed files with 166 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

177
flake.lock
View file

@ -2,12 +2,19 @@
"nodes": {
"agenix": {
"inputs": {
"darwin": "darwin",
"home-manager": "home-manager",
"darwin": [
"darwin"
],
"home-manager": [
"home-manager"
],
"nixpkgs": [
"nixpkgs"
],
"systems": "systems"
"systems": [
"flake-utils",
"systems"
]
},
"locked": {
"lastModified": 1707830867,
@ -66,37 +73,15 @@
"darwin": {
"inputs": {
"nixpkgs": [
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1700795494,
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"lastModified": 1708231718,
"narHash": "sha256-IZdieFWvhBkxoOFMDejqLUYqD94WN6k0YSpw0DFy+4g=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"darwin_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1707707289,
"narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd",
"rev": "0e6857fa1d632637488666c08e7b02c08e3178f8",
"type": "github"
},
"original": {
@ -107,7 +92,9 @@
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
"nixpkgs-lib": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1706830856,
@ -125,7 +112,7 @@
},
"flake-utils": {
"inputs": {
"systems": "systems_2"
"systems": "systems"
},
"locked": {
"lastModified": 1705309234,
@ -143,7 +130,7 @@
},
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
"systems": "systems_2"
},
"locked": {
"lastModified": 1705309234,
@ -183,36 +170,15 @@
"home-manager": {
"inputs": {
"nixpkgs": [
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1703113217,
"narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
"lastModified": 1708591310,
"narHash": "sha256-8mQGVs8JccWTnORgoLOTh9zvf6Np+x2JzhIc+LDcJ9s=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1707919853,
"narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "043ba285c6dc20f36441d48525402bcb9743c498",
"rev": "0e0e9669547e45ea6cca2de4044c1a384fd0fe55",
"type": "github"
},
"original": {
@ -228,11 +194,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1707894220,
"narHash": "sha256-jHIV2jjNIG+w3pAnjoOEFxHCHZ2vP2c1YZLtXstLqQQ=",
"lastModified": 1708585389,
"narHash": "sha256-CtKgXtHjOWAJQF7FF2XJFcVwKH0A0xE1xj1GnHGf7UI=",
"owner": "nekowinston",
"repo": "nur",
"rev": "0d91a010e4ee989765ec849e8a3df74554d887a6",
"rev": "10b5d3f61ab8d6bb1bf236b183800fccaa7a3a78",
"type": "github"
},
"original": {
@ -248,11 +214,11 @@
]
},
"locked": {
"lastModified": 1707620986,
"narHash": "sha256-XE0tCSkSVBeJDWhjFwusNInwAhrnp+TloUNUpvnTiLw=",
"lastModified": 1708225687,
"narHash": "sha256-NJBDfvknI26beOFmjO2coeJMTTUCCtw2Iu+rvJ1Zb9k=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "0cb4345704123492e6d1f1068629069413c80de0",
"rev": "17352eb241a8d158c4ac523b19d8d2a6c8efe127",
"type": "github"
},
"original": {
@ -272,11 +238,11 @@
]
},
"locked": {
"lastModified": 1707959659,
"narHash": "sha256-bZmLqeoa6M9Dhx5WKpBYExhoy4mrW4FSDWBTxBnVaBg=",
"lastModified": 1708564557,
"narHash": "sha256-aG1OY88ntSeoLbS8+mAqU/m8rMC2q5tfmGFdLRYjzOs=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "f7483e526e4fc42b979d652d8e43bfd6204924c0",
"rev": "8b06e691e817a0de06bd22f610e778937ab7ade0",
"type": "github"
},
"original": {
@ -287,11 +253,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1707268954,
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
"lastModified": 1708118438,
"narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
"rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
"type": "github"
},
"original": {
@ -301,31 +267,13 @@
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1706550542,
"narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1707863367,
"narHash": "sha256-LdBbCSSP7VHaHA4KXcPGKqkvsowT2+7W4jlEHJj6rPg=",
"lastModified": 1708475490,
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "35ff7e87ee05199a8003f438ec11a174bcbd98ea",
"rev": "0e74ca98a74bc7270d28838369593635a5db3260",
"type": "github"
},
"original": {
@ -337,11 +285,11 @@
},
"nur": {
"locked": {
"lastModified": 1707995185,
"narHash": "sha256-EZEloWq14yCTy3X6uBOTDxgC4bIKUcxzVfdKnfQau/0=",
"lastModified": 1708597774,
"narHash": "sha256-dofnVMqnuLFiVUGl5l3J27byhnWehd3QvFhLZWczqBc=",
"owner": "nix-community",
"repo": "nur",
"rev": "b49255739b185560e4025ed905b76e12bd73ba40",
"rev": "f2af010f46a7eb25cbeef01f6942eb3b14fbd1da",
"type": "github"
},
"original": {
@ -365,11 +313,11 @@
]
},
"locked": {
"lastModified": 1707297608,
"narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=",
"lastModified": 1708018599,
"narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "0db2e67ee49910adfa13010e7f012149660af7f0",
"rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431",
"type": "github"
},
"original": {
@ -383,10 +331,10 @@
"agenix": "agenix",
"caarlos0-nur": "caarlos0-nur",
"catppuccin-vsc": "catppuccin-vsc",
"darwin": "darwin_2",
"darwin": "darwin",
"flake-parts": "flake-parts",
"flake-utils": "flake-utils",
"home-manager": "home-manager_2",
"home-manager": "home-manager",
"nekowinston-nur": "nekowinston-nur",
"nix-index-database": "nix-index-database",
"nix-vscode-extensions": "nix-vscode-extensions",
@ -394,6 +342,7 @@
"nur": "nur",
"pre-commit-hooks": "pre-commit-hooks",
"swayfx": "swayfx",
"vscode-server": "vscode-server",
"wsl": "wsl"
}
},
@ -409,11 +358,11 @@
]
},
"locked": {
"lastModified": 1707617562,
"narHash": "sha256-Kk2vv5e4MqKPjelKoYsa6YaUyv3pvjWY9nJSnP2QU9w=",
"lastModified": 1708231627,
"narHash": "sha256-beDYL9tOe1pw1kLChFbSSSl5wM81rat6t96baqG4+xM=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a22bbbee9b479c6d95b4819135e856a6d447b3ba",
"rev": "5d4170f50065cb04cef941831786a50637c4e20b",
"type": "github"
},
"original": {
@ -473,18 +422,26 @@
"type": "github"
}
},
"systems_3": {
"vscode-server": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"lastModified": 1684517665,
"narHash": "sha256-SaAr66uCQ8CF75jIr23FZjk1+9Kfwm5sQnwV25206Gs=",
"owner": "nix-community",
"repo": "nixos-vscode-server",
"rev": "1e1358493df6529d4c7bc4cc3066f76fd16d4ae6",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"owner": "nix-community",
"repo": "nixos-vscode-server",
"type": "github"
}
},
@ -499,11 +456,11 @@
]
},
"locked": {
"lastModified": 1707761607,
"narHash": "sha256-OKNdTgnyhZpmqdgba8s78/QvowyTIMJDp0iLxv570bU=",
"lastModified": 1708331102,
"narHash": "sha256-nTOiQvmbB9HtxeTWgXdd2FH2w3cOyOIIrPUm+YtDVyY=",
"owner": "nix-community",
"repo": "nixos-wsl",
"rev": "c8ddba82ca6b791be1acaae4b336ff8e857ec70b",
"rev": "e6bbc01a35626b8db741bcbc0af807379d372218",
"type": "github"
},
"original": {

28
flake.nix
View file

@ -132,26 +132,38 @@
inputs.nixpkgs.follows = "nixpkgs";
};
agenix = {
url = "github:ryantm/agenix";
inputs.darwin.follows = "darwin";
inputs.home-manager.follows = "home-manager";
inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "flake-utils/systems";
};
nix-index-database = {
url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-vscode-extensions = {
url = "github:nix-community/nix-vscode-extensions";
inputs.flake-compat.follows = "";
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
nix-index-database.url = "github:nix-community/nix-index-database";
agenix = {
url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs";
};
swayfx = {
url = "github:willpower3309/swayfx";
inputs.flake-compat.follows = "";
inputs.nixpkgs.follows = "nixpkgs";
};
vscode-server = {
url = "github:nix-community/nixos-vscode-server";
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs";
};
flake-parts.url = "github:hercules-ci/flake-parts";
flake-parts = {
url = "github:hercules-ci/flake-parts";
inputs.nixpkgs-lib.follows = "nixpkgs";
};
flake-utils.url = "github:numtide/flake-utils";
pre-commit-hooks = {
url = "github:cachix/pre-commit-hooks.nix";

4
home/apps/gnome.nix
View file

@ -1,5 +1,7 @@
{
config,
lib,
osConfig,
pkgs,
...
}: let
@ -7,6 +9,7 @@
secondary-color = "#161321";
wallpaper-uri = "file://${../wallpapers/dhm_1610.png}";
in {
config = lib.mkIf (config.isGraphical && pkgs.stdenv.isLinux && (osConfig.dotfiles.desktop == "gnome")) {
home.packages = with pkgs.gnomeExtensions; [
appindicator
blur-my-shell
@ -58,4 +61,5 @@ in {
inherit primary-color secondary-color;
};
};
};
}

7
home/apps/vscode.nix
View file

@ -3,6 +3,7 @@
flakePath,
lib,
pkgs,
isNixOS,
...
}: let
inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux;
@ -132,4 +133,10 @@ in {
};
};
xdg.mimeApps.defaultApplications."text/plain" = "code.desktop";
services.vscode-server = {
# when using a non-nixOS system, there's no need to patch the server
enable = isNixOS;
nodejsPackage = pkgs.nodejs_18;
};
}

3
home/lib.nix
View file

@ -11,7 +11,7 @@
if isDarwin
then "/Users/${username}/.config/flake"
else "/home/${username}/.config/flake";
inherit inputs;
inherit inputs isNixOS;
};
hmStandaloneConfig = {
@ -33,6 +33,7 @@
caarlos0-nur.homeManagerModules.default
nekowinston-nur.homeManagerModules.default
nix-index-database.hmModules.nix-index
vscode-server.homeModules.default
])
++ [
({

9
machines/common/linux/network.nix
View file

@ -1,4 +1,9 @@
{pkgs, ...}: {
{
config,
lib,
pkgs,
...
}: {
services = {
dnsmasq = {
enable = true;
@ -17,7 +22,7 @@
};
mullvad-vpn = {
enable = true;
package = pkgs.mullvad-vpn;
package = lib.mkIf config.isGraphical pkgs.mullvad-vpn;
};
stubby = {
enable = true;

6
machines/common/linux/sound.nix
View file

@ -1,9 +1,9 @@
{
programs.noisetorch.enable = true;
{config, ...}: {
programs.noisetorch.enable = config.isGraphical;
security.rtkit.enable = true;
services = {
pipewire = {
enable = true;
enable = config.isGraphical;
pulse.enable = true;
alsa.enable = true;
};

7
machines/common/wsl/default.nix
View file

@ -3,7 +3,12 @@
pkgs,
...
}: {
services.kanata.enable = lib.mkForce false;
services = {
kanata.enable = lib.mkForce false;
dnsmasq.enable = lib.mkForce false;
mullvad-vpn.enable = lib.mkForce false;
stubby.enable = lib.mkForce false;
};
system = {
build.installBootLoader = lib.mkForce "${pkgs.coreutils}/bin/true";

7
machines/lib.nix
View file

@ -45,7 +45,7 @@
in {
${target}."${host}" = builder {
inherit system;
modules = with inputs;
modules =
[
{
options = {
@ -56,7 +56,7 @@
description = "The username of the user";
};
desktop = mkOption {
type = types.enum ["gnome" "sway"];
type = types.nullOr (types.enum ["gnome" "sway"]);
default = "sway";
description = "The desktop environment to use";
};
@ -67,12 +67,13 @@
description = "Whether the system is a graphical target";
};
};
config.dotfiles.desktop = pkgs.lib.mkIf (!isGraphical) null;
config.networking.hostName = host;
}
./common/shared
./common/${hostPlatform}
./${host}
home-manager.${module}.home-manager
inputs.home-manager.${module}.home-manager
]
++ [(hmCommonConfig {inherit username;})]
++ extraModules;