diff --git a/README.md b/README.md deleted file mode 100644 index e0d5248..0000000 --- a/README.md +++ /dev/null @@ -1,7 +0,0 @@ -= Nikos -NixOS Distribution for personal use by jsw08. -Contains configs for: -- Hyprland -- Shell -- Multiple systems -- Server diff --git a/flake.lock b/flake.lock index ad835cb..04b1e8b 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1750173260, - "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", + "lastModified": 1747575206, + "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", "owner": "ryantm", "repo": "agenix", - "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", + "rev": "4835b1dc898959d8547a871ef484930675cb47f1", "type": "github" }, "original": { @@ -212,11 +212,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -230,11 +230,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1748821116, + "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", "type": "github" }, "original": { @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1749636823, + "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "623c56286de5a3193aa38891a6991b28f9bab056", "type": "github" }, "original": { @@ -469,11 +469,11 @@ ] }, "locked": { - "lastModified": 1751146119, - "narHash": "sha256-gvjG95TCnUVJkvQvLMlnC4NqiqFyBdJk3o8/RwuHeaU=", + "lastModified": 1749657191, + "narHash": "sha256-QLilaHuhGxiwhgceDWESj9gFcKIdEp7+9lRqNGpN8S4=", "owner": "nix-community", "repo": "home-manager", - "rev": "76d0c31fce2aa0c71409de953e2f9113acd5b656", + "rev": "faeab32528a9360e9577ff4082de2d35c6bbe1ce", "type": "github" }, "original": { @@ -578,17 +578,22 @@ }, "nil": { "inputs": { + "flake-utils": [ + "nvf", + "flake-utils" + ], "nixpkgs": [ "nvf", "nixpkgs" - ] + ], + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750047244, - "narHash": "sha256-vluLARrk4485npdyHOj8XKr0yk6H22pNf+KVRNL+i/Y=", + "lastModified": 1741118843, + "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", "owner": "oxalica", "repo": "nil", - "rev": "870a4b1b5f12004832206703ac15aa85c42c247b", + "rev": "577d160da311cc7f5042038456a0713e9863d09e", "type": "github" }, "original": { @@ -604,11 +609,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1751098667, - "narHash": "sha256-ca6U8x1WRmgpX83Cz90MWvI8JeB4ScR0MiPiOepNpXA=", + "lastModified": 1749606256, + "narHash": "sha256-1wgFWtaWNQMvH/XN1yElz8PnrEbnD89FiPhuN8YFGoc=", "owner": "kaylorben", "repo": "nixcord", - "rev": "574d28d8d6320908f1be56ce160947946125ccb6", + "rev": "cc750b99c76c83809cb7e492cab6930c610faa64", "type": "github" }, "original": { @@ -650,11 +655,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1743296961, + "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", "type": "github" }, "original": { @@ -678,22 +683,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1750969886, - "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-torzu": { "locked": { "lastModified": 1747156605, @@ -728,11 +717,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1749494155, - "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=", + "lastModified": 1748437600, + "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88331c17ba434359491e8d5889cce872464052c2", + "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", "type": "github" }, "original": { @@ -744,11 +733,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -841,11 +830,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1751186226, - "narHash": "sha256-Bt7jtmCW72JUPxOIrV73qBTAUOy4qvJXsls2ERDUcGo=", + "lastModified": 1749631819, + "narHash": "sha256-iy7UuA2I0DaKEUMncTQNFg0bYDX7sa5WCRQTrIWqmEU=", "owner": "notashelf", "repo": "nvf", - "rev": "5bad5dd94ce5ea3b40b08d9e6802e69d02198d21", + "rev": "2a2b5e2790b41eadc42758fd6c4d62b7af64f17c", "type": "github" }, "original": { @@ -864,13 +853,34 @@ "hm": "hm", "nixcord": "nixcord", "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-torzu": "nixpkgs-torzu", "nvf": "nvf", "somcli": "somcli", "stylix": "stylix" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nvf", + "nil", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741055476, + "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "aefb7017d710f150970299685e8d8b549d653649", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "somcli": { "inputs": { "flake-utils": "flake-utils_3", @@ -913,11 +923,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1751145558, - "narHash": "sha256-OPlbpH64jzIspYqvJB96tnN9V9HBlAxROS5ijQwtN70=", + "lastModified": 1749576521, + "narHash": "sha256-II57ap6MGkArooZFaSDrgNgi24T5Dkdkzhe+xUHdybQ=", "owner": "danth", "repo": "stylix", - "rev": "3a09d3f5cb940fa4142a2f3415b508a8be92b721", + "rev": "6d72fc259b6f595f5bcf9634bf2f82b76f939a0d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c694a22..646e398 100644 --- a/flake.nix +++ b/flake.nix @@ -40,8 +40,7 @@ inputs = { # Nixpkgs and other core shit - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; # seafile error + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # build error unrelated to config. nixpkgs-torzu.url = "github:nixos/nixpkgs/d9afddcd04bc716d1fee5141f8696a131f76442c"; # Commit before packacge removed. flake-parts.url = "github:hercules-ci/flake-parts"; git-hooks-nix = { diff --git a/system/server/default.nix b/system/server/default.nix index 1c23bb6..c950877 100644 --- a/system/server/default.nix +++ b/system/server/default.nix @@ -1,4 +1,4 @@ {lib, ...}: { - imports = [./caddy.nix ./index ./seafile.nix ./bot.nix ./immich.nix ./matrix.nix ./mail.nix ./forgejo.nix ./temp.nix]; + imports = [./caddy.nix ./index ./seafile.nix ./bot.nix ./immich.nix ./matrix.nix ./mail.nix ./forgejo.nix]; options.niksos.server = lib.mkEnableOption "server servcies (such as caddy)."; #TODO: per service option. } diff --git a/system/server/seafile.nix b/system/server/seafile.nix index ac18412..64756df 100644 --- a/system/server/seafile.nix +++ b/system/server/seafile.nix @@ -6,7 +6,7 @@ }: { services.seafile = { enable = config.niksos.server; - seahubPackage = inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.seahub; + seahubPackage = inputs.nixpkgs.legacyPackages.${pkgs.system}.seahub; adminEmail = "jurnwubben@gmail.com"; initialAdminPassword = "ChangeMeTheFuckNow!";