Add file encryption and flake-utils

This commit is contained in:
Tibo De Peuter 2023-03-22 22:12:39 +01:00 committed by Tibo De Peuter
parent ab3f87c20e
commit dc3301b93c
3 changed files with 121 additions and 89 deletions

View file

@ -1,18 +1,58 @@
{
"nodes": {
"devshell": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1678957337,
"narHash": "sha256-Gw4nVbuKRdTwPngeOZQOzH/IFowmz4LryMPDiJN/ah4=",
"owner": "numtide",
"repo": "devshell",
"rev": "3e0e60ab37cd0bf7ab59888f5c32499d851edb47",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"utils": "utils"
"utils": [
"flake-utils"
]
},
"locked": {
"lastModified": 1678285456,
"narHash": "sha256-2rIk5OFGQmoFX1MWntKGPVCZvy5yQMX3ZCYz7i8+yb0=",
"lastModified": 1679067101,
"narHash": "sha256-tMI1inGT9u4KWQml0w30dhWqQPlth1e9K/68sfDkEQA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b0be47978de5cfd729a79c3f57ace4c86364ff45",
"rev": "9154cd519a8942728038819682d6b3ff33f321bb",
"type": "github"
},
"original": {
@ -24,11 +64,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1678703398,
"narHash": "sha256-Y1mW3dBsoWLHpYm+UIHb5VZ7rx024NNHaF16oZBx++o=",
"lastModified": 1679318992,
"narHash": "sha256-uoj5Oy6hruIHuxzfQZtcalObe5kPrX9v+ClUMFEOzmE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "67f26c1cfc5d5783628231e776a81c1ade623e0b",
"rev": "e2c97799da5f5cd87adfa5017fba971771e123ef",
"type": "github"
},
"original": {
@ -37,40 +77,32 @@
"type": "indirect"
}
},
"nur": {
"locked": {
"lastModified": 1678788009,
"narHash": "sha256-O9nMPCAly/lUJHqtz8IAa8sf4uuB/6arHDEyQoRXTyw=",
"owner": "nix-community",
"repo": "NUR",
"rev": "a93973a3dd17284678ad6691dd38246b6ea3bf4f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"root": {
"inputs": {
"devshell": "devshell",
"flake-utils": "flake-utils",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nur": "nur"
"utils": "utils"
}
},
"utils": {
"inputs": {
"flake-utils": [
"flake-utils"
]
},
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"lastModified": 1657226504,
"narHash": "sha256-GIYNjuq4mJlFgqKsZ+YrgzWm0IpA4axA3MCrdKYj7gs=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"type": "github"
}
}

View file

@ -1,56 +1,65 @@
{
description = "System configuration";
description = "System configuration of my machines using flakes";
inputs = {
home-manager.url = "github:nix-community/home-manager/release-22.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
nixpkgs.url = "nixpkgs/nixos-22.11";
nur.url = "github:nix-community/NUR";
};
outputs = { self, nixpkgs, home-manager, nur, ... }:
let
system = "x86_64-linux"; # Use flake tools?
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
lib = nixpkgs.lib;
in rec {
homeManagerConfigurations = {
tdpeuter = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
modules = [
./users/tdpeuter/home.nix
{
home = {
username = "tdpeuter";
homeDirectory = "/home/tdpeuter";
};
}
];
devshell = {
url = "github:numtide/devshell";
inputs = {
flake-utils.follows = "flake-utils";
nixpkgs.follows = "nixpkgs";
};
};
nixosConfigurations = {
Tibo-NixTest = lib.nixosSystem { # Use hostname
inherit system;
modules = [
./hosts/test
nur.nixosModules.nur
];
};
Tibo-NixFatso = lib.nixosSystem {
inherit system;
modules = [
./hosts/fatso
];
flake-utils.url = "github:numtide/flake-utils";
home-manager = {
url = "github:nix-community/home-manager/release-22.11";
inputs = {
nixpkgs.follows = "nixpkgs";
utils.follows = "flake-utils";
};
};
utils = {
url = "github:gytis-ivaskevicius/flake-utils-plus";
inputs.flake-utils.follows = "flake-utils";
};
};
outputs = inputs@{
self, nixpkgs,
devshell, flake-utils, home-manager, utils,
... }:
let
system = "x86_64-linux";
in
utils.lib.mkFlake {
inherit self inputs;
homeManagerConfigurations = {
tdpeuter = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
modules = [
./users/tdpeuter/home.nix
{
home = {
username = "tdpeuter";
homeDirectory = "/home/tdpeuter";
};
}
];
};
};
nixosConfigurations = {
Tibo-NixFat = nixpkgs.lib.nixosSystem {
inherit system;
modules = [ ./hosts/Tibo-NixFat ];
};
Tibo-NixTest = nixpkgs.lib.nixossSytem {
inherit system;
modules = [ ./hosts/Tibo-NixTest ];
};
};
};
}

View file

@ -23,34 +23,25 @@
packages = with pkgs; [
alacritty
discord
duf
git-crypt
gnupg
libreoffice-fresh-unwrapped
lynx
w3m
mattermost-desktop
nextcloud-client
pinentry_qt
spotify
vifm
vim
w3m
zathura
zellij
zenith
# Webdevelopment
jetbrains.webstorm
nodejs
nodePackages_latest.npm
mongodb-6_0
mongosh
mongodb-tools
mongodb-compass
# Multimedia
jetbrains.pycharm-professional
python39
python39Packages.pip
gcc
cmake
# Software Engineering Lab 1
android-studio