flake: initial flake conversion done!
This commit is contained in:
parent
277a050b81
commit
abb4fdbc9a
|
|
@ -25,12 +25,6 @@ in {
|
|||
nixpkgs.config = {
|
||||
allowUnfree = true;
|
||||
joypixels.acceptLicense = true;
|
||||
packageOverrides = pkgs: {
|
||||
nur = import (builtins.fetchTarball
|
||||
"https://github.com/nix-community/NUR/archive/master.tar.gz") {
|
||||
inherit pkgs;
|
||||
};
|
||||
};
|
||||
};
|
||||
nixpkgs.overlays = [
|
||||
# (self: super: { libvirt = (import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/066676b839a217f6b1b5d8ab05842604d33b7258.tar.gz") {}).libvirt; })
|
||||
|
|
|
|||
33
flake.lock
33
flake.lock
|
|
@ -20,20 +20,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"latest": {
|
||||
"locked": {
|
||||
"lastModified": 1621793326,
|
||||
"narHash": "sha256-yt4MOSZttklXCb/UJ9sPAGR7m7JF+3nAXLijjkCCoZk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ab51a2dbd6b5fcc8f6ae467075a2863ecac7c7d0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixos": {
|
||||
"locked": {
|
||||
"lastModified": 1621728353,
|
||||
|
|
@ -49,11 +35,26 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1621822619,
|
||||
"narHash": "sha256-WCydaG1C9svydkDZavJl+kdpc8a/duWXybXBvGD4kSQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "5eba7c6f533d8de8acb4ffe269425a3f57420bb9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"latest": "latest",
|
||||
"nixos": "nixos"
|
||||
"nixos": "nixos",
|
||||
"nur": "nur"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
17
flake.nix
17
flake.nix
|
|
@ -3,12 +3,14 @@
|
|||
|
||||
inputs = {
|
||||
nixos.url = "nixpkgs/nixos-unstable";
|
||||
latest.url = "nixpkgs";
|
||||
|
||||
home-manager.url = "github:nix-community/home-manager";
|
||||
home-manager.inputs.nixpkgs.follows = "nixos";
|
||||
|
||||
nur.url = "github:nix-community/NUR";
|
||||
};
|
||||
|
||||
outputs = { self, nixos, latest, home-manager }: {
|
||||
outputs = { self, nixos, home-manager, nur }: {
|
||||
|
||||
nixosConfigurations = {
|
||||
arianrhod = nixos.lib.nixosSystem {
|
||||
|
|
@ -19,11 +21,12 @@
|
|||
./hosts/arianrhod/hardware.nix
|
||||
./secrets/arianrhod.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
# {
|
||||
# home-manager.useGlobalPkgs = true;
|
||||
# home-manager.useUserPackages = true;
|
||||
# home-manager.users.jdoe = import ./home.nix;
|
||||
# }
|
||||
{ nixpkgs.overlays = [ nur.overlay ]; }
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.jez = import ./home/jez/home.nix;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
source = ../dotfiles/zsh;
|
||||
recursive = true;
|
||||
};
|
||||
".zsh/omz-custom/plugins/zsh-syntax-highlighting" = {
|
||||
source = fetchGit {
|
||||
url = "https://github.com/zsh-users/zsh-syntax-highlighting.git";
|
||||
};
|
||||
};
|
||||
# ".zsh/omz-custom/plugins/zsh-syntax-highlighting" = {
|
||||
# source = fetchGit {
|
||||
# url = "https://github.com/zsh-users/zsh-syntax-highlighting.git";
|
||||
# };
|
||||
# };
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
|
|
@ -33,6 +33,8 @@
|
|||
colordiff
|
||||
screenfetch
|
||||
termdown
|
||||
|
||||
zsh-syntax-highlighting
|
||||
];
|
||||
|
||||
programs.zsh = {
|
||||
|
|
@ -78,7 +80,6 @@
|
|||
"docker"
|
||||
"archlinux"
|
||||
"kitty"
|
||||
"zsh-syntax-highlighting"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{ config, pkgs, lib, hostname, ... }:
|
||||
|
||||
with builtins;
|
||||
let
|
||||
util = import ./util.nix { inherit pkgs; };
|
||||
hostname = lib.strings.fileContents /etc/hostname;
|
||||
host-config = ./machines + "/${hostname}.nix";
|
||||
# host-config = ./machines + "/${hostname}.nix";
|
||||
h = config.home.homeDirectory;
|
||||
in {
|
||||
programs.home-manager.enable = true;
|
||||
|
|
@ -18,21 +17,21 @@ in {
|
|||
./bits/vim.nix
|
||||
./modules/gopass.nix
|
||||
./modules/protonmail.nix
|
||||
] ++ lib.lists.optional (pathExists host-config) host-config;
|
||||
] ;#++ lib.lists.optional (pathExists host-config) host-config;
|
||||
|
||||
nixpkgs.config = {
|
||||
allowUnfree = true;
|
||||
joypixels.acceptLicense = true;
|
||||
packageOverrides = pkgs:
|
||||
let mypkgs = import ../../nixexprs { inherit pkgs; };
|
||||
in {
|
||||
nur = import (builtins.fetchTarball
|
||||
"https://github.com/nix-community/NUR/archive/master.tar.gz") {
|
||||
inherit pkgs;
|
||||
};
|
||||
inherit (mypkgs) dart-sass;
|
||||
};
|
||||
};
|
||||
# nixpkgs.config = {
|
||||
# allowUnfree = true;
|
||||
# joypixels.acceptLicense = true;
|
||||
# packageOverrides = pkgs:
|
||||
# let mypkgs = import ../../nixexprs { inherit pkgs; };
|
||||
# in {
|
||||
# nur = import (builtins.fetchTarball
|
||||
# "https://github.com/nix-community/NUR/archive/master.tar.gz") {
|
||||
# inherit pkgs;
|
||||
# };
|
||||
# inherit (mypkgs) dart-sass;
|
||||
# };
|
||||
# };
|
||||
|
||||
home.username = "jez";
|
||||
# home.homeDirectory = h;
|
||||
|
|
@ -102,7 +101,6 @@ in {
|
|||
zotero
|
||||
bibtool
|
||||
hugo
|
||||
dart-sass
|
||||
|
||||
R
|
||||
gcc_latest
|
||||
|
|
|
|||
Loading…
Reference in New Issue