mirror of
https://codeberg.org/ultra/nixos-dotfiles.git
synced 2024-11-21 21:33:09 +02:00
some stuff and reorganisation
Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com> git merge is ez with meld
This commit is contained in:
parent
4055d74bf7
commit
13d7ab12d0
6 changed files with 87 additions and 19 deletions
46
containers/forgejo/forgejo.nix
Normal file
46
containers/forgejo/forgejo.nix
Normal file
|
@ -0,0 +1,46 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.forgejo;
|
||||
in {
|
||||
options.services.forgejo = {
|
||||
enable = mkEnableOption (mdDoc "Enable forgejo");
|
||||
hostAddress = mkOption {
|
||||
type = types.str;
|
||||
default = "192.168.0.221";
|
||||
};
|
||||
localAddress = mkOption {
|
||||
type = types.str;
|
||||
default = "192.168.0.222";
|
||||
};
|
||||
stateDir = mkOption {
|
||||
type = types.str;
|
||||
default = "/var/lib/forgejo";
|
||||
};
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.forgejo;
|
||||
};
|
||||
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
containers = {
|
||||
forgejo = {
|
||||
autoStart = true;
|
||||
privateNetwork = true;
|
||||
hostAddress = cfg.hostAddress;
|
||||
localAddress = cfg.localAddress;
|
||||
config = ( cfg: { config, pkgs, ... }: {
|
||||
services.gitea = cfg; /*{
|
||||
enable = true;
|
||||
package = pkgs.forgejo;
|
||||
stateDir = /var/lib/forgejo;
|
||||
|
||||
}; */
|
||||
networking.useHostResolvConf = mkForce false;
|
||||
} cfg );
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -63,9 +63,9 @@
|
|||
};
|
||||
hermes = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
# specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./hosts/hermes/configuration.nix
|
||||
( import ./hosts/hermes/configuration.nix inputs )
|
||||
{
|
||||
environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
|
||||
nix.nixPath = [
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{ config, pkgs, lib, inputs, ... }:
|
||||
inputs: { config, pkgs, lib, ... }:
|
||||
let
|
||||
nix-software-center = inputs.nix-software-center.packages.${pkgs.system}.nix-software-center;
|
||||
# doom-emacs = inputs.nix-doom-emacs.packages.${pkgs.system}.default;
|
||||
|
@ -10,8 +10,9 @@ let
|
|||
in {
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./hardware/hardware-configuration.nix
|
||||
./cachix.nix
|
||||
( import ./hardware/nvidia.nix inputs )
|
||||
inputs.nix-but-gigachad.nixosModules.default
|
||||
];
|
||||
nh = {
|
||||
|
@ -304,20 +305,10 @@ in {
|
|||
};
|
||||
|
||||
|
||||
# NVIDIA config
|
||||
# services.xserver.videoDrivers = [ "nvidia" ];
|
||||
|
||||
hardware = {
|
||||
opengl = {
|
||||
enable = true;
|
||||
driSupport = true;
|
||||
driSupport32Bit = true;
|
||||
};
|
||||
/*
|
||||
nvidia = {
|
||||
package = config.boot.kernelPackages.nvidiaPackages.latest;
|
||||
modesetting.enable = true;
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
|
||||
# bluetooth config
|
||||
bluetooth = {
|
||||
|
|
19
hosts/titan/hardware/nvidia.nix
Normal file
19
hosts/titan/hardware/nvidia.nix
Normal file
|
@ -0,0 +1,19 @@
|
|||
inputs: { config, pkgs, lib, ... }: {
|
||||
# NVIDIA config
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
hardware = {
|
||||
opengl = {
|
||||
enable = true;
|
||||
driSupport = true;
|
||||
driSupport32Bit = true;
|
||||
};
|
||||
|
||||
nvidia = {
|
||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
modesetting.enable = true;
|
||||
powerManagement.enable = true;
|
||||
open = true;
|
||||
nvidiaSettings = true;
|
||||
};
|
||||
};
|
||||
}
|
|
@ -150,8 +150,13 @@ in {
|
|||
htmlq
|
||||
lite
|
||||
comma
|
||||
heroic
|
||||
heroic-launcher
|
||||
steam-run
|
||||
(lutris.override {
|
||||
extraPkgs = pkgs: [
|
||||
pkgs.wine64Packages.stagingFull
|
||||
];
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -230,6 +235,13 @@ in {
|
|||
jnoortheen.nix-ide # Nix stuff
|
||||
# eamodio.gitlens # Giga git, but with some paid stuff
|
||||
kahole.magit # Giga git
|
||||
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
||||
{
|
||||
name = "hungry-delete";
|
||||
publisher = "jasonlhy";
|
||||
version = "1.7.0";
|
||||
sha256 = "sha256-TDs6i0/o0j9XFLQvWze4iloa6yRXce/xIqd2CnA5nug=";
|
||||
}
|
||||
];
|
||||
userSettings = {
|
||||
nix = {
|
||||
|
|
Loading…
Reference in a new issue