diff --git a/configuration.nix b/configuration.nix index ef63ae3..78bd7b8 100644 --- a/configuration.nix +++ b/configuration.nix @@ -76,6 +76,7 @@ isNormalUser = true; description = "mtgmonkey"; extraGroups = ["networkmanager" "wheel"]; + packages = [pkgs.sl]; }; users.users.test = { diff --git a/flake.lock b/flake.lock index 4855f9b..e8c7d53 100644 --- a/flake.lock +++ b/flake.lock @@ -1,110 +1,90 @@ { "nodes": { - "niri-flake": { + "advisory-db": { + "flake": false, + "locked": { + "lastModified": 1747937073, + "narHash": "sha256-52H8P6jAHEwRvg7rXr4Z7h1KHZivO8T1Z9tN6R0SWJg=", + "owner": "rustsec", + "repo": "advisory-db", + "rev": "bccf313a98c034573ac4170e6271749113343d97", + "type": "github" + }, + "original": { + "owner": "rustsec", + "repo": "advisory-db", + "type": "github" + } + }, + "crane": { + "locked": { + "lastModified": 1748047550, + "narHash": "sha256-t0qLLqb4C1rdtiY8IFRH5KIapTY/n3Lqt57AmxEv9mk=", + "owner": "ipetkov", + "repo": "crane", + "rev": "b718a78696060df6280196a6f992d04c87a16aef", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "helix": { + "flake": false, + "locked": { + "lastModified": 1727654850, + "narHash": "sha256-du6Vy5Yxy6aZFP7ad5guz5GOD/8uMY+Pgse1ZM+K2Jo=", + "owner": "JordanForks", + "repo": "helix", + "rev": "1603715cc91bf6fdffb4aedfb5b76fb69fd10e28", + "type": "github" + }, + "original": { + "owner": "JordanForks", + "repo": "helix", + "type": "github" + } + }, + "nix-github-actions": { "inputs": { - "niri-stable": "niri-stable", - "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable", - "xwayland-satellite-stable": "xwayland-satellite-stable", - "xwayland-satellite-unstable": "xwayland-satellite-unstable" + "nixpkgs": [ + "rgit", + "nixpkgs" + ] }, "locked": { - "lastModified": 1763126448, - "narHash": "sha256-LVYJJObvkWwR8QB/Srr6Rks+Fw2lYvnRNOH0etV9DM8=", - "owner": "sodiboo", - "repo": "niri-flake", - "rev": "add7bcf2925547e180cc2fe6d5f4b5e7c579d086", + "lastModified": 1737420293, + "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9", "type": "github" }, "original": { - "owner": "sodiboo", - "repo": "niri-flake", - "type": "github" - } - }, - "niri-stable": { - "flake": false, - "locked": { - "lastModified": 1756556321, - "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "ref": "v25.08", - "repo": "niri", - "type": "github" - } - }, - "niri-unstable": { - "flake": false, - "locked": { - "lastModified": 1763014447, - "narHash": "sha256-nmu7S8J9IJKLQyIkSU8QWYHygrfw76NHGTkcr+bXMX0=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "a52df533c4694b5ed0a04140af60fd26146df911", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", + "owner": "nix-community", + "repo": "nix-github-actions", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", - "owner": "NixOS", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1763049705, - "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1763049705, - "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1714253743, "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", @@ -120,9 +100,40 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1748159586, + "narHash": "sha256-xeCMAhKjhDjVFsfJcftv+CWcExYo+X8IBUW8L947ww4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7382d075365a977c4a9c8aa4c5e4abed15f00ee1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1745377448, + "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "noshell": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1717396029, @@ -138,43 +149,85 @@ "type": "github" } }, + "rgit": { + "inputs": { + "advisory-db": "advisory-db", + "crane": "crane", + "helix": "helix", + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs_3", + "treefmt-nix": "treefmt-nix", + "utils": "utils" + }, + "locked": { + "lastModified": 1748169485, + "narHash": "sha256-JxPNDrvpqgpz6MQp6LKT3cbK4bl7/E9+eST1cEhl/jA=", + "owner": "w4", + "repo": "rgit", + "rev": "9224aa1a006acb6af6da8cfbee82278612bd05d0", + "type": "github" + }, + "original": { + "owner": "w4", + "repo": "rgit", + "type": "github" + } + }, "root": { "inputs": { - "niri-flake": "niri-flake", - "nixpkgs": "nixpkgs_2", - "noshell": "noshell" + "nixpkgs": "nixpkgs", + "noshell": "noshell", + "rgit": "rgit" } }, - "xwayland-satellite-stable": { - "flake": false, + "systems": { "locked": { - "lastModified": 1755491097, - "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "388d291e82ffbc73be18169d39470f340707edaa", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "Supreeeme", - "ref": "v0.7", - "repo": "xwayland-satellite", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, - "xwayland-satellite-unstable": { - "flake": false, + "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, "locked": { - "lastModified": 1762747449, - "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "6338574bc5c036487486acde264f38f39ea15fad", + "lastModified": 1747912973, + "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", "type": "github" }, "original": { - "owner": "Supreeeme", - "repo": "xwayland-satellite", + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems" + }, + "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" } } diff --git a/flake.nix b/flake.nix index e8bfd2e..ce3030e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,15 +1,17 @@ { description = "Home Manager configuration of test"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; noshell.url = "github:viperML/noshell"; - niri-flake.url = "github:sodiboo/niri-flake"; + # niri-flake.url = "github:sodiboo/niri-flake"; + rgit.url = "github:w4/rgit"; }; outputs = { nixpkgs, noshell, - niri-flake, + # niri-flake, + rgit, ... }: let system = "x86_64-linux"; @@ -17,10 +19,12 @@ nixosConfigurations."nixos" = nixpkgs.lib.nixosSystem { inherit system; modules = [ - niri-flake.nixosModules.niri + # niri-flake.nixosModules.niri noshell.nixosModules.default {programs.noshell.enable = true;} ./configuration.nix + rgit.nixosModules.${system}.default + ./rgit.nix ]; }; }; diff --git a/rgit.nix b/rgit.nix new file mode 100644 index 0000000..9e93a59 --- /dev/null +++ b/rgit.nix @@ -0,0 +1,8 @@ +{...}: { + services.rgit = { + enable = true; + bindAddress = "[::]:3333"; + dbStorePath = "/var/rgit/rgit.db"; + repositoryStorePath = "/var/rgit/repos/"; + }; +}