samw
/
home
mirror of https://github.com/wlcx/home.git
1
Fork 0
Code Issues Projects Releases Wiki Activity

Compare commits

base: samw:a0b452def4fcd7ab52d2c30524345bcfce636e5a
Branches Tags
samw:main
..
compare: samw:2231683ffc85e0568284aa0c35424b99500cfe16
Branches Tags
samw:main

No commits in common. "a0b452def4fcd7ab52d2c30524345bcfce636e5a" and "2231683ffc85e0568284aa0c35424b99500cfe16" have entirely different histories.
a0b452def4 ... 2231683ffc

3 changed files with 11 additions and 30 deletions
Show Stats Expand all files Collapse all files

18
flake.lock
View File

@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1671489820, "lastModified": 1667210711,
"narHash": "sha256-qoei5HDJ8psd1YUPD7DhbHdhLIT9L2nadscp4Qk37uk=", "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "5aa3a8039c68b4bf869327446590f4cdf90bb634", "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -46,11 +46,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1672244468, "lastModified": 1670253003,
"narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=", "narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706", "rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -62,11 +62,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1672844754, "lastModified": 1672102598,
"narHash": "sha256-o26WabuHABQsaHxxmIrR3AQRqDFUEdLckLXkVCpIjSU=", "narHash": "sha256-7fzlPrDEpej/8ORSk7V4H4W6koOMD0juQ/M7whewNpk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e9ade2c8240e00a4784fac282a502efff2786bdc", "rev": "93c0d5dcf02409fe705500e90af38b33d3a259d3",
"type": "github" "type": "github"
}, },
"original": { "original": {

18
flake.nix
View File

@ -32,10 +32,7 @@
username ? "samw", username ? "samw",
}: }:
inputs.home-manager.lib.homeManagerConfiguration { inputs.home-manager.lib.homeManagerConfiguration {
pkgs = (import inputs.nixpkgs { pkgs = inputs.nixpkgs.legacyPackages.${system};
inherit system;
config.allowUnfree = true; # Yes I know it's bad for me
});
modules = [ modules = [
{ home = { { home = {
inherit username; inherit username;
@ -44,18 +41,7 @@
then "/Users/${username}" then "/Users/${username}"
else "/home/${username}"; else "/home/${username}";
stateVersion = "21.11"; stateVersion = "21.11";
};}] ++ profiles ++ [ };}] ++ profiles ++ [{nixpkgs.overlays = overlays;}];
{nixpkgs.overlays = overlays;}
# See comment in home/default.nix.
({ pkgs, ... }: {
nix = {
enable = true;
package = pkgs.nix;
settings.experimental-features = "nix-command flakes";
settings.max-jobs = "auto"; # Gotta go fast (build derivations in parallel)
};
})
];
extraSpecialArgs = {inherit system;}; extraSpecialArgs = {inherit system;};
}; };
}; };

5
home/default.nix
View File

@ -11,16 +11,12 @@ in {
"EDITOR" = "vim"; "EDITOR" = "vim";
"WORDCHARS" = "\${WORDCHARS//[\\/.=]/}"; # ctrl-w on paths without make angery "WORDCHARS" = "\${WORDCHARS//[\\/.=]/}"; # ctrl-w on paths without make angery
}; };
/*
# For some reason this doesn't play nice when using home manager config from inside
# a nixos configuration.
nix = { nix = {
enable = true; enable = true;
package = pkgs.nix; package = pkgs.nix;
settings.experimental-features = "nix-command flakes"; settings.experimental-features = "nix-command flakes";
settings.max-jobs = "auto"; # Gotta go fast (build derivations in parallel) settings.max-jobs = "auto"; # Gotta go fast (build derivations in parallel)
}; };
*/
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;
@ -41,7 +37,6 @@ in {
hmswitch = ''home-manager switch --flake ".#$(hostname -s)"''; hmswitch = ''home-manager switch --flake ".#$(hostname -s)"'';
nrswitch = "nixos-rebuild --use-remote-sudo switch --flake '.#'"; nrswitch = "nixos-rebuild --use-remote-sudo switch --flake '.#'";
da = "direnv allow ."; da = "direnv allow .";
dr = "direnv reload";
}; };
# Extra .zshrc stuff # Extra .zshrc stuff
initExtra = '' initExtra = ''