clo/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Natalie 2024-09-30 10:08:12 -07:00
commit 2e487c72f9
4 changed files with 88 additions and 2289 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2196
flake.lock
View file

File diff suppressed because it is too large Load diff

30
flake.nix
View file

@ -13,11 +13,11 @@
inputs.nixpkgs.follows = "nixpkgs";
};
stylix.url = "github:danth/stylix";
blocklist-hosts = {
hosts = {
url = "github:StevenBlack/hosts";
#flake = false;
};
hyprland.url = "github:hyprwm/Hyprland";
hyprland-plugins = {
url = "github:hyprwm/hyprland-plugins";
@ -25,12 +25,11 @@
#flake = false;
};
flake-utils.url = "github:numtide/flake-utils";
zig.url = "github:mitchellh/zig-overlay";
zls.url = "github:zigtools/zls?rev=a26718049a8657d4da04c331aeced1697bc7652b";
foundryvtt.url = "github:reckenrode/nix-foundryvtt";
ghostty = {
url = "git+ssh://git@github.com/ghostty-org/ghostty";
};
@ -44,15 +43,18 @@
url = "github:ToyVo/nh_darwin";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-options-search = {
url = "github:madsbv/nix-options-search";
};
};
outputs = {
self,
nixpkgs,
nixpkgs-stable,
nix-options-search,
home-manager,
stylix,
darwin,
blocklist-hosts,
hosts,
hyprland-plugins,
zig,
zls,
@ -64,14 +66,16 @@
overlays = [
inputs.zig.overlays.default
];
inherit (nixpkgs) lib;
in {
nixosConfigurations = {
nixos = lib.nixosSystem {
modules = [
{nixpkgs.overlays = overlays;}
nixos-cosmic.nixosModules.default
hosts.nixosModule
{
networking.stevenBlackHosts.enable = true;
}
./hosts/desktop/configuration.nix
home-manager.nixosModules.home-manager
{
@ -81,7 +85,6 @@
users.nmarks = import ./hosts/desktop/home.nix;
};
home-manager.extraSpecialArgs = {
inherit stylix;
inherit hyprland-plugins;
inherit zls;
inherit ghostty;
@ -90,8 +93,6 @@
];
specialArgs = {
inherit inputs;
inherit stylix;
inherit blocklist-hosts;
};
};
};
@ -103,6 +104,10 @@
{nixpkgs.overlays = overlays;}
./hosts/laptop/configuration.nix
home-manager.darwinModules.home-manager
hosts.nixosModule
{
networking.stevenBlackHosts.enable = true;
}
{
home-manager = {
useGlobalPkgs = true;
@ -110,7 +115,6 @@
users.nmarks = import ./hosts/laptop/home.nix;
};
home-manager.extraSpecialArgs = {
inherit stylix;
inherit zls;
inherit ghostty;
};
@ -120,8 +124,6 @@
specialArgs = {
inherit nh_darwin;
inherit inputs;
inherit stylix;
inherit blocklist-hosts;
inherit ghostty;
};
};

135
hosts/desktop/configuration.nix
View file

@ -25,76 +25,75 @@
ratbagd.enable = true;
};
systemd.timers.duckdns = {
wantedBy = ["timers.target"];
timerConfig = {
OnBootSec = "5m";
OnUnitActiveSec = "5m";
Unit = "duckdns.service";
};
};
programs.noisetorch.enable = true;
systemd.services.duckdns = {
enable = true;
script = ''echo url="https://www.duckdns.org/update?domains=pathfinder2e&token=9c1ffa47-7496-4975-ba2b-a6928b28c500&ip=" | ${pkgs.curl}/bin/curl -v -k -o ~/.duckdns/duck.log -K -'';
serviceConfig = {
Type = "oneshot";
User = "nmarks";
};
};
services.foundryvtt = {
enable = true;
hostName = "pathfinder2.duckdns.org";
proxySSL = true;
proxyPort = 443;
package = inputs.foundryvtt.packages.${pkgs.system}.foundryvtt_11;
};
services.cloudflared = {
enable = true;
# user = "nmarks";
# tunnels = {
# "b407af0f-5168-4a79-a9f4-fe99e52990dd" = {
# credentialsFile = "${config.users.users.nmarks.home}/.cloudflared/b407af0f-5168-4a79-a9f4-fe99e52990dd.json";
# default = "http_status:404";
# };
# };
};
services.caddy = {
enable = true;
# virtualHosts."10.154.1.147".extraConfig = ''
# tls internal
# reverse_proxy localhost:30000
# encode zstd gzip
# '';
# virtualHosts."10.154.1.105".extraConfig = ''
# tls internal
# reverse_proxy localhost:30000
# encode zstd gzip
# '';
#
# virtualHosts."pathfinder2e.duckdns.org".extraConfig = ''
# reverse_proxy localhost:30000
# encode zstd gzip
# '';
virtualHosts."pathfinder2e.duckdns.org".extraConfig = ''
reverse_proxy localhost:30000
'';
# extraConfig = ''
# pathfinder2e.duckdns.org {
# # PROXY ALL REQUEST TO PORT 30000
# reverse_proxy localhost:30000
# encode zstd gzip
# }
# '';
};
# systemd.timers.duckdns = {
# wantedBy = ["timers.target"];
# timerConfig = {
# OnBootSec = "5m";
# OnUnitActiveSec = "5m";
# Unit = "duckdns.service";
# };
# };
# systemd.services.duckdns = {
# enable = true;
# script = ''echo url="https://www.duckdns.org/update?domains=pathfinder2e&token=9c1ffa47-7496-4975-ba2b-a6928b28c500&ip=" | ${pkgs.curl}/bin/curl -v -k -o ~/.duckdns/duck.log -K -'';
# serviceConfig = {
# Type = "oneshot";
# User = "nmarks";
# };
# };
#
# services.foundryvtt = {
# enable = true;
# hostName = "pathfinder2.duckdns.org";
# proxySSL = true;
# proxyPort = 443;
# package = inputs.foundryvtt.packages.${pkgs.system}.foundryvtt_11;
# };
#
# services.cloudflared = {
# enable = true;
# # user = "nmarks";
# # tunnels = {
# # "b407af0f-5168-4a79-a9f4-fe99e52990dd" = {
# # credentialsFile = "${config.users.users.nmarks.home}/.cloudflared/b407af0f-5168-4a79-a9f4-fe99e52990dd.json";
# # default = "http_status:404";
# # };
# # };
# };
#
# services.caddy = {
# enable = true;
#
# # virtualHosts."10.154.1.147".extraConfig = ''
# # tls internal
# # reverse_proxy localhost:30000
# # encode zstd gzip
# # '';
#
# # virtualHosts."10.154.1.105".extraConfig = ''
# # tls internal
# # reverse_proxy localhost:30000
# # encode zstd gzip
# # '';
# #
# # virtualHosts."pathfinder2e.duckdns.org".extraConfig = ''
# # reverse_proxy localhost:30000
# # encode zstd gzip
# # '';
# virtualHosts."pathfinder2e.duckdns.org".extraConfig = ''
# reverse_proxy localhost:30000
# '';
#
# # extraConfig = ''
# # pathfinder2e.duckdns.org {
# # # PROXY ALL REQUEST TO PORT 30000
# # reverse_proxy localhost:30000
# # encode zstd gzip
# # }
# # '';
# };
services.flatpak.enable = true;

16
hosts/desktop/home.nix
View file

@ -4,6 +4,7 @@
pkgs,
zls,
ghostty,
nix-options-search,
...
}: {
# wayland.windowManager.hyprland = {
@ -111,7 +112,6 @@
dxvk_2
mangohud
vulkan-tools
asdf-vm
prismlauncher
# for cmpm17
binwalk
@ -126,11 +126,6 @@
sl
fallout-ce
fallout2-ce
#CSE114 (Haskell stuff)
stack
(haskell-language-server.override {supportedGhcVersions = ["94" "947"];})
haskell.compiler.ghc947
ormolu
#LSP + formatters/linters
lua-language-server
nil
@ -169,7 +164,7 @@
programs.kitty = {
enable = true;
theme = "Catppuccin-Mocha";
themeFile = "Catppuccin-Mocha";
extraConfig = "font_family Iosevka NF
italic_font auto
bold_italic_font auto
@ -188,12 +183,11 @@
}
];
shellAliases = {
hm-update = "git add home.nix ; git commit -m 'updated home-manager config'; git push origin main; home-manager switch --flake ~/.dotfiles/#nmarks";
sys-update = "git add configuration.nix ; git commit -m 'updated system config'; git push origin main; sudo nixos-rebuild switch --flake ~/.dotfiles/#nmarks";
full-update = "sys-update; hm-update";
# hm-update = "git add home.nix ; git commit -m 'updated home-manager config'; git push origin main; home-manager switch --flake ~/.dotfiles/#nmarks";
# sys-update = "git add configuration.nix ; git commit -m 'updated system config'; git push origin main; sudo nixos-rebuild switch --flake ~/.dotfiles/#nmarks";
# full-update = "sys-update; hm-update";
reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
};
shellInit = "source $HOME/.nix-profile/share/asdf-vm/asdf.fish ";
};
programs.hyfetch = {