varris
/
nixos-dotfiles
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
Varris 2022-08-07 21:02:21 +02:00
parent 00aecb279a
commit c784f98839
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock
View File

@ -38,11 +38,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1659881187, "lastModified": 1659896700,
"narHash": "sha256-9QKrAdJRQlaU3nLbfNwvjwQucuy5GCRTzPH2+w6NuxM=", "narHash": "sha256-PG0jBH9lpE9XBBP+sq9Gq4baZwwbeqWBnob5jFuaS+Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "9bbd8c3c689e076ef17eca0c3b2208068756fcb7", "rev": "d023e5cc92e746c130891b6110f5cf28d9734fb4",
"type": "github" "type": "github"
}, },
"original": { "original": {

20
flake.nix
View File

@ -8,21 +8,21 @@
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
nur.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs@{ self, nixpkgs, home-manager, nur, ... }: outputs = inputs@{ self, nixpkgs, home-manager, nur, ... }:
let let
username = "manuel";
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config = { allowUnfree = true; }; config = { allowUnfree = true; };
overlays = [ self.overlays.default ]; overlays = [ self.overlays.default nur.overlay ];
}; };
lib = nixpkgs.lib;
in in
{ {
overlays.default = overlays.default =
@ -34,10 +34,10 @@
}; };
}); });
nixosConfigurations.terra = lib.nixosSystem nixosConfigurations.terra = nixpkgs.lib.nixosSystem
{ {
inherit system; inherit system;
specialArgs = inputs; specialArgs = { inherit inputs; };
modules = [ modules = [
./system/configuration.nix ./system/configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
@ -46,11 +46,13 @@
{ {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users.manuel = import ./user/home.nix; users.${username} = import ./user/home.nix;
extraSpecialArgs = { inherit pkgs; }; extraSpecialArgs = {
inherit inputs;
inherit pkgs;
};
}; };
} }
nur.nixosModules.nur
]; ];
}; };
}; };

15
user/configs/fish/fish.nix
View File

@ -31,6 +31,21 @@
end end
popd &> /dev/null popd &> /dev/null
''; '';
nor = ''
pushd &> /dev/null
cd "${config.home.homeDirectory}/.dotfiles"
doas nixos-rebuild switch --upgrade --flake .#
popd &> /dev/null
'';
nou = ''
pushd &> /dev/null
cd "${config.home.homeDirectory}/.dotfiles"
nix flake update --commit-lock-file
doas nixos-rebuild switch --upgrade --flake .#
popd &> /dev/null
'';
}; };
shellAliases = { shellAliases = {
hm = "home-manager"; hm = "home-manager";