auto stash before checking out "forge/main"

This commit is contained in:
Emile Clark-Boman 2025-08-01 13:35:24 +10:00
parent 9896d98154
commit b5dab67f08
4 changed files with 20 additions and 12 deletions

View file

@ -12,6 +12,8 @@ in {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
(import "${home-manager}/nixos") (import "${home-manager}/nixos")
./mailserver.nix # TEMP: location
#../modules/server/nginx.nix #../modules/server/nginx.nix
#../modules/server/ssh.nix #../modules/server/ssh.nix
#../modules/server/fail2ban.nix #../modules/server/fail2ban.nix

View file

@ -6,8 +6,7 @@
imports = [ imports = [
(builtins.fetchTarball { (builtins.fetchTarball {
url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-25.05/nixos-mailserver-nixos-25.05.tar.gz"; url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-25.05/nixos-mailserver-nixos-25.05.tar.gz";
# release="nixos-25.05"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz" --unpack sha256 = "0jpp086m839dz6xh6kw5r8iq0cm4nd691zixzy6z11c4z2vf8v85";
sha256 = "0000000000000000000000000000000000000000000000000000";
}) })
]; ];
@ -15,7 +14,7 @@
# DOCS: https://nixos-mailserver.readthedocs.io/en/latest # DOCS: https://nixos-mailserver.readthedocs.io/en/latest
mailserver = { mailserver = {
enable = true; enable = true;
stateVersion = 3; # stateVersion = 3;
# Manually open the firewall instead # Manually open the firewall instead
openFirewall = false; openFirewall = false;
virusScanning = false; # expensive memory usage virusScanning = false; # expensive memory usage
@ -23,17 +22,16 @@
fqdn = "mail.imbored.dev"; fqdn = "mail.imbored.dev";
domains = ["imbored.dev"]; domains = ["imbored.dev"];
# A list of all login accounts. To create the password hashes, use # NOTE: generate hashes with `mkpasswd -sm bcrypt`
# nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
loginAccounts = { loginAccounts = {
"me@imbored.dev" = { "me@imbored.dev" = {
hashedPasswordFile = "/a/file/containing/a/hashed/password";
aliases = ["emile@imbored.dev"]; aliases = ["emile@imbored.dev"];
hashedPasswordFile = let
CWD = builtins.getEnv "PWD";
in "${CWD}/secrets/passwd/me";
}; };
}; };
# Use Let's Encrypt certificates. Note that this needs to set up a stripped
# down nginx and opens port 80.
certificateScheme = "acme-nginx"; certificateScheme = "acme-nginx";
}; };
} }

View file

@ -107,7 +107,13 @@ in {
wayland.enable = true; # experimental wayland.enable = true; # experimental
theme = "corners"; theme = "corners";
}; };
defaultSession = "hyprland"; defaultSession =
"hyprland"
+ (
if config.programs.hyprland.withUWSM == true
then "-uwsm"
else null
);
}; };
# Multimedia Framework # Multimedia Framework
@ -233,6 +239,8 @@ in {
# Sage # Sage
sageWithDoc # SageMath + HTML Documentation sageWithDoc # SageMath + HTML Documentation
qemu # Fellice Bellard's Quick Emulator
openvpn openvpn
inetutils inetutils

View file

@ -1,8 +1,8 @@
{pkgs}: { {pkgs}: {
sddm-theme-corners = pkgs.stdenv.mkDerivation rec { sddm-theme-corners = pkgs.stdenv.mkDerivation {
name = "sddm-theme-corners"; name = "sddm-theme-corners";
#version = "1.0"; version = "1.0.0";
#dontBuild = true;
installPhase = '' installPhase = ''
mkdir -p $out/share/sddm/themes mkdir -p $out/share/sddm/themes
cp -ar $src/corners $out/share/sddm/themes/ cp -ar $src/corners $out/share/sddm/themes/