diff --git a/flake.lock b/flake.lock index a561ae4..cfa7249 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764830699, - "narHash": "sha256-GmK2+kcaorEsQ/O9lweJIVBv21Np6VfW6sE/3F/GBjY=", + "lastModified": 1764983815, + "narHash": "sha256-Y0SVl1lYDkLxF8CFjv41G5xVWzgQdLHNU5d9EFLgSG4=", "owner": "steveyegge", "repo": "beads", - "rev": "f4b8a7ad4f7eb3bd47b24357f69f22bc1a75d4b7", + "rev": "386ab82f878b1ec618ffd7076589f04f6e92aa03", "type": "github" }, "original": { @@ -203,25 +203,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1694529238, @@ -237,9 +219,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -257,7 +239,7 @@ }, "gomod2nix": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "tangled", "nixpkgs" @@ -284,11 +266,11 @@ ] }, "locked": { - "lastModified": 1764839789, - "narHash": "sha256-QCgaXEj8036JlfyVM2e5fgKIxoF7IgGRcAi8LkehKvo=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "d441981b200305ebb8e2e2921395f51d207fded6", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -300,11 +282,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1764859753, - "narHash": "sha256-9x07NsTIq7Wg5zHiPCrQNl/CpTjQvK2MOsJljiW5UA0=", + "lastModified": 1765049597, + "narHash": "sha256-i/OEo6DScytmicMf2qqrFBeS6OcyB1OpUlKuQ6RMTDI=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "24b9993da7e61dc047703796c4ede668440e2414", + "rev": "78f238e671bafc105deae2406e7dad4802257d4e", "type": "github" }, "original": { @@ -316,11 +298,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1764859664, - "narHash": "sha256-o/yvMyi49W/S6tORVDmAEnBdwAtZy9XysOgUEyC+N6I=", + "lastModified": 1765052008, + "narHash": "sha256-mwK1IKI1firSihAyh8qku8xHP9SaChfm4or42WbmGPM=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "65916f1c596635aa2cb62c7d54cf28955bc5885b", + "rev": "6fbd2b6aebd19904158094a27a1d156cbdceed17", "type": "github" }, "original": { @@ -395,34 +377,6 @@ "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, "lucide-src": { "flake": false, "locked": { @@ -443,11 +397,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1764859668, - "narHash": "sha256-JKqgrLkSXj8kN+SyS9u5lbeT9tbhb9jLXYffxSldjBY=", + "lastModified": 1765034113, + "narHash": "sha256-i+4lUGCZyqXx70xUoM4iqbCAcSk69zz8czZNweCOGg0=", "owner": "numtide", "repo": "nix-ai-tools", - "rev": "abf8d69e3119fdae96a198d054145387059e6283", + "rev": "e39a9719bdc5b495aadf894a9b7321cf27e9ecf7", "type": "github" }, "original": { @@ -507,11 +461,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1764794580, - "narHash": "sha256-UMVihg0OQ980YqmOAPz+zkuCEb9hpE5Xj2v+ZGNjQ+M=", + "lastModified": 1764947035, + "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebc94f855ef25347c314258c10393a92794e7ab9", + "rev": "a672be65651c80d3f592a89b3945466584a22069", "type": "github" }, "original": { @@ -523,11 +477,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764860029, - "narHash": "sha256-occ89AUkARCmSIXK3Z9pdy4OgM2NZUsi0K1cLaiGvRQ=", + "lastModified": 1765051866, + "narHash": "sha256-fgGJzeU2dxR37zLjwl3/YnVJq8hLKhpg80NDLIZMCgo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f9be1bec21347570c9857ab7d95d9c2f1f0a5cf", + "rev": "58a74402883fdf78cc5107bf143808354d3ec551", "type": "github" }, "original": { @@ -539,11 +493,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1764642553, - "narHash": "sha256-mvbFFzVBhVK1FjyPHZGMAKpNiqkr7k++xIwy+p/NQvA=", + "lastModified": 1764947035, + "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f720de59066162ee879adcc8c79e15c51fe6bfb4", + "rev": "a672be65651c80d3f592a89b3945466584a22069", "type": "github" }, "original": { @@ -573,15 +527,14 @@ "inputs": { "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_4", - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_4" + "systems": "systems_3" }, "locked": { - "lastModified": 1764803799, - "narHash": "sha256-94SMf4Uw5iSoX37ui6LAdcadCUHUDfrvggGay0uWkis=", + "lastModified": 1765043977, + "narHash": "sha256-Gcdn1s/ynXRFNqInTcYltAi1gqgmTKw8Hw6OSfFNWMY=", "owner": "nix-community", "repo": "nixvim", - "rev": "5d1c27e53c96e2c94e69f2e2d083ef147b3a3ccb", + "rev": "b65233d5f9736cf8d8fe9d4652e1faf610b574bc", "type": "github" }, "original": { @@ -590,29 +543,6 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils_2", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761730856, - "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", - "owner": "NuschtOS", - "repo": "search", - "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "root": { "inputs": { "beads": "beads", @@ -760,21 +690,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tangled": { "inputs": { "actor-typeahead-src": "actor-typeahead-src", @@ -792,11 +707,11 @@ "sqlite-lib-src": "sqlite-lib-src" }, "locked": { - "lastModified": 1764845517, - "narHash": "sha256-FwNkx23wXJu0glj3pcdiuDLJ1fqPM6IcnJ8m5p35A3c=", + "lastModified": 1765013052, + "narHash": "sha256-hPhegxFBoEHcKWoydEQGO5ew4CPJkSg8OCrvR+ZfSyg=", "ref": "refs/heads/master", - "rev": "59f43eb13d25f5c66618a43baf236bd7dfb72513", - "revCount": 1695, + "rev": "442e2ab1b4dc3a8a75910abc564da55a639a495c", + "revCount": 1720, "type": "git", "url": "https://tangled.org/tangled.org/core" }, @@ -829,7 +744,7 @@ "zjstatus": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_5", "rust-overlay": "rust-overlay" }, diff --git a/flake.nix b/flake.nix index 92f62db..6ee7a52 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,7 @@ constants = import ./lib/constants.nix; user = constants.user; darwinHosts = ["chidi" "jason"]; - nixosHosts = ["michael" "tahani"]; + nixosHosts = ["tahani"]; overlays = import ./overlays {inherit inputs;}; in { systems = [ diff --git a/hosts/michael/default.nix b/hosts/michael/default.nix deleted file mode 100644 index a7c838e..0000000 --- a/hosts/michael/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - modulesPath, - hostname, - inputs, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - (modulesPath + "/profiles/qemu-guest.nix") - ./disk-config.nix - ./hardware-configuration.nix - ../../modules/nixos - inputs.disko.nixosModules.disko - inputs.tangled.nixosModules.knot - ]; - - services.tangled.knot = { - enable = true; - server = { - hostname = "knot.schmatzler.com"; - owner = "did:plc:yiapylv5gwzlyzesppjmukvj"; - }; - }; - - systemd.services.knot = { - after = [ "network-online.target" ]; - wants = [ "network-online.target" ]; - }; - - networking.firewall.allowedTCPPorts = [ 5555 ]; - - services.openssh = { - enable = true; - settings = { - PermitRootLogin = "yes"; - PasswordAuthentication = false; - }; - }; - - - - networking.hostName = hostname; -} diff --git a/hosts/michael/disk-config.nix b/hosts/michael/disk-config.nix deleted file mode 100644 index c851874..0000000 --- a/hosts/michael/disk-config.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - disko.devices = { - disk = { - main = { - type = "disk"; - device = "/dev/sda"; - content = { - type = "gpt"; - partitions = { - boot = { - size = "1M"; - type = "EF02"; - }; - ESP = { - size = "512M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = ["umask=0077"]; - }; - }; - root = { - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/hosts/michael/hardware-configuration.nix b/hosts/michael/hardware-configuration.nix deleted file mode 100644 index e9ba45b..0000000 --- a/hosts/michael/hardware-configuration.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - lib, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = []; - boot.extraModulePackages = []; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - - networking.useDHCP = lib.mkDefault true; -} diff --git a/hosts/tahani/default.nix b/hosts/tahani/default.nix index 0e4a393..3f47463 100644 --- a/hosts/tahani/default.nix +++ b/hosts/tahani/default.nix @@ -96,6 +96,16 @@ }; }; + services.gitea = { + enable = true; + settings = { + server = { + DOMAIN = "git.tahani"; + HTTP_PORT = 8380; + }; + }; + }; + home-manager.users.${user} = { programs.git.settings.user.email = "christoph@schmatzler.com"; }; diff --git a/modules/packages.nix b/modules/packages.nix index d2444d4..1b99203 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -12,7 +12,7 @@ with pkgs; [ ast-grep bun delta - devenv + # devenv dig docker docker-compose