diff --git a/modules/base-server.nix b/modules/base-server.nix
index 1278d83..46f0c97 100755
--- a/modules/base-server.nix
+++ b/modules/base-server.nix
@@ -27,10 +27,10 @@
};
};
- sleep.extraConfig = ''
- AllowSuspend=no
- AllowHibernation=no
- '';
+ sleep.settings.Sleep = {
+ AllowSuspend = "no";
+ AllowHibernation = "no";
+ };
};
#systemd.services.NetworkManager-wait-online.enable = false;
@@ -77,38 +77,4 @@
# This shaves off half a gigabyte of disk space...
hardware.enableAllFirmware = false;
hardware.enableRedistributableFirmware = false;
-
- services = {
- promtail = {
- enable = true;
- configuration = {
- server = {
- http_listen_port = 3031;
- grpc_listen_port = 0;
- };
- positions = {
- filename = "/tmp/positions.yaml";
- };
- clients = [ { url = "https://loki.regional.seian.cloud/loki/api/v1/push"; } ];
- scrape_configs = [
- {
- job_name = "journal";
- journal = {
- max_age = "12h";
- labels = {
- job = "systemd-journal";
- host = "${toString config.networking.hostName}";
- };
- };
- relabel_configs = [
- {
- source_labels = [ "__journal__systemd_unit" ];
- target_label = "unit";
- }
- ];
- }
- ];
- };
- };
- };
}
diff --git a/modules/base.nix b/modules/base.nix
index 7588010..e539b15 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -73,6 +73,7 @@
"8.8.8.8"
"8.4.4.8"
];
+ resolvconf.enable = false;
};
environment.etc."resolv.conf" = lib.mkDefault {
@@ -154,9 +155,7 @@
zsh-completions
];
- systemd.coredump.extraConfig = lib.mkDefault ''
- Storage=none
- '';
+ systemd.coredump.settings.Coredump.Storage = lib.mkDefault "none";
nix = {
settings = {
experimental-features = [
@@ -187,7 +186,6 @@
};
monitoring.monitorAll = lib.mkForce false;
- services.promtail.enable = lib.mkForce false;
networking.useDHCP = lib.mkOverride 51 true;
};
}
diff --git a/modules/software-templates/devenv/c-cpp.nix b/modules/software-templates/devenv/c-cpp.nix
index 579edcc..7e88303 100644
--- a/modules/software-templates/devenv/c-cpp.nix
+++ b/modules/software-templates/devenv/c-cpp.nix
@@ -1,8 +1,8 @@
{ pkgs, nix-jetbrains-plugins, ... }:
{
- environment.systemPackages = with nix-jetbrains-plugins.lib."${pkgs.stdenv.system}"; [
- (buildIdeWithPlugins pkgs.jetbrains "clion" [
+ environment.systemPackages = with nix-jetbrains-plugins.lib; [
+ (buildIdeWithPlugins pkgs "clion" [
"com.github.copilot"
"nix-idea"
# "visual-studio-keymap"
diff --git a/modules/software-templates/devenv/dotnet.nix b/modules/software-templates/devenv/dotnet.nix
index d8871ef..53cbf52 100644
--- a/modules/software-templates/devenv/dotnet.nix
+++ b/modules/software-templates/devenv/dotnet.nix
@@ -1,8 +1,8 @@
{ pkgs, nix-jetbrains-plugins, ... }:
{
- environment.systemPackages = with nix-jetbrains-plugins.lib."${pkgs.stdenv.system}"; [
- (buildIdeWithPlugins pkgs.jetbrains "rider" [
+ environment.systemPackages = with nix-jetbrains-plugins.lib; [
+ (buildIdeWithPlugins pkgs "rider" [
"com.github.copilot"
"nix-idea"
# "visual-studio-keymap"
diff --git a/modules/software-templates/devenv/go.nix b/modules/software-templates/devenv/go.nix
new file mode 100644
index 0000000..bbce701
--- /dev/null
+++ b/modules/software-templates/devenv/go.nix
@@ -0,0 +1,17 @@
+{ pkgs, nix-jetbrains-plugins, ... }:
+
+{
+ environment.systemPackages = with nix-jetbrains-plugins.lib; [
+ (buildIdeWithPlugins pkgs "goland" [
+ "com.github.copilot"
+ "nix-idea"
+ # "visual-studio-keymap"
+ "String Manipulation"
+ ])
+ pkgs.go
+ pkgs.gcc
+ ];
+ environment.sessionVariables = {
+ DOTNET_CLI_TELEMETRY_OPTOUT = "1";
+ };
+}
diff --git a/modules/software-templates/devenv/java.nix b/modules/software-templates/devenv/java.nix
index ed1581a..a0065c6 100644
--- a/modules/software-templates/devenv/java.nix
+++ b/modules/software-templates/devenv/java.nix
@@ -1,8 +1,8 @@
{ pkgs, nix-jetbrains-plugins, ... }:
{
- environment.systemPackages = with nix-jetbrains-plugins.lib."${pkgs.stdenv.system}"; [
- (buildIdeWithPlugins pkgs.jetbrains "idea" [
+ environment.systemPackages = with nix-jetbrains-plugins.lib; [
+ (buildIdeWithPlugins pkgs "idea" [
"com.github.copilot"
"nix-idea"
# "visual-studio-keymap"
diff --git a/modules/software-templates/devenv/javascript.nix b/modules/software-templates/devenv/javascript.nix
index 583f6ef..de69646 100644
--- a/modules/software-templates/devenv/javascript.nix
+++ b/modules/software-templates/devenv/javascript.nix
@@ -1,8 +1,8 @@
{ pkgs, nix-jetbrains-plugins, ... }:
{
- environment.systemPackages = with nix-jetbrains-plugins.lib."${pkgs.stdenv.system}"; [
- (buildIdeWithPlugins pkgs.jetbrains "webstorm" [
+ environment.systemPackages = with nix-jetbrains-plugins.lib; [
+ (buildIdeWithPlugins pkgs "webstorm" [
"com.github.copilot"
"nix-idea"
# "visual-studio-keymap"
diff --git a/modules/users/Arci.nix b/modules/users/Arci.nix
index df7efb5..28c3c1c 100644
--- a/modules/users/Arci.nix
+++ b/modules/users/Arci.nix
@@ -59,9 +59,8 @@
programs = {
git = {
enable = true;
+ signing.format = null;
settings = {
- user.name = "Rory&";
- user.email = "root@rory.gay";
safe.directory = "/";
};
};
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index c56c3ed..05745fc 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -71,11 +71,13 @@
programs = {
git = {
enable = true;
+ signing.format = null;
settings = {
user.name = "Rory&";
user.email = "root@rory.gay";
safe.directory = "/";
advice.defaultBranchName = false;
+ signing.format = "openpgp";
};
};
zsh = {
@@ -111,8 +113,7 @@
export DISABLE_AUTO_UPDATE=true
COMPLETION_WAITING_DOTS="true"
- '';
- initExtra = ''
+ # at the end?
alias mv='mv -v'
alias pre='npx prettier -w'
alias git-commit='git commit --signoff --sign'
@@ -192,12 +193,12 @@
POWERLEVEL9K_MODE = "nerdfont-complete";
POWERLEVEL9K_ICON_PADDING = "none";
POWERLEVEL9K_PROMPT_ADD_NEWLINE = "false";
- POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR = "\uE0B1";
- POWERLEVEL9K_RIGHT_SUBSEGMENT_SEPARATOR = "\uE0B3";
- POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR = "\uE0B0";
- POWERLEVEL9K_RIGHT_SEGMENT_SEPARATOR = "\uE0B2";
- POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL = "\uE0B0";
- POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL = "\uE0B2";
+ POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR = "\\uE0B1";
+ POWERLEVEL9K_RIGHT_SUBSEGMENT_SEPARATOR = "\\uE0B3";
+ POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR = "\\uE0B0";
+ POWERLEVEL9K_RIGHT_SEGMENT_SEPARATOR = "\\uE0B2";
+ POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL = "\\uE0B0";
+ POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL = "\\uE0B2";
POWERLEVEL9K_PROMPT_CHAR_OVERWRITE_STATE = true;
};
};
diff --git a/modules/users/geba.nix b/modules/users/geba.nix
index 6214d91..77ee689 100644
--- a/modules/users/geba.nix
+++ b/modules/users/geba.nix
@@ -60,9 +60,8 @@
programs = {
git = {
enable = true;
+ signing.format = null;
settings = {
- user.name = "Rory&";
- user.email = "root@rory.gay";
safe.directory = "/";
};
};
diff --git a/modules/users/ks.nix b/modules/users/ks.nix
index d55dd1e..b0cf8df 100755
--- a/modules/users/ks.nix
+++ b/modules/users/ks.nix
@@ -17,6 +17,7 @@
home-manager.users.ks = {
programs.git = {
enable = true;
+ signing.format = null;
settings = {
user.name = "Kinoshita Shimizu";
user.email = "ks@kinoshitaproductions.com";
|
