[NixOS] Move to home-manager

This commit is contained in:
2021-07-13 03:37:03 -06:00
parent 417524f92a
commit ff6d984d4c
34 changed files with 119 additions and 278 deletions

View File

@@ -70,7 +70,7 @@ in
# Tools
binutils
# direnv
gawk
gitFull
htop
ncdu

25
nixos/flake.lock generated
View File

@@ -19,6 +19,26 @@
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1626168714,
"narHash": "sha256-LivElv4aPfojh8HxJy6VAmDAf7zA40S7jGGSV7+wLvg=",
"owner": "IvanMalison",
"repo": "home-manager",
"rev": "557c159dfaf17eff3bd55ad6e8433bf59f40fab0",
"type": "github"
},
"original": {
"owner": "IvanMalison",
"repo": "home-manager",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1625333638,
@@ -74,7 +94,7 @@
},
"nixpkgs_4": {
"locked": {
"narHash": "sha256-vAvfFQe4KHWheJHI4cEc2CYTzXnuRAvPu/bTH4GXhcc=",
"narHash": "sha256-oHUlQvEu4A9dWu52bZdxg29z5Xy6NVJGZjmsKwb6yo4=",
"path": "/home/imalison/Projects/nixpkgs",
"type": "path"
},
@@ -85,7 +105,7 @@
},
"nixpkgs_5": {
"locked": {
"narHash": "sha256-vAvfFQe4KHWheJHI4cEc2CYTzXnuRAvPu/bTH4GXhcc=",
"narHash": "sha256-oHUlQvEu4A9dWu52bZdxg29z5Xy6NVJGZjmsKwb6yo4=",
"path": "/home/imalison/Projects/nixpkgs",
"type": "path"
},
@@ -96,6 +116,7 @@
},
"root": {
"inputs": {
"home-manager": "home-manager",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"taffybar": "taffybar",

View File

@@ -13,11 +13,18 @@
url = path:../dotfiles/config/xmonad/xmonad;
};
nixos-hardware.url = github:nixos/nixos-hardware;
home-manager = {
url = github:IvanMalison/home-manager;
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, nixos-hardware, taffybar, xmonad, xmonad-contrib }:
let tweaks = ({...}: {
outputs = { self, nixpkgs, nixos-hardware, home-manager, taffybar, xmonad, xmonad-contrib }:
let forAll = ({...}: {
nix.registry.nixpkgs.flake = nixpkgs;
nixpkgs.overlays = [ taffybar.overlay xmonad.overlay xmonad-contrib.overlay ];
imports = [
home-manager.nixosModule
];
});
piHardware = ({ ... }: {
imports = [
@@ -29,15 +36,15 @@
nixosConfigurations = {
ivanm-dfinity-razer = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ tweaks ./machines/ivanm-dfinity-razer.nix ];
modules = [ forAll ./machines/ivanm-dfinity-razer.nix ];
};
ryzen-shine = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ tweaks ./machines/ryzen-shine.nix ];
modules = [ forAll ./machines/ryzen-shine.nix ];
};
biskcomp = nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
modules = [ tweaks piHardware ./machines/biskcomp.nix ];
modules = [ forAll piHardware ./machines/biskcomp.nix ];
};
};
};

66
nixos/home-manager.nix Normal file
View File

@@ -0,0 +1,66 @@
{ pkgs, ... }: {
home.sessionVariablesExtra = ''
ROFI_SYSTEMD_TERM="alacritty"
'';
xsession = {
preferStatusNotifierItems = true;
};
home.emptyActivationPath = false;
programs.home-manager.enable = true;
programs.ssh = {
forwardAgent = true;
};
# programs.zsh = {
# enable = true;
# };
services.gpg-agent = {
enable = true;
defaultCacheTtl = 8 * 60 * 60;
maxCacheTtl = 8 * 60 * 60;
enableSshSupport = true;
};
services.picom = {
enable = true;
};
services.blueman-applet = {
enable = true;
};
services.taffybar = {
enable = true;
package = pkgs.haskellPackages.imalison-taffybar;
};
# notifyosd
# skippyxd
# volnoti
services.kdeconnect = {
enable = true;
indicator = true;
};
services.network-manager-applet.enable = true;
services.udiskie = {
enable = true;
tray = "always";
};
services.status-notifier-watcher.enable = true;
services.random-background = {
enable = true;
display = "center";
interval = "1h";
imageDirectory = "%h/Pictures/wallpaper/use";
};
services.xsettingsd.enable = true;
}

View File

@@ -24,6 +24,9 @@
imalison = userDefaults // {
name = "imalison";
shell = pkgs.zsh;
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICzGkqGJm+nrMvsrfuWOLVxXHvi0UL1ULJmyfzS9sKpy imalison@biskcomp.local"
];
};
kat = userDefaults // {
name = "kat";
@@ -31,5 +34,9 @@
};
};
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.imalison = import ./home-manager.nix;
nix.trustedUsers = ["imalison" "kat"];
}