Compare commits

..

No commits in common. "251bb5df50b17cf7046d5e048e86dbcaa686b8bc" and "fa727b54c9ac1436f2eca7e12c416cd029e76e76" have entirely different histories.

5 changed files with 21 additions and 59 deletions

42
flake.lock generated
View File

@ -80,11 +80,11 @@
]
},
"locked": {
"lastModified": 1709204054,
"narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=",
"lastModified": 1708988456,
"narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2f3367769a93b226c467551315e9e270c3f78b15",
"rev": "1d085ea4444d26aa52297758b333b449b2aa6fca",
"type": "github"
},
"original": {
@ -103,11 +103,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1709425896,
"narHash": "sha256-r/Tsr+BfgaiJIWTwWrrxHzTmNGEIi8HzYDGO3kFJmx8=",
"lastModified": 1709132440,
"narHash": "sha256-FJB10xJc7tlwhQJ0DA0XRdKuiMxbcBleqoEH+VHmdgU=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "2a08f2ba84ead47bd13aae5797d0d71b2e11b612",
"rev": "4bc669f9331bb66ab30bd705d09f1239bc3e83ed",
"type": "github"
},
"original": {
@ -173,11 +173,11 @@
]
},
"locked": {
"lastModified": 1709391291,
"narHash": "sha256-NJwAgXRKLVuO3YLkGxXIanLvTKN+cJsYwbLoWOa7ODk=",
"lastModified": 1706198673,
"narHash": "sha256-bHlxFd+3QHy6eXtTzzhwVNcyxBSOxTvBuJGNUzI4C4M=",
"owner": "hyprwm",
"repo": "contrib",
"rev": "2d4ece4a008feefddc194bde785b1d39f987b5a7",
"rev": "16884001b26e6955ff4b88b4dfe4c8986e20f153",
"type": "github"
},
"original": {
@ -215,11 +215,11 @@
]
},
"locked": {
"lastModified": 1709211223,
"narHash": "sha256-1cjd+yXbTlnCwNwEDjn289rJ2f0er5M8pOig4PxniEM=",
"lastModified": 1708788887,
"narHash": "sha256-4HprTKLKiY8rXmthsuRAwXHW7hGaXsSlzmbXSWdOa7g=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "3257ad7f173b0314c8a42fec450fa6556495b97c",
"rev": "7e3fc6a99a2c9e6701e2e0d37f1755e29a798b91",
"type": "github"
},
"original": {
@ -246,11 +246,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1709356872,
"narHash": "sha256-mvxCirJbtkP0cZ6ABdwcgTk0u3bgLoIoEFIoYBvD6+4=",
"lastModified": 1709101946,
"narHash": "sha256-TsySgcWm/GlbYdL3AEva49ceeI2BdPQ7muwfYNr1fwo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "458b097d81f90275b3fdf03796f0563844926708",
"rev": "d53c2037394da6fe98decca417fc8fda64bf2443",
"type": "github"
},
"original": {
@ -262,11 +262,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1709309926,
"narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=",
"lastModified": 1708979614,
"narHash": "sha256-FWLWmYojIg6TeqxSnHkKpHu5SGnFP5um1uUjH+wRV6g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "79baff8812a0d68e24a836df0a364c678089e2c7",
"rev": "b7ee09cf5614b02d289cd86fcfa6f24d4e078c2a",
"type": "github"
},
"original": {
@ -315,11 +315,11 @@
]
},
"locked": {
"lastModified": 1709345349,
"narHash": "sha256-E2tsnkM97cGuzHKOqdkUXfmI+K1wS4dNTJJu5QH2Vuk=",
"lastModified": 1709086241,
"narHash": "sha256-3QHK5zu/5XOa+ghBeKzvt+/BLdEPjw/xDNLcpDfbkmg=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "6e6fde31711e699be2e7fb67aae1c7e23ef606e0",
"rev": "5d56056fb905ff550ee61b6ebb6674d494f57a9e",
"type": "github"
},
"original": {

View File

@ -214,12 +214,6 @@
hostname = "nullbox";
stateVersion = "23.11";
};
nixos-wsl = mkWSLSystem {
system = "x86_64-linux";
stateVersion = "23.11";
hostname = "nixos-wsl";
};
}; # end nixosConfigurations
}; # end outputs
} # end flake

View File

@ -17,9 +17,6 @@ in
nixfiles.programs.comma.enable = true;
# TODO move this stuff to a zsh.nix or something; this is just a quick fix so home.sessionVariables works
home.shellAliases = {
v = "nvim";
};
programs.fzf.enable = true;
programs.fzf.enableZshIntegration = true;
programs.zsh = {

View File

@ -1,23 +0,0 @@
{ pkgs, config, lib, ... }:
{
config = {
networking.hostName = "nixos-wsl";
nixfiles.profile.base.enable = true;
programs.gnupg.agent = {
enable = true;
pinentryFlavor = "gnome3";
};
fonts.packages = with pkgs; [
(nerdfonts.override { fonts = [ "FiraCode" ]; })
noto-fonts
noto-fonts-cjk
];
fileSystems."/mnt/wsl/instances/NixOS" = {
device = "/";
options = [ "bind" ];
};
};
}

View File

@ -1,6 +0,0 @@
{ pkgs, lib, config, osConfig ? {}, ... }:
{
config = {
nixfiles.profile.base.enable = true;
};
}