fixing a LOT of typos
This commit is contained in:
parent
795bb17857
commit
b183b789b4
25 changed files with 57 additions and 65 deletions
20
flake.nix
20
flake.nix
|
@ -22,9 +22,9 @@
|
||||||
import pkgs {
|
import pkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
overlays = extraOverlays ++ (lib.attrValues self.overlays);
|
overlays = extraOverlays;
|
||||||
};
|
};
|
||||||
pkgs = mkPkgs nixpkgs [self.overlays.default];
|
pkgs = mkPkgs nixpkgs [];
|
||||||
pkgs-unstable = mkPkgs nixpkgs-unstable [];
|
pkgs-unstable = mkPkgs nixpkgs-unstable [];
|
||||||
|
|
||||||
lib = nixpkgs.lib.extend (final: prev: {
|
lib = nixpkgs.lib.extend (final: prev: {
|
||||||
|
@ -48,21 +48,5 @@
|
||||||
nixosConfigurations = mapHosts ./hosts {};
|
nixosConfigurations = mapHosts ./hosts {};
|
||||||
|
|
||||||
devShells."${system}".default = import ./shell.nix { inherit lib pkgs; };
|
devShells."${system}".default = import ./shell.nix { inherit lib pkgs; };
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# nixosConfigurations = {
|
|
||||||
# pc = nixpkgs.lib.nixosSystem {
|
|
||||||
# specialArgs = {inherit inputs;};
|
|
||||||
# modules = [
|
|
||||||
# ./hosts/pc/default.nix
|
|
||||||
# inputs.home-manager.nixosModules.default
|
|
||||||
# inputs.stylix.nixosModules.stylix
|
|
||||||
# ];
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, config, ... }:
|
{ config, options, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
inherit (lib.modules) mkIf;
|
inherit (lib.modules) mkIf;
|
||||||
in
|
in
|
||||||
|
@ -9,7 +9,7 @@ in
|
||||||
enable = mkEnableOption "Rust developmnt";
|
enable = mkEnableOption "Rust developmnt";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf conf.modules.programs.enable {
|
config = mkIf config.modules.programs.enable {
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
Before Width: | Height: | Size: 183 KiB After Width: | Height: | Size: 183 KiB |
|
@ -10,7 +10,7 @@ in
|
||||||
xdg.enable = mkEnableOption "XDG-related conf" // { default = true; };
|
xdg.enable = mkEnableOption "XDG-related conf" // { default = true; };
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf conf.modules.develop.xdg.enable {
|
config = mkIf config.modules.develop.xdg.enable {
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, options, lib, pkgs, ... }:
|
{ inputs, config, options, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
inherit (lib.attrsets) attrValues;
|
inherit (lib.attrsets) attrValues;
|
||||||
inherit (lib.modules) mkIf mkMerge;
|
inherit (lib.modules) mkIf mkMerge;
|
||||||
|
@ -12,7 +12,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkMerge [
|
config = mkMerge [
|
||||||
(mkIf config.modules.develop.rust.enable (
|
(mkIf config.modules.develop.rust.enable {
|
||||||
nixpkgs.overlays = [ inputs.rust.overlays.default ];
|
nixpkgs.overlays = [ inputs.rust.overlays.default ];
|
||||||
|
|
||||||
user.packages = attrValues {
|
user.packages = attrValues {
|
||||||
|
@ -24,7 +24,7 @@ in
|
||||||
rs = "rustc";
|
rs = "rustc";
|
||||||
ca = "cargo";
|
ca = "cargo";
|
||||||
};
|
};
|
||||||
))
|
})
|
||||||
|
|
||||||
(mkIf config.modules.develop.cdg.enable {
|
(mkIf config.modules.develop.cdg.enable {
|
||||||
env = {
|
env = {
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
{ ... }:
|
|
||||||
{
|
|
||||||
home.file.".netrc".text = ''
|
|
||||||
login root
|
|
||||||
password KaasIsAwesome!
|
|
||||||
'';
|
|
||||||
|
|
||||||
systemd.user = {
|
|
||||||
services.nextcloud-autosync = {
|
|
||||||
Unit = {
|
|
||||||
Description = "Automatic nextcloud sync";
|
|
||||||
After = "network-online.target";
|
|
||||||
};
|
|
||||||
Service = {
|
|
||||||
Type = "simple";
|
|
||||||
ExecStart = "${pkgs.nextcloud-client}/bin/nextcloudcmd -h -n --path /var/music /home/chris/Music https://cloud.kruining.eu";
|
|
||||||
TimeoutStopSec = "180";
|
|
||||||
KillMode = "process";
|
|
||||||
KillSignal = "SIGINT";
|
|
||||||
};
|
|
||||||
Install.WantedBy = [ "multi-user.target" ];
|
|
||||||
};
|
|
||||||
timers.nextcloud-autosync = {
|
|
||||||
Unit.Description = "Automatic nextcloud sync";
|
|
||||||
Timer.OnBootSec = "5min";
|
|
||||||
Timer.OnUnitActiveSec = "60min";
|
|
||||||
Install.WantedBy = [ "multi-user.target" "timers.target" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -9,11 +9,9 @@ in
|
||||||
enable = mkEnableOption "Media auth";
|
enable = mkEnableOption "Media auth";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkMerge [
|
config = mkIf config.modules.services.auth.enable {
|
||||||
(mkIf config.modules.services.auth.enable (
|
environment.systemPackages = with pkgs; [
|
||||||
environment.systemPackages = with pkgs; [
|
authelia
|
||||||
authelia
|
];
|
||||||
];
|
};
|
||||||
))
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, config, ... }:
|
{ config, options, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
inherit (lib.modules) mkIf;
|
inherit (lib.modules) mkIf;
|
||||||
in
|
in
|
||||||
|
|
41
modules/services/nextcloud.nix
Normal file
41
modules/services/nextcloud.nix
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
{ config, options, lib, pkgs, ... }:
|
||||||
|
let
|
||||||
|
inherit (lib.modules) mkIf;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.modules.services.nextcloud = let
|
||||||
|
inherit (lib.options) mkEnableOption;
|
||||||
|
in {
|
||||||
|
enable = mkEnableOption "Nextcloud";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf config.modules.services.nextcloud.enable {
|
||||||
|
home.file.".netrc".text = ''
|
||||||
|
login root
|
||||||
|
password KaasIsAwesome!
|
||||||
|
'';
|
||||||
|
|
||||||
|
systemd.user = {
|
||||||
|
services.nextcloud-autosync = {
|
||||||
|
Unit = {
|
||||||
|
Description = "Automatic nextcloud sync";
|
||||||
|
After = "network-online.target";
|
||||||
|
};
|
||||||
|
Service = {
|
||||||
|
Type = "simple";
|
||||||
|
ExecStart = "${pkgs.nextcloud-client}/bin/nextcloudcmd -h -n --path /var/music /home/chris/Music https://cloud.kruining.eu";
|
||||||
|
TimeoutStopSec = "180";
|
||||||
|
KillMode = "process";
|
||||||
|
KillSignal = "SIGINT";
|
||||||
|
};
|
||||||
|
Install.WantedBy = [ "multi-user.target" ];
|
||||||
|
};
|
||||||
|
timers.nextcloud-autosync = {
|
||||||
|
Unit.Description = "Automatic nextcloud sync";
|
||||||
|
Timer.OnBootSec = "5min";
|
||||||
|
Timer.OnUnitActiveSec = "60min";
|
||||||
|
Install.WantedBy = [ "multi-user.target" "timers.target" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -27,7 +27,6 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
autosuggestion.enable = true;
|
autosuggestion.enable = true;
|
||||||
syntaxHighlighting.enable = true;
|
|
||||||
|
|
||||||
history = {
|
history = {
|
||||||
size = 10000;
|
size = 10000;
|
||||||
|
|
|
@ -15,7 +15,7 @@ in
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
user.packages = attrValues {
|
user.packages = attrValues {
|
||||||
inherit (pkgs) easyeffects
|
inherit (pkgs) easyeffects;
|
||||||
};
|
};
|
||||||
|
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{}:
|
{ config, options, lib, pkgs, ... }:
|
||||||
{
|
{
|
||||||
boot.loader.systemd-boot-enable = true;
|
boot.loader.systemd-boot-enable = true;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue