more nixosWalrus changes

This commit is contained in:
2025-03-07 15:30:14 +00:00
parent 9a7f73afb2
commit debf4114d4
5 changed files with 96 additions and 14 deletions

77
flake.lock generated
View File

@@ -44,6 +44,27 @@
"type": "github"
}
},
"NixOS-WSL-2411": {
"inputs": {
"flake-compat": "flake-compat_3",
"nixpkgs": [
"nixpkgs-24-11"
]
},
"locked": {
"lastModified": 1741192150,
"narHash": "sha256-wB140alXVla1Rw/kENerUoma2qO1Jy5IYWbmiSqmJu0=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "0e4ccdb8181da2c6193c047b50ffee5f1a3b6dc1",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NixOS-WSL",
"type": "github"
}
},
"cmp-vimtex": {
"flake": false,
"locked": {
@@ -93,6 +114,22 @@
"type": "github"
}
},
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
@@ -170,6 +207,27 @@
"type": "github"
}
},
"homeManager-24-11": {
"inputs": {
"nixpkgs": [
"nixpkgs-24-11"
]
},
"locked": {
"lastModified": 1739757849,
"narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.11",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1725983898,
@@ -202,6 +260,22 @@
"type": "github"
}
},
"nixpkgs-24-11": {
"locked": {
"lastModified": 1741196730,
"narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1731763621,
@@ -256,11 +330,14 @@
"inputs": {
"NixOS-WSL": "NixOS-WSL",
"NixOS-WSL-2405": "NixOS-WSL-2405",
"NixOS-WSL-2411": "NixOS-WSL-2411",
"cmp-vimtex": "cmp-vimtex",
"homeManager": "homeManager",
"homeManager-24-05": "homeManager-24-05",
"homeManager-24-11": "homeManager-24-11",
"nixpkgs": "nixpkgs",
"nixpkgs-24-05": "nixpkgs-24-05",
"nixpkgs-24-11": "nixpkgs-24-11",
"nomodoro": "nomodoro",
"parrot-nvim": "parrot-nvim",
"sops-nix": "sops-nix",

View File

@@ -7,10 +7,9 @@
sops-nix.url = "github:Mic92/sops-nix";
# nixpkgs-23-11.url = "github:NixOS/nixpkgs/nixos-23.11";
nixpkgs-24-05.url = "github:NixOS/nixpkgs/nixos-24.05";
# nixpkgs-24-11.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-24-11.url = "github:NixOS/nixpkgs/nixos-24.11";
# only use this for Maxos, prefer specifying version explicitly
homeManager = {
@@ -23,10 +22,15 @@
inputs.nixpkgs.follows = "nixpkgs-24-05";
};
# homeManager-24-11 = {
# url = "github:nix-community/home-manager/release-24.11";
# inputs.nixpkgs.follows = "nixpkgs-24-11";
# };
NixOS-WSL-2411 = {
url = "github:nix-community/NixOS-WSL";
inputs.nixpkgs.follows = "nixpkgs-24-11";
};
homeManager-24-11 = {
url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs-24-11";
};
NixOS-WSL-2405 = {
@@ -59,7 +63,7 @@
};
};
outputs = { self, nixpkgs, homeManager, NixOS-WSL, NixOS-WSL-2405, nixpkgs-24-05, homeManager-24-05, cmp-vimtex, spaceport-nvim, nomodoro, ...}@inputs:
outputs = { self, nixpkgs, homeManager, NixOS-WSL, NixOS-WSL-2405, nixpkgs-24-05, nixpkgs-24-11, homeManager-24-05, homeManager-24-11, cmp-vimtex, spaceport-nvim, nomodoro, ...}@inputs:
let
customPackageOverlay = (import ./overlays/default.nix { inherit cmp-vimtex; inherit spaceport-nvim; inherit nomodoro; parrot-nvim = inputs.parrot-nvim; }).overlay;
in

View File

@@ -19,7 +19,8 @@ in
# lsps
pkgs.nil
pkgs.nodePackages.pyright
# pkgs.nodePackages.pyright
pkgs.pyright
pkgs.thefuck
pkgs.fzf

View File

@@ -20,7 +20,7 @@ in
# Enable integration with Docker Desktop (needs to be installed)
# docker-desktop.enable = true;
nativeSystemd = true;
# nativeSystemd = true;
wslConf.interop.appendWindowsPath = false;
@@ -29,7 +29,7 @@ in
networking.hostName = hostname; # Define your hostname.
# Enable nix flakes
nix.package = pkgs.nixFlakes;
# nix.package = pkgs.nixFlakes;
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
@@ -64,7 +64,7 @@ in
];
# try this out to fix WSL issue
environment.noXlibs = false;
# environment.noXlibs = false;
fonts.packages = with pkgs; [
fira-code

View File

@@ -25,7 +25,7 @@ in
}
];
};
"nixosWalrus" = nixpkgs-24-05.lib.nixosSystem {
"nixosWalrus" = inputs.nixpkgs-24-11.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit customPackageOverlay;
@@ -36,7 +36,7 @@ in
modules = [
./commonWSL-configuration.nix
inputs.sops-nix.nixosModules.sops
homeManager-24-05.nixosModules.home-manager {
inputs.homeManager-24-11.nixosModules.home-manager {
home-manager.extraSpecialArgs = {
withGUI = false;
gitSigningKey = "8F904A3FC7021497";
@@ -54,7 +54,7 @@ in
}
NixOS-WSL-2405.nixosModules.wsl
inputs.NixOS-WSL-2411.nixosModules.wsl
];
};
"nixosWSL" = nixpkgs-24-05.lib.nixosSystem {