cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small flake tweaks

Browse source
This commit is contained in:
Cyryl Płotnicki 2021-05-30 23:13:31 +01:00
parent 546ee05634
commit e88a84f237
3 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
flake.lock
View file

@ -16,7 +16,7 @@
"type": "github"
}
},
"futils": {
"flake-utils": {
"locked": {
"lastModified": 1620759905,
"narHash": "sha256-WiyWawrgmyN0EdmiHyG2V+fqReiVi8bM9cRdMaKQOFg=",
@ -39,11 +39,11 @@
]
},
"locked": {
"lastModified": 1622368473,
"narHash": "sha256-5/HXUr8uv+L9ZerwEF3UefYL8Ik+j4uPoMpnxealANo=",
"lastModified": 1622407737,
"narHash": "sha256-nmPEv1khCD7x1DIJPmTG6HBsqAgga6P/kpOx2yPQfxM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d2aaeac42c563cf8cf76ee3b90d9585dadbb91e0",
"rev": "0e329cee4c17fa0b7df32233513b9cb2236d382b",
"type": "github"
},
"original": {
@ -55,11 +55,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1622194753,
"narHash": "sha256-76qtvFp/vFEz46lz5iZMJ0mnsWQYmuGYlb0fHgKqqMg=",
"lastModified": 1622282707,
"narHash": "sha256-+GOrUDsdneUqrOm9d+9bHXjEVoVcU8tm14WGVzbt6gg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "540dccb2aeaffa9dc69bfdc41c55abd7ccc6baa3",
"rev": "6933d068c5d2fcff398e802f7c4e271bbdab6705",
"type": "github"
},
"original": {
@ -71,11 +71,11 @@
},
"nur": {
"locked": {
"lastModified": 1622369728,
"narHash": "sha256-VLnaYJDw2DFP2p1LHDgEpV0FV6vyYGj3uV2ciJFuAiE=",
"lastModified": 1622409301,
"narHash": "sha256-DON9CpKTR9k14Y/+5fsXponzYyi7L41DKUsSYkOUHjU=",
"owner": "nix-community",
"repo": "NUR",
"rev": "58be3aa3e3940dd8f2401370ea348aaf97f5bbe6",
"rev": "1190770a713fb15aea2c6c25d3a0e0304ad51d71",
"type": "github"
},
"original": {
@ -88,7 +88,7 @@
"root": {
"inputs": {
"bisq": "bisq",
"futils": "futils",
"flake-utils": "flake-utils",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nur": "nur"

22
flake.nix
View file

@ -1,11 +1,11 @@
{
description = "NixOS configuration with flakes";
inputs = {
futils = {
nixpkgs = {
type = "github";
owner = "numtide";
repo = "flake-utils";
ref = "master";
owner = "NixOS";
repo = "nixpkgs";
ref = "nixos-unstable";
};
home-manager = {
@ -18,11 +18,11 @@
};
};
nixpkgs = {
flake-utils = {
type = "github";
owner = "NixOS";
repo = "nixpkgs";
ref = "nixos-unstable";
owner = "numtide";
repo = "flake-utils";
ref = "master";
};
nur = {
@ -40,19 +40,19 @@
};
};
outputs = { self, futils, home-manager, nixpkgs, nur, bisq } @ inputs: {
outputs = { self, flake-utils, home-manager, nixpkgs, nur, bisq } @ inputs: {
nixosConfigurations = {
foureighty = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
(import ./boxes/foureighty)
(import ./nixos/boxes/foureighty)
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.cyryl = import ./home-manager;
home-manager.users.cyryl = import ./nixos/home-manager;
}
];

2
nixos/home-manager/programs/zsh.nix
View file

@ -32,13 +32,13 @@
'';
envExtra = ''
[ -s "/home/cyryl/.jabba/jabba.sh" ] && source "/home/cyryl/.jabba/jabba.sh"
tmux source-file ~/.config/tmux/tmux.conf
local nixos_version=`which nixos-version`
if [[ ! -x "$nixos_version" ]]; then
source /home/cyryl/.nix-profile/etc/profile.d/nix.sh
export NIX_PATH="$HOME/.nix-defexpr/channels:$NIX_PATH"
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
tmux source-file ~/.config/tmux/tmux.conf
echo "non-nixos patches loaded"
fi
'';