Compare commits
No commits in common. "594863ab7d7e17f59e95fcbe08dfdc14ab792d32" and "c98426be4213fc76407257c95907174d6e4e8364" have entirely different histories.
594863ab7d
...
c98426be42
674
flake.lock
674
flake.lock
File diff suppressed because it is too large
Load diff
|
@ -84,7 +84,6 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
|
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
|
||||||
catppuccin.url = "github:catppuccin/nix";
|
|
||||||
|
|
||||||
################
|
################
|
||||||
## inputs for dev shells
|
## inputs for dev shells
|
||||||
|
@ -126,17 +125,10 @@
|
||||||
hyprpanel.overlay
|
hyprpanel.overlay
|
||||||
];
|
];
|
||||||
|
|
||||||
homes.modules = with inputs; [
|
|
||||||
sops-nix.homeManagerModules.sops
|
|
||||||
catppuccin.homeManagerModules.catppuccin
|
|
||||||
];
|
|
||||||
|
|
||||||
systems.modules.nixos = with inputs; [
|
systems.modules.nixos = with inputs; [
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
nix-ld.nixosModules.nix-ld
|
nix-ld.nixosModules.nix-ld
|
||||||
sops-nix.nixosModules.sops
|
sops-nix.nixosModules.sops
|
||||||
|
|
||||||
catppuccin.nixosModules.catppuccin
|
|
||||||
];
|
];
|
||||||
|
|
||||||
systems.hosts.nixberry.modules = with inputs; [
|
systems.hosts.nixberry.modules = with inputs; [
|
||||||
|
|
|
@ -40,7 +40,7 @@ in
|
||||||
|
|
||||||
programs.kitty = {
|
programs.kitty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# themeFile = "tokyo_night_night";
|
themeFile = "tokyo_night_night";
|
||||||
font = {
|
font = {
|
||||||
name = "Code New Roman";
|
name = "Code New Roman";
|
||||||
size = 15;
|
size = 15;
|
||||||
|
|
|
@ -46,6 +46,7 @@ in
|
||||||
package = helix-pkg;
|
package = helix-pkg;
|
||||||
defaultEditor = true;
|
defaultEditor = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
theme = "tokyonight";
|
||||||
editor = {
|
editor = {
|
||||||
auto-format = true;
|
auto-format = true;
|
||||||
line-number = "relative";
|
line-number = "relative";
|
||||||
|
|
|
@ -610,9 +610,5 @@ in
|
||||||
text = builtins.toJSON settings;
|
text = builtins.toJSON settings;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs.nerd-fonts; [
|
|
||||||
jetbrains-mono
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,15 +17,11 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
catppuccin.flavor = "mocha";
|
|
||||||
catppuccin.enable = true;
|
|
||||||
|
|
||||||
${namespace}.home.extraOptions = {
|
${namespace}.home.extraOptions = {
|
||||||
catppuccin.flavor = "mocha";
|
dconf.settings = {
|
||||||
catppuccin.enable = true;
|
"org/gnome/desktop/interface" = {
|
||||||
|
color-scheme = "prefer-dark";
|
||||||
dconf = {
|
};
|
||||||
settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
gtk = {
|
gtk = {
|
||||||
|
@ -44,5 +40,6 @@ in
|
||||||
platformTheme = "gnome";
|
platformTheme = "gnome";
|
||||||
style = "adwaita-dark";
|
style = "adwaita-dark";
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,11 +28,15 @@ in
|
||||||
fonts.packages =
|
fonts.packages =
|
||||||
with pkgs;
|
with pkgs;
|
||||||
[
|
[
|
||||||
|
(nerdfonts.override {
|
||||||
|
fonts = [
|
||||||
|
"CodeNewRoman"
|
||||||
|
"NerdFontsSymbolsOnly"
|
||||||
|
];
|
||||||
|
})
|
||||||
font-awesome
|
font-awesome
|
||||||
powerline-fonts
|
powerline-fonts
|
||||||
powerline-symbols
|
powerline-symbols
|
||||||
nerd-fonts.code-new-roman
|
|
||||||
nerd-fonts.symbols-only
|
|
||||||
]
|
]
|
||||||
++ cfg.fonts;
|
++ cfg.fonts;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
namespace,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
inherit (lib) mkIf mkEnableOption;
|
|
||||||
|
|
||||||
cfg = config.${namespace}.tools.devenv;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options.${namespace}.tools.devenv = {
|
|
||||||
enable = mkEnableOption "Whether or not to enable direnv.";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.devenv
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -8,8 +8,6 @@ forgejo:
|
||||||
mail:
|
mail:
|
||||||
password: ENC[AES256_GCM,data:XgQZM0MBUEELyhH7UvyyMEiUABs=,iv:m3Wzs2SAPQ2w6UC02lpTvwd83Dt0LEzqdIj65HeOrbU=,tag:3cr5dnjeyoJ4ze9RFd9K5g==,type:str]
|
password: ENC[AES256_GCM,data:XgQZM0MBUEELyhH7UvyyMEiUABs=,iv:m3Wzs2SAPQ2w6UC02lpTvwd83Dt0LEzqdIj65HeOrbU=,tag:3cr5dnjeyoJ4ze9RFd9K5g==,type:str]
|
||||||
passwordHash: ENC[AES256_GCM,data:hHGJBUEtCi/gErZ5vm0gsEFqyIDNkED4scR4NAOSzbiiZAYTMg++yqf3hfjjwWV3wTPswNpzzw+gYKEH,iv:wDM5IOOamopFpMEkUit4y7LBZi8CJff3+Tc08lK4IXI=,tag:FaaaohtA+vBFwjDugoemQw==,type:str]
|
passwordHash: ENC[AES256_GCM,data:hHGJBUEtCi/gErZ5vm0gsEFqyIDNkED4scR4NAOSzbiiZAYTMg++yqf3hfjjwWV3wTPswNpzzw+gYKEH,iv:wDM5IOOamopFpMEkUit4y7LBZi8CJff3+Tc08lK4IXI=,tag:FaaaohtA+vBFwjDugoemQw==,type:str]
|
||||||
runner:
|
|
||||||
token: ENC[AES256_GCM,data:+k8qoQl3RTu1psulBKwQzvljsP0t2t/NvhXjsSgVD/lR2TQ/T5JMRA==,iv:buKtUUPTGqnfezHYEOnbgsdBMQiY3GA3Tg/VParjBwI=,tag:Z8GtHRye3vBZxlpetWik6Q==,type:str]
|
|
||||||
netcup:
|
netcup:
|
||||||
customer_number: ENC[AES256_GCM,data:9+QboNg1,iv:Tg9ylJUM8L/kzqFmk2uIsD9noqnp5wIxr5GVXMsZwB8=,tag:2qRggSIkPHuCQYDWCfka5Q==,type:str]
|
customer_number: ENC[AES256_GCM,data:9+QboNg1,iv:Tg9ylJUM8L/kzqFmk2uIsD9noqnp5wIxr5GVXMsZwB8=,tag:2qRggSIkPHuCQYDWCfka5Q==,type:str]
|
||||||
api:
|
api:
|
||||||
|
@ -39,8 +37,8 @@ sops:
|
||||||
UllqSDR1YWl6aU1jSnY2WE9oczg5Q28KfN15tFxXHrJmOHySK+cyLi2bFqArg244
|
UllqSDR1YWl6aU1jSnY2WE9oczg5Q28KfN15tFxXHrJmOHySK+cyLi2bFqArg244
|
||||||
bNTYyuBUtBW1Y/EuNpbyLjSNQpKZWFz7grE64uxrNQHP865N3wv0gg==
|
bNTYyuBUtBW1Y/EuNpbyLjSNQpKZWFz7grE64uxrNQHP865N3wv0gg==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2024-12-28T06:45:43Z"
|
lastmodified: "2024-12-03T13:46:57Z"
|
||||||
mac: ENC[AES256_GCM,data:lCnyuIftA7P8MXVLUm6+bXyi0dsv6W5587Veni857TXrWbTqJBkNpkY13PFdK+WH3wUptDp87NTzREkei4A2yFaUYddUpzhTSSh0HwRvOCKLPk45E5lUjJ9mYHBEXG1ZNUptcoeJIai8FOuQGA0pXrlXHsBEC164ECI6NfiCBzU=,iv:dNs6QD4agMhX0gE/4QK8W2/3f14ppaTP7Ce19TDJ4DQ=,tag:DhisJ9f56Ipb/XCLR7CAFg==,type:str]
|
mac: ENC[AES256_GCM,data:5o/0aL6x4Kc+IwKL4sIZ4gyG4IXZqvL6TqZFnp3GNGjazRyUKvEbTbKTj96C7W1ci+JUv73mO/0IGjPxY/Bbsv06clKxSX40XbSvWVxSOfQp1qfiQaDxswcF+7yw5vA6wsOfZnYCWeyzJHuBD8OvTE+xXE8bNil5q2ZY5OXX7nk=,iv:aR7um7d9fjJxetxj8a0LrK9zs8tAWiSvKMenYBCMWpc=,tag:Zvj+ZiM5uV5HFVwu6ZAd2A==,type:str]
|
||||||
pgp: []
|
pgp: []
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.9.2
|
version: 3.9.1
|
||||||
|
|
|
@ -32,9 +32,6 @@ in
|
||||||
"forgejo/mail/passwordHash" = {
|
"forgejo/mail/passwordHash" = {
|
||||||
inherit sopsFile;
|
inherit sopsFile;
|
||||||
};
|
};
|
||||||
"forgejo/runner/token" = {
|
|
||||||
inherit sopsFile;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -121,24 +118,6 @@ in
|
||||||
certificateScheme = "acme-nginx";
|
certificateScheme = "acme-nginx";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.gitea-actions-runner = {
|
|
||||||
package = pkgs.forgejo-actions-runner;
|
|
||||||
instances.default = {
|
|
||||||
enable = true;
|
|
||||||
name = "monolith";
|
|
||||||
url = "https://git.${domainName}.com";
|
|
||||||
tokenFile = config.sops.secrets."forgejo/runner/token".path;
|
|
||||||
labels = [
|
|
||||||
"ubuntu-latest:docker://node:16-bullseye"
|
|
||||||
"ubuntu-22.04:docker://node:16-bullseye"
|
|
||||||
"ubuntu-20.04:docker://node:16-bullseye"
|
|
||||||
"ubuntu-18.04:docker://node:16-buster"
|
|
||||||
## optionally provide native execution on the host:
|
|
||||||
# "native:host"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [
|
networking.firewall.allowedTCPPorts = [
|
||||||
forgejoPort
|
forgejoPort
|
||||||
80
|
80
|
||||||
|
|
|
@ -17,7 +17,7 @@ in
|
||||||
zed-editor
|
zed-editor
|
||||||
|
|
||||||
# eve
|
# eve
|
||||||
# bottles
|
bottles
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -110,8 +110,6 @@ in
|
||||||
factorio-server = disabled;
|
factorio-server = disabled;
|
||||||
};
|
};
|
||||||
|
|
||||||
tools.devenv = enabled;
|
|
||||||
|
|
||||||
system = {
|
system = {
|
||||||
hardware = {
|
hardware = {
|
||||||
bluetooth = enabled;
|
bluetooth = enabled;
|
||||||
|
|
Loading…
Reference in a new issue