AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change flake-utils-plus to upstream

Browse Source
This commit is contained in:
Dmitriy Kholkin 2023-10-13 19:43:02 +03:00
parent 87b143f62d
commit 447ad74b1c
11 changed files with 68 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
flake.nix
View File

@ -2,7 +2,7 @@
description = "System configuration";
inputs = {
flake-utils-plus.url = "github:AtaraxiaSjel/flake-utils-plus";
flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.4.0";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05";
@ -106,8 +106,8 @@
];
customModules = builtins.listToAttrs (findModules ./modules);
nixosProfiles = builtins.listToAttrs (findModules ./profiles);
nixosRoles = import ./roles;
customProfiles = builtins.listToAttrs (findModules ./profiles);
customRoles = import ./roles;
sharedPatches = patchesPath [
"ivpn.patch"
@ -115,7 +115,8 @@
"vaultwarden.patch"
"webhooks.patch"
];
channelsConfig = { allowUnfree = true; };
sharedOverlays = [ flake-utils-plus.overlay ];
channelsConfig = { allowUnfree = true; android_sdk.accept_license = true; };
channels.unstable.input = nixpkgs;
channels.unstable.patches = patchesPath [ "zen-kernels.patch" "ydotoold.patch" ] ++ sharedPatches;
channels.stable.input = inputs.nixpkgs-stable;
@ -123,13 +124,12 @@
hostDefaults.system = "x86_64-linux";
hostDefaults.channelName = "unstable";
hostDefaults.modules = with nixpkgs.lib; __attrValues self.customModules;
hosts = with nixpkgs.lib; let
hostnames = builtins.attrNames (builtins.readDir ./machines);
mkHost = name: let
mkHost = name: {
system = builtins.readFile (./machines + "/${name}/system");
in {
inherit system;
modules = __attrValues self.customModules ++ [
modules = [
(import (./machines + "/${name}"))
{ device = name; mainuser = "ataraxia"; }
inputs.vscode-server.nixosModule
@ -179,6 +179,7 @@
packages = with pkgs; [
rebuild update-vscode upgrade upgrade-hyprland
nixfmt nixpkgs-fmt statix vulnix deadnix git deploy-rs
fup-repl
];
};
ci = pkgs.mkShell {

24
machines/AMD-Workstation/default.nix
View File

@ -2,19 +2,19 @@
imports = with inputs.self; [
./boot.nix
./hardware-configuration.nix
nixosRoles.workstation
customRoles.workstation
# nixosProfiles.stable-diffusion
nixosProfiles.a2ln-server
nixosProfiles.act
nixosProfiles.attic
nixosProfiles.bluetooth
nixosProfiles.cassowary
nixosProfiles.emulators
nixosProfiles.hoyo
nixosProfiles.minecraft
nixosProfiles.sunshine
nixosProfiles.wine-games
# customProfiles.stable-diffusion
customProfiles.a2ln-server
customProfiles.act
customProfiles.attic
customProfiles.bluetooth
customProfiles.cassowary
customProfiles.emulators
customProfiles.hoyo
customProfiles.minecraft
customProfiles.sunshine
customProfiles.wine-games
];
virtualisation.libvirt.guests = {

4
machines/Dell-Laptop/default.nix
View File

@ -2,9 +2,9 @@
imports = with inputs.self; [
./boot.nix
./hardware-configuration.nix
nixosRoles.desktop
customRoles.desktop
nixosProfiles.bluetooth
customProfiles.bluetooth
];
deviceSpecific.devInfo = {

70
machines/Home-Hypervisor/default.nix
View File

@ -6,45 +6,45 @@ in {
./hardware-configuration.nix
./virtualisation.nix
./disks.nix
nixosProfiles.hardened
customProfiles.hardened
nixosRoles.hypervisor
nixosProfiles.acme
# nixosProfiles.authentik
nixosProfiles.battery-historian
nixosProfiles.duplicacy
nixosProfiles.fail2ban
# nixosProfiles.firefox-syncserver
nixosProfiles.gitea
nixosProfiles.joplin-server
nixosProfiles.mailserver
nixosProfiles.nginx
nixosProfiles.roundcube
nixosProfiles.tinyproxy
nixosProfiles.vaultwarden
nixosProfiles.vscode-server
customRoles.hypervisor
customProfiles.acme
customProfiles.authentik
customProfiles.battery-historian
customProfiles.duplicacy
customProfiles.fail2ban
# customProfiles.firefox-syncserver
customProfiles.gitea
customProfiles.joplin-server
customProfiles.mailserver
customProfiles.nginx
customProfiles.roundcube
customProfiles.tinyproxy
customProfiles.vaultwarden
customProfiles.vscode-server
nixosProfiles.media-stack
# nixosProfiles.copyparty
nixosProfiles.seafile
# nixosProfiles.cocalc
# nixosProfiles.neko-browser
nixosProfiles.openbooks
nixosProfiles.webhooks
customProfiles.media-stack
# customProfiles.copyparty
customProfiles.seafile
# customProfiles.cocalc
# customProfiles.neko-browser
customProfiles.openbooks
customProfiles.webhooks
nixosProfiles.yandex-db
nixosProfiles.hoyolab
nixosProfiles.it-tools
nixosProfiles.homepage
nixosProfiles.matrix
nixosProfiles.atticd
nixosProfiles.attic
nixosProfiles.restic-server
nixosProfiles.outline
nixosProfiles.radicale
nixosProfiles.wiki
customProfiles.yandex-db
customProfiles.hoyolab
customProfiles.it-tools
customProfiles.homepage
customProfiles.matrix
customProfiles.atticd
customProfiles.attic
customProfiles.restic-server
customProfiles.outline
customProfiles.radicale
customProfiles.wiki
(import nixosProfiles.blocky {
(import customProfiles.blocky {
inherit config;
inherit (import ./dns-mapping.nix) dns-mapping;
})

4
machines/NixOS-VM/default.nix
View File

@ -1,10 +1,10 @@
{ inputs, config, lib, pkgs, ... }: {
imports = with inputs.self; [
./hardware-configuration.nix
# nixosRoles.base
# customRoles.base
customModules.devices
nixosProfiles.attic
customProfiles.attic
];
options = {

4
machines/NixOS-VPS/default.nix
View File

@ -23,8 +23,8 @@
customModules.devices
customModules.users
nixosProfiles.hardened
nixosProfiles.overlay
customProfiles.hardened
customProfiles.overlay
];
# disko.devices = import ./disko.nix { inherit lib; };

2
roles/base.nix
View File

@ -1,5 +1,5 @@
{ inputs, ... }: {
imports = with inputs.self.nixosProfiles; [
imports = with inputs.self.customProfiles; [
inputs.home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;

2
roles/container.nix
View File

@ -1,5 +1,5 @@
{ inputs, pkgs, ... }: {
imports = with inputs.self.nixosProfiles; [
imports = with inputs.self.customProfiles; [
inputs.home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;

4
roles/desktop.nix
View File

@ -1,8 +1,8 @@
{ inputs, ... }: {
imports = with inputs.self.nixosProfiles; [
imports = with inputs.self.customProfiles; [
./base.nix
inputs.base16.hmModule
inputs.self.nixosProfiles.seadrive
inputs.self.customProfiles.seadrive
applications-setup
hardware

2
roles/hypervisor.nix
View File

@ -1,5 +1,5 @@
{ inputs, pkgs, ... }: {
imports = with inputs.self.nixosProfiles; [
imports = with inputs.self.customProfiles; [
inputs.home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;

2
roles/workstation.nix
View File

@ -1,5 +1,5 @@
{ inputs, ... }: {
imports = with inputs.self; [
nixosRoles.desktop
customRoles.desktop
];
}