Skip to content

Commit

Permalink
feat: remove server stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
sioodmy committed Aug 29, 2024
1 parent 5e2efe0 commit 7a5fa0c
Show file tree
Hide file tree
Showing 24 changed files with 31 additions and 838 deletions.
425 changes: 13 additions & 412 deletions flake.lock

Large diffs are not rendered by default.

36 changes: 0 additions & 36 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
colors = inputs.nix-colors.colorSchemes.catppuccin-frappe.palette;
in
[
inputs'.agenix.packages.default
config.treefmt.build.wrapper
(pkgs.callPackage ./shell {inherit pkgs inputs colors;})
]
Expand Down Expand Up @@ -75,18 +74,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};

agenix = {
url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs";
};

zig-overlay = {
url = "github:mitchellh/zig-overlay";
inputs = {
nixpkgs.follows = "nixpkgs";
};
};

homix = {
url = "github:sioodmy/homix";
inputs = {
Expand All @@ -98,29 +85,6 @@
url = "github:hercules-ci/flake-parts";
inputs.nixpkgs-lib.follows = "nixpkgs";
};
lyricsapi = {
url = "github:sioodmy/lyricsapi";
inputs.nixpkgs.follows = "nixpkgs";
};
simple-nixos-mailserver = {
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
inputs.nixpkgs.follows = "nixpkgs";
};
website = {
url = "github:sioodmy/website";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
};
};
bitcoinstatus = {
url = "github:sioodmy/bitcoinstatus";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
treefmt-nix.follows = "treefmt-nix";
};
};
};
}
# see also:
Expand Down
20 changes: 1 addition & 19 deletions hosts/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@
core = ../system/core;
bootloader = ../system/core/bootloader.nix;
impermanence = ../system/core/impermanence.nix;
server = ../system/server;
wayland = ../system/wayland;
hw = inputs.nixos-hardware.nixosModules;
agenix = inputs.agenix.nixosModules.age;

shared = [core agenix];
shared = [core];
in {
# all my hosts are named after saturn moons btw

Expand All @@ -31,20 +29,4 @@ in {
++ shared;
specialArgs = {inherit inputs;};
};

# x86 home server
prometheus = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules =
[
{
networking.hostName = "prometheus";
boot.loader.grub.devices = ["/dev/sda"];
}
server
./prometheus
]
++ shared;
specialArgs = {inherit inputs;};
};
}
7 changes: 0 additions & 7 deletions secrets/caldav.age

This file was deleted.

Binary file removed secrets/discordtoken.age
Binary file not shown.
Binary file removed secrets/mailserver.age
Binary file not shown.
7 changes: 0 additions & 7 deletions secrets/openai.age

This file was deleted.

21 changes: 0 additions & 21 deletions secrets/radicale-pass.age

This file was deleted.

Binary file removed secrets/radicale.age
Binary file not shown.
19 changes: 0 additions & 19 deletions secrets/secrets.nix

This file was deleted.

21 changes: 0 additions & 21 deletions secrets/spotify-tui.age

This file was deleted.

27 changes: 0 additions & 27 deletions secrets/spotify.age

This file was deleted.

Binary file removed secrets/syncthing-calypso-cert.age
Binary file not shown.
Binary file removed secrets/syncthing-calypso-key.age
Binary file not shown.
Binary file removed secrets/syncthing-cert.age
Binary file not shown.
Binary file removed secrets/syncthing-key.age
Binary file not shown.
1 change: 0 additions & 1 deletion system/core/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
./system.nix
./schizo.nix
./network.nix
./secrets.nix
./nix.nix
./users.nix
./git.nix
Expand Down
26 changes: 9 additions & 17 deletions system/core/devpkgs.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
{
pkgs,
inputs,
...
}: {
environment.systemPackages =
(with pkgs; [
clang
gnumake
cargo
go
cargo
gcc
])
++ [
inputs.zig-overlay.packages.${pkgs.system}.master
];
{pkgs, ...}: {
environment.systemPackages = with pkgs; [
clang
gnumake
cargo
go
cargo
gcc
];
}
3 changes: 0 additions & 3 deletions system/core/network.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ in {
dns = mkIf dnscrypt "none";
wifi = {
macAddress = "random";
backend = "iwd";
powersave = true;
};
};
Expand Down Expand Up @@ -49,8 +48,6 @@ in {
};
};

virtualisation.docker.enable = true;

# slows down boot time
systemd.services.NetworkManager-wait-online.enable = false;
}
20 changes: 8 additions & 12 deletions system/core/nix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,14 @@
sessionVariables.FLAKE = "/home/sioodmy/dev/dotfiles";
etc."nix/flake-channels/nixpkgs".source = inputs.nixpkgs;

systemPackages =
(with pkgs; [
git
deadnix
alejandra
statix
nix-output-monitor
nvfetcher
])
++ [
inputs.agenix.packages."${pkgs.system}".default
];
systemPackages = with pkgs; [
git
deadnix
alejandra
statix
nix-output-monitor
nvfetcher
];
defaultPackages = [];
};

Expand Down
45 changes: 0 additions & 45 deletions system/core/secrets.nix

This file was deleted.

Loading

0 comments on commit 7a5fa0c

Please sign in to comment.