notohh/snowflake
notohh/snowflake
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases Packages Wiki Activity

flake.nix: remove attic && add nixvim

Browse source 
sora: disable attic flake

tsuki: switch to attic-client
This commit is contained in:
notohh 2024-10-26 21:59:41 -04:00
parent 2f2bebf178
commit cb382d7f91
Signed by: notohh
GPG key ID: BD47506D475EE86D
5 changed files with 749 additions and 383 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1110
flake.lock
View file

File diff suppressed because it is too large Load diff

9
flake.nix
View file

@ -63,6 +63,8 @@
hyprpaper.url = "github:hyprwm/hyprpaper"; hyprpaper.url = "github:hyprwm/hyprpaper";
xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland"; xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland";
hyprsysteminfo.url = "github:hyprwm/hyprsysteminfo"; hyprsysteminfo.url = "github:hyprwm/hyprsysteminfo";
hyprsunset.url = "github:hyprwm/hyprsunset";
hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent";
hyprland-plugins = { hyprland-plugins = {
url = "github:hyprwm/hyprland-plugins"; url = "github:hyprwm/hyprland-plugins";
inputs.hyprland.follows = "hyprland"; inputs.hyprland.follows = "hyprland";
@ -70,7 +72,6 @@
### other stuff ### other stuff
nix-gaming.url = "github:fufexan/nix-gaming"; nix-gaming.url = "github:fufexan/nix-gaming";
attic.url = "github:zhaofengli/attic";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
yazi.url = "github:sxyazi/yazi"; yazi.url = "github:sxyazi/yazi";
helix.url = "github:helix-editor/helix"; helix.url = "github:helix-editor/helix";
@ -81,8 +82,6 @@
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
eww.url = "github:elkowar/eww"; eww.url = "github:elkowar/eww";
anyrun.url = "github:Kirottu/anyrun"; anyrun.url = "github:Kirottu/anyrun";
# wezterm.url = "github:notohh/wezterm?dir=nix&ref=nix-add-overlay";
botoh.url = "git+https://git.flake.sh/notohh/botoh"; botoh.url = "git+https://git.flake.sh/notohh/botoh";
zen-browser.url = "github:fufexan/zen-browser-flake"; zen-browser.url = "github:fufexan/zen-browser-flake";
deploy-rs = { deploy-rs = {
@ -97,5 +96,9 @@
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
} }

2
hosts/common.nix
View file

@ -3,6 +3,6 @@
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
inputs.nur.nixosModules.nur inputs.nur.nixosModules.nur
inputs.attic.nixosModules.atticd # inputs.attic.nixosModules.atticd
]; ];
} }

7
hosts/sora/services/attic.nix
View file

@ -1,18 +1,15 @@
{ {
inputs,
config, config,
pkgs, pkgs,
... ...
}: { }: {
imports = [inputs.attic.nixosModules.atticd];
sops.secrets.attic = {}; sops.secrets.attic = {};
environment.systemPackages = [pkgs.attic]; environment.systemPackages = [pkgs.attic-client];
services.atticd = { services.atticd = {
enable = true; enable = true;
credentialsFile = config.sops.secrets.attic.path; environmentFile = config.sops.secrets.attic.path;
settings = { settings = {
listen = "[::]:8200"; listen = "[::]:8200";
allowed-hosts = ["cache.flake.sh"]; allowed-hosts = ["cache.flake.sh"];

4
hosts/tsuki/services/atticd.nix
View file

@ -1,5 +1,5 @@
{pkgs, ...}: { {pkgs, ...}: {
environment.systemPackages = [pkgs.attic]; environment.systemPackages = [pkgs.attic-client];
systemd.services.atticd = { systemd.services.atticd = {
enable = true; enable = true;
@ -8,7 +8,7 @@
serviceConfig = { serviceConfig = {
User = "notoh"; User = "notoh";
ExecStart = "${pkgs.attic}/bin/attic watch-store kyasshu"; ExecStart = "${pkgs.attic-client}/bin/attic watch-store kyasshu";
Restart = "always"; Restart = "always";
RestartSec = 30; RestartSec = 30;
}; };