aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/home/editors/neovim/default.nix2
-rw-r--r--modules/home/editors/zed/default.nix2
-rw-r--r--modules/home/git/default.nix7
-rw-r--r--modules/home/media/jellyfin-mpv-shim/default.nix2
-rw-r--r--modules/home/media/nixcord/default.nix2
-rw-r--r--modules/home/productivity/anki/default.nix12
-rw-r--r--modules/nixos/desktop/cinnamon/default.nix7
-rw-r--r--modules/nixos/desktop/gnome/default.nix15
-rw-r--r--modules/nixos/dns/default.nix51
-rw-r--r--modules/nixos/hardware/printer/default.nix7
-rw-r--r--modules/nixos/hardware/wooting/default.nix7
-rw-r--r--modules/nixos/mullvad-vpn/default.nix7
-rw-r--r--modules/nixos/openssh/default.nix7
-rw-r--r--modules/nixos/server/nextcloud/default.nix11
-rw-r--r--modules/nixos/server/nginx/default.nix7
-rw-r--r--modules/nixos/server/openssh/default.nix12
16 files changed, 105 insertions, 53 deletions
diff --git a/modules/home/editors/neovim/default.nix b/modules/home/editors/neovim/default.nix
index cbfd261..ef97f89 100644
--- a/modules/home/editors/neovim/default.nix
+++ b/modules/home/editors/neovim/default.nix
@@ -62,4 +62,4 @@ in
'';
};
};
-} \ No newline at end of file
+}
diff --git a/modules/home/editors/zed/default.nix b/modules/home/editors/zed/default.nix
index 5fe90ed..95c3be0 100644
--- a/modules/home/editors/zed/default.nix
+++ b/modules/home/editors/zed/default.nix
@@ -49,4 +49,4 @@ in
};
};
};
-} \ No newline at end of file
+}
diff --git a/modules/home/git/default.nix b/modules/home/git/default.nix
index a2563d5..2d0855e 100644
--- a/modules/home/git/default.nix
+++ b/modules/home/git/default.nix
@@ -5,7 +5,12 @@
}:
let
cfg = config.nx.programs.git;
- inherit (lib) mkEnableOption mkOption mkIf types;
+ inherit (lib)
+ mkEnableOption
+ mkOption
+ mkIf
+ types
+ ;
in
{
options.nx.programs.git = {
diff --git a/modules/home/media/jellyfin-mpv-shim/default.nix b/modules/home/media/jellyfin-mpv-shim/default.nix
index 679a1c6..6594a70 100644
--- a/modules/home/media/jellyfin-mpv-shim/default.nix
+++ b/modules/home/media/jellyfin-mpv-shim/default.nix
@@ -35,4 +35,4 @@ in
});
};
};
-} \ No newline at end of file
+}
diff --git a/modules/home/media/nixcord/default.nix b/modules/home/media/nixcord/default.nix
index c7f2b4b..e2390a3 100644
--- a/modules/home/media/nixcord/default.nix
+++ b/modules/home/media/nixcord/default.nix
@@ -28,4 +28,4 @@ in
};
};
};
-} \ No newline at end of file
+}
diff --git a/modules/home/productivity/anki/default.nix b/modules/home/productivity/anki/default.nix
index 84b1655..6a95f83 100644
--- a/modules/home/productivity/anki/default.nix
+++ b/modules/home/productivity/anki/default.nix
@@ -13,12 +13,12 @@ in
};
config = mkIf cfg.enable {
programs.anki = {
- enable = true;
- #style = "native";
- #addons = with pkgs.ankiAddons; [
- # anki-connect
- # review-heatmap
- #];
+ enable = true;
+ #style = "native";
+ #addons = with pkgs.ankiAddons; [
+ # anki-connect
+ # review-heatmap
+ #];
};
};
}
diff --git a/modules/nixos/desktop/cinnamon/default.nix b/modules/nixos/desktop/cinnamon/default.nix
index 2561bdb..f86434b 100644
--- a/modules/nixos/desktop/cinnamon/default.nix
+++ b/modules/nixos/desktop/cinnamon/default.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
let
inherit (lib) mkEnableOption mkIf mkForce;
cfg = config.nx.desktop.cinnamon;
diff --git a/modules/nixos/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix
index 9ffd353..3be22d5 100644
--- a/modules/nixos/desktop/gnome/default.nix
+++ b/modules/nixos/desktop/gnome/default.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
let
inherit (lib) mkEnableOption mkIf;
cfg = config.nx.desktop.gnome;
@@ -13,10 +18,14 @@ in
services.gnome.games.enable = false;
environment.gnome.excludePackages = with pkgs; [
- gnome-tour gnome-user-docs epiphany
+ gnome-tour
+ gnome-user-docs
+ epiphany
];
environment.systemPackages = with pkgs; [
- gnomeExtensions.pop-shell gnomeExtensions.blur-my-shell gnome-tweaks
+ gnomeExtensions.pop-shell
+ gnomeExtensions.blur-my-shell
+ gnome-tweaks
];
};
}
diff --git a/modules/nixos/dns/default.nix b/modules/nixos/dns/default.nix
index ac80e5c..0cc1766 100644
--- a/modules/nixos/dns/default.nix
+++ b/modules/nixos/dns/default.nix
@@ -1,6 +1,12 @@
{ config, lib, ... }:
let
- inherit (lib) mkEnableOption mkOption types mkIf concatStringsSep;
+ inherit (lib)
+ mkEnableOption
+ mkOption
+ types
+ mkIf
+ concatStringsSep
+ ;
cfg = config.nx.dns;
in
{
@@ -17,31 +23,34 @@ in
};
fallbackServers = mkOption {
type = types.listOf types.str;
- default = [ "8.8.8.8#dns.google" "8.8.4.4#dns.google" ];
+ default = [
+ "8.8.8.8#dns.google"
+ "8.8.4.4#dns.google"
+ ];
};
};
- config = mkIf cfg.enable {
- services.resolved = {
- enable = true;
- settings = {
- Resolve = {
- DNS = cfg.servers;
- FallbackDNS = cfg.fallbackServers;
- DNSSEC = true;
- DNSOverTLS = true;
- Domains = [ "~." ];
- };
+ config = mkIf cfg.enable {
+ services.resolved = {
+ enable = true;
+ settings = {
+ Resolve = {
+ DNS = cfg.servers;
+ FallbackDNS = cfg.fallbackServers;
+ DNSSEC = true;
+ DNSOverTLS = true;
+ Domains = [ "~." ];
};
};
- networking = {
- nameservers = cfg.servers;
- networkmanager.dns = lib.mkDefault "systemd-resolved";
- };
- systemd.services.systemd-resolved.environment = {
- DNS = concatStringsSep " " cfg.servers;
- FallbackDNS = concatStringsSep " " cfg.fallbackServers;
- };
};
+ networking = {
+ nameservers = cfg.servers;
+ networkmanager.dns = lib.mkDefault "systemd-resolved";
+ };
+ systemd.services.systemd-resolved.environment = {
+ DNS = concatStringsSep " " cfg.servers;
+ FallbackDNS = concatStringsSep " " cfg.fallbackServers;
+ };
+ };
}
diff --git a/modules/nixos/hardware/printer/default.nix b/modules/nixos/hardware/printer/default.nix
index 749c766..09b6da4 100644
--- a/modules/nixos/hardware/printer/default.nix
+++ b/modules/nixos/hardware/printer/default.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
let
inherit (lib) mkEnableOption mkIf;
cfg = config.nx.hardware.printer;
diff --git a/modules/nixos/hardware/wooting/default.nix b/modules/nixos/hardware/wooting/default.nix
index 62a4b78..7f6e3c6 100644
--- a/modules/nixos/hardware/wooting/default.nix
+++ b/modules/nixos/hardware/wooting/default.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
let
inherit (lib) mkEnableOption mkIf;
cfg = config.nx.hardware.wooting;
diff --git a/modules/nixos/mullvad-vpn/default.nix b/modules/nixos/mullvad-vpn/default.nix
index d2c18b1..0c12d17 100644
--- a/modules/nixos/mullvad-vpn/default.nix
+++ b/modules/nixos/mullvad-vpn/default.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
let
inherit (lib) mkEnableOption mkIf;
cfg = config.nx.mullvad-vpn;
diff --git a/modules/nixos/openssh/default.nix b/modules/nixos/openssh/default.nix
index 22f7df5..a37dfec 100644
--- a/modules/nixos/openssh/default.nix
+++ b/modules/nixos/openssh/default.nix
@@ -1,6 +1,11 @@
{ config, lib, ... }:
let
- inherit (lib) mkEnableOption mkOption types mkIf;
+ inherit (lib)
+ mkEnableOption
+ mkOption
+ types
+ mkIf
+ ;
cfg = config.nx.services.openssh;
in
{
diff --git a/modules/nixos/server/nextcloud/default.nix b/modules/nixos/server/nextcloud/default.nix
index 11d5ea9..3fba5c8 100644
--- a/modules/nixos/server/nextcloud/default.nix
+++ b/modules/nixos/server/nextcloud/default.nix
@@ -5,7 +5,7 @@
...
}:
let
- inherit (lib) mkEnableOption mkIf mkDefault;
+ inherit (lib) mkEnableOption mkIf;
cfg = config.nx.server.nextcloud;
in
{
@@ -47,9 +47,9 @@ in
# Non default
#"OC\\Preview\\Font"
"OC\\Preview\\HEIC"
- #"OC\\Preview\\MP3"
- #"OC\\Preview\\Movie"
- #"OC\\Preview\\PDF"
+ "OC\\Preview\\MP3"
+ "OC\\Preview\\Movie"
+ "OC\\Preview\\PDF"
#"OC\\Preview\\SVG"
];
};
@@ -113,7 +113,7 @@ in
services.fail2ban = {
enable = true;
- bantime = lib.mkDefault "1h";
+ bantime = lib.mkDefault "1h";
jails = {
nextcloud = {
enabled = true;
@@ -145,4 +145,3 @@ in
};
};
}
-
diff --git a/modules/nixos/server/nginx/default.nix b/modules/nixos/server/nginx/default.nix
index 2bdaba1..cf97109 100644
--- a/modules/nixos/server/nginx/default.nix
+++ b/modules/nixos/server/nginx/default.nix
@@ -4,7 +4,12 @@
...
}:
let
- inherit (lib) mkEnableOption mkOption types mkIf;
+ inherit (lib)
+ mkEnableOption
+ mkOption
+ types
+ mkIf
+ ;
cfg = config.nx.server.nginx;
in
{
diff --git a/modules/nixos/server/openssh/default.nix b/modules/nixos/server/openssh/default.nix
index ac23d28..0972e66 100644
--- a/modules/nixos/server/openssh/default.nix
+++ b/modules/nixos/server/openssh/default.nix
@@ -17,17 +17,17 @@ in
services.openssh = {
enable = true;
ports = [ 8693 ];
- settings = {
- PasswordAuthentication = false;
- X11Forwarding = false;
- PermitRootLogin = "yes";
- };
+ settings = {
+ PasswordAuthentication = false;
+ X11Forwarding = false;
+ PermitRootLogin = "yes";
+ };
};
networking.firewall.allowedTCPPorts = [ 8693 ];
services.fail2ban = {
enable = true;
- bantime = lib.mkDefault "1h";
+ bantime = lib.mkDefault "1h";
jails = {
sshd = {
enabled = true;
generated by cgit v1.3.1 (git 2.54.0) at 2026-05-30 18:53:36 +0000