Compare commits

..

2 commits

3 changed files with 30 additions and 54 deletions

View file

@ -320,7 +320,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1694529238,
@ -1001,18 +1001,18 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-24_05": { "nixpkgs-24_11": {
"locked": { "locked": {
"lastModified": 1717144377, "lastModified": 1742937945,
"narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "805a384895c696f802a9bf5bf4720f37385df547", "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"type": "indirect" "type": "indirect"
} }
}, },
@ -1450,21 +1450,20 @@
"blobs": "blobs", "blobs": "blobs",
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_7",
"nixpkgs-24_05": "nixpkgs-24_05", "nixpkgs-24_11": "nixpkgs-24_11"
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1734885828, "lastModified": 1742413977,
"narHash": "sha256-G0fB1YBlkalu8lLGRB07K8CpUWNVd+unfrjNomSL7SM=", "narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "636b82f4175e3f6b1e80d2189bb0469e2ae01a55", "rev": "b4fbffe79c00f19be94b86b4144ff67541613659",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"ref": "nixos-24.05",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "b4fbffe79c00f19be94b86b4144ff67541613659",
"type": "gitlab" "type": "gitlab"
} }
}, },
@ -1614,21 +1613,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"u-boot-src": { "u-boot-src": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1642,24 +1626,6 @@
"url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2" "url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2"
} }
}, },
"utils": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1709126324,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": [

View file

@ -76,7 +76,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/b4fbffe79c00f19be94b86b4144ff67541613659";
catppuccin.url = "github:catppuccin/nix"; catppuccin.url = "github:catppuccin/nix";
nix-gaming.url = "github:fufexan/nix-gaming"; nix-gaming.url = "github:fufexan/nix-gaming";

View file

@ -62,16 +62,26 @@ in
}; };
}; };
"${domainName}" = { "ha.${domainName}" = {
forceSSL = cfg.enableAcme; forceSSL = cfg.enableAcme;
useACMEHost = mkIf cfg.enableAcme domainName; useACMEHost = mkIf cfg.enableAcme domainName;
locations."/" = { locations."/" = {
root = /var/www/website; # tailscale ip
index = "index.html"; proxyPass = "http://100.86.23.74:8123";
}; };
}; };
# "${domainName}" = {
# forceSSL = cfg.enableAcme;
# useACMEHost = mkIf cfg.enableAcme domainName;
# locations."/" = {
# root = /var/www/website;
# index = "index.html";
# };
# };
"_" = { "_" = {
forceSSL = cfg.enableAcme; forceSSL = cfg.enableAcme;
useACMEHost = mkIf cfg.enableAcme domainName; useACMEHost = mkIf cfg.enableAcme domainName;
@ -208,11 +218,11 @@ in
]; ];
}; };
snowfallorg.users.${config.${namespace}.user.name}.home.config = { # snowfallorg.users.${config.${namespace}.user.name}.home.config = {
programs.fish.shellInit = '' # programs.fish.shellInit = ''
eval $(op signin) # eval $(op signin)
''; # '';
}; # };
system.stateVersion = "24.11"; system.stateVersion = "24.11";
} }