diff --git a/flake.lock b/flake.lock index 208645b..e74b443 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1729460064, - "narHash": "sha256-xhxuD0NKyQf+WrQL2qWvrZFHmZ22g/+1TUT+kOukL0k=", + "lastModified": 1732885410, + "narHash": "sha256-2j7D78uvwmlK8pjrMlgLQ8TaeBanDh+XelecDIhYBuY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "7aeeff126b300e2977fe04b3606669b28a5b4dfd", + "rev": "9eee63f59ec8d181539d1920a0540094769706ac", "type": "gitlab" }, "original": { @@ -44,11 +44,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1729459288, - "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", + "lastModified": 1732884235, + "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", + "rev": "819f682269f4e002884702b87e445c82840c68f2", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1729224425, - "narHash": "sha256-w9dNUedNe2qnhHuhcRf7A1l29+/6DxdMfwN6g4U3c/w=", + "lastModified": 1730743354, + "narHash": "sha256-gU4NySYyXeAzVaF5bI6BKmj2CdgiwGFnuPjXUId3Dx0=", "owner": "hyprwm", "repo": "contrib", - "rev": "d72bc8b1cd30d448bd438e8328f8eeb4c0f2ddb6", + "rev": "792f6b83dc719214e0e2a0b380c34f147b28ece2", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1729394935, - "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=", + "lastModified": 1732519917, + "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "04f8a11f247ba00263b060fbcdc95484fd046104", + "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436", "type": "github" }, "original": { @@ -160,11 +160,11 @@ }, "nixlib": { "locked": { - "lastModified": 1728781282, - "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", + "lastModified": 1732410305, + "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b", + "rev": "87b6978992e2eb605732fba842cad0a7e14b2047", "type": "github" }, "original": { @@ -181,11 +181,11 @@ ] }, "locked": { - "lastModified": 1729127034, - "narHash": "sha256-42AMGl+dh4I2wGgICSeDI1mqYaDEJhwqquHJ1vA0QiQ=", + "lastModified": 1732496924, + "narHash": "sha256-/MNhZLR0eh9z/d3l+ammq+F5XxHln0RHgO4Bhtjr0IM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "dd28a0806e7124fe392c33c9ccaa12f21970401f", + "rev": "098e8b6ff72c86944a8d54b64ddd7b7e6635830a", "type": "github" }, "original": { @@ -196,11 +196,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729455275, - "narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=", + "lastModified": 1732483221, + "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36", + "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", "type": "github" }, "original": { @@ -216,15 +216,14 @@ ], "nixpkgs": [ "nixpkgs" - ], - "search": "search" + ] }, "locked": { - "lastModified": 1729353767, - "narHash": "sha256-mrHq16rogwfLP3ivrx4O5NKNc0gBuBNyMcAfYWMcvEc=", + "lastModified": 1732486206, + "narHash": "sha256-C+jxwubsR7XdIO8N0jP3uOx7sg+nmGPfyLtreyjMKGI=", "owner": "SuperSandro2000", "repo": "nixos-modules", - "rev": "0ea540261e88e3afc126e7df544ef0d2acd28ca4", + "rev": "e8b051864f81b6c2f6f044af3576b877eb8085ed", "type": "github" }, "original": { @@ -235,11 +234,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729450260, - "narHash": "sha256-3GNZr0V4b19RZ5mlyiY/4F8N2pzitvjDU6aHMWjAqLI=", + "lastModified": 1732866476, + "narHash": "sha256-fQPhGk0rBifqOtcq07Que6MWuWU08AmiaOVZ6TTAHUw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e3f55158e7587c5a5fdb0e86eb7ca4f455f0928f", + "rev": "564e219aa5ca9306ab22fb803c16391aacb4417b", "type": "github" }, "original": { @@ -251,23 +250,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1732749044, + "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", "type": "github" }, "original": { @@ -291,11 +290,11 @@ ] }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -332,11 +331,11 @@ ] }, "locked": { - "lastModified": 1729391507, - "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", + "lastModified": 1732847586, + "narHash": "sha256-SnHHSBNZ+aj8mRzYxb6yXBl9ei3K3j5agC/D8Vjw/no=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "784981a9feeba406de38c1c9a3decf966d853cca", + "rev": "97210ddff72fe139815f4c1ac5da74b5b0dde2d7", "type": "github" }, "original": { @@ -345,46 +344,18 @@ "type": "github" } }, - "search": { - "inputs": { - "flake-utils": [ - "nixos-modules", - "flake-utils" - ], - "nixpkgs": [ - "nixos-modules", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728423244, - "narHash": "sha256-+YwNsyIFj3dXyLVQd1ry4pCNmtOpbceKUrkNS8wp9Ho=", - "owner": "nuschtos", - "repo": "search", - "rev": "f276cc3b391493ba3a8b30170776860f9520b7fa", - "type": "github" - }, - "original": { - "owner": "nuschtos", - "repo": "search", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": [ - "nixpkgs-stable" ] }, "locked": { - "lastModified": 1729394972, - "narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=", + "lastModified": 1732575825, + "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5", + "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", "type": "github" }, "original": { @@ -421,11 +392,11 @@ ] }, "locked": { - "lastModified": 1727849733, - "narHash": "sha256-mqxs/nyzOEKiBHa94OtcOLYBXd65P8tO4DUVTHWHn6o=", + "lastModified": 1730615238, + "narHash": "sha256-u/ZGtyEUvAkFOBgLo2YldOx0GKjE3/esWpWruRD376E=", "owner": "Toqozz", "repo": "wired-notify", - "rev": "a1f6965737754e7424f9468f6befef885a9ee0ad", + "rev": "1632418aa15889343028261663e81d8b5595860e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 495188a..1c96a01 100644 --- a/flake.nix +++ b/flake.nix @@ -97,7 +97,6 @@ url = "github:Mic92/sops-nix"; inputs = { nixpkgs.follows = "nixpkgs"; - nixpkgs-stable.follows = "nixpkgs-stable"; }; }; diff --git a/modules/boot.nix b/modules/boot.nix index fa4bfa2..b9165b3 100644 --- a/modules/boot.nix +++ b/modules/boot.nix @@ -35,7 +35,6 @@ in config.boot = lib.mkIf cfg.default { supportedFilesystems = [ cfg.filesystem ]; tmp.useTmpfs = true; - kernelPackages = pkgs.linuxPackages_6_10; kernelParams = [ "nordrand" ] ++ lib.optional (cfg.cpuType == "amd") "kvm-amd" diff --git a/systems/artemision/fonts.nix b/systems/artemision/fonts.nix index 6601232..e8ab0fa 100644 --- a/systems/artemision/fonts.nix +++ b/systems/artemision/fonts.nix @@ -3,17 +3,13 @@ fonts = { fontconfig.enable = true; enableDefaultPackages = true; - packages = with pkgs; [ - (nerdfonts.override { - fonts = [ - "FiraCode" - "DroidSansMono" - "Hack" - "DejaVuSansMono" - "Noto" - "OpenDyslexic" - ]; - }) + packages = with pkgs.nerd-fonts; [ + fira-code + droid-sans-mono + hack + dejavu-sans-mono + noto + open-dyslexic ]; }; } diff --git a/systems/palatine-hill/configuration.nix b/systems/palatine-hill/configuration.nix index 8184d77..4c4254a 100644 --- a/systems/palatine-hill/configuration.nix +++ b/systems/palatine-hill/configuration.nix @@ -67,7 +67,7 @@ nfs.server.enable = true; openssh.ports = [ 666 ]; smartd.enable = true; - calibre-server.enable = true; + calibre-server.enable = false; }; diff --git a/systems/palatine-hill/gitea.nix b/systems/palatine-hill/gitea.nix index 3fe2c92..73b99fd 100644 --- a/systems/palatine-hill/gitea.nix +++ b/systems/palatine-hill/gitea.nix @@ -24,6 +24,7 @@ in DOMAIN = "git.alicehuston.xyz"; ROOT_URL = "https://git.alicehuston.xyz/"; HTTP_PORT = 6443; + SSH_PORT = 2222; }; service = { DISABLE_REGISTRATION = true;