format
This commit is contained in:
parent
d1ab22a870
commit
1d7bb49bfe
15 changed files with 71 additions and 73 deletions
|
|
@ -8,7 +8,7 @@
|
|||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
security.pam.enableSudoTouchIdAuth = true;
|
||||
programs.zsh.shellInit = ''
|
||||
eval $(/opt/homebrew/bin/brew shellenv)'
|
||||
eval $(/opt/homebrew/bin/brew shellenv)'
|
||||
'';
|
||||
environment.systemPath = [ "/opt/homebrew/bin" "/opt/homebrew/sbin" ];
|
||||
#nix.settings.auto-optimise-store = true;
|
||||
|
|
@ -22,8 +22,7 @@
|
|||
hostName = "ds9";
|
||||
sshKey = "/Users/xyno/.ssh/id_ed25519";
|
||||
publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUorQkJYdWZYQUpoeVVIVmZocWxrOFk0ekVLSmJLWGdKUXZzZEU0ODJscFYgcm9vdEBpc28K";
|
||||
}
|
||||
];
|
||||
}];
|
||||
nix.extraOptions = ''
|
||||
builders-use-substitutes = true
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -131,9 +131,7 @@
|
|||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
}
|
||||
|
||||
])
|
||||
}])
|
||||
./nixos-common.nix
|
||||
] ++ extraModules;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
imports = [
|
||||
"${inputs.impermanence}/home-manager.nix"
|
||||
];
|
||||
home.file = {
|
||||
# Home nix config.
|
||||
".config/nixpkgs/config.nix".text = "{ allowUnfree = true; }";
|
||||
".local/share/pandoc/templates/default.latex".source = "${inputs.pandoc-latex-template}/eisvogel.tex";
|
||||
home.file = {
|
||||
# Home nix config.
|
||||
".config/nixpkgs/config.nix".text = "{ allowUnfree = true; }";
|
||||
".local/share/pandoc/templates/default.latex".source = "${inputs.pandoc-latex-template}/eisvogel.tex";
|
||||
|
||||
# empty zshrc to stop zsh-newuser-install from running
|
||||
".zshrc".text = "";
|
||||
# empty zshrc to stop zsh-newuser-install from running
|
||||
".zshrc".text = "";
|
||||
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -228,9 +228,9 @@ in
|
|||
"hediet.vscode-drawio.resizeImages" = "null";
|
||||
|
||||
};
|
||||
keybindings = [
|
||||
{ "key" = "ctrl+w"; "command" = "whichkey.show"; }
|
||||
];
|
||||
keybindings = [
|
||||
{ "key" = "ctrl+w"; "command" = "whichkey.show"; }
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ let
|
|||
];
|
||||
};
|
||||
|
||||
aliasesJson = pkgs.writeText "shell-aliases.json" (builtins.toJSON config.home.shellAliases);
|
||||
aliasesJson = pkgs.writeText "shell-aliases.json" (builtins.toJSON config.home.shellAliases);
|
||||
in
|
||||
{
|
||||
options.ragon.xonsh.enable = lib.mkOption { default = false; };
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ with lib.my;
|
|||
"android-platform-tools"
|
||||
"raycast"
|
||||
"ukelele"
|
||||
# "homebrew/cask-drivers/zsa-wally"
|
||||
# "homebrew/cask-drivers/zsa-wally"
|
||||
"thunderbird"
|
||||
"openlens"
|
||||
"ferdium"
|
||||
|
|
|
|||
|
|
@ -112,7 +112,8 @@ in
|
|||
};
|
||||
|
||||
systemd.services.caddy.serviceConfig.EnvironmentFile = config.age.secrets.ionos.path;
|
||||
services.caddy = { # ragon.services.caddy is enabled
|
||||
services.caddy = {
|
||||
# ragon.services.caddy is enabled
|
||||
globalConfig = ''
|
||||
acme_dns ionos {
|
||||
api_token "{$IONOS_API_KEY}"
|
||||
|
|
@ -145,19 +146,19 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
home-manager.users.ragon = { pkgs, lib, inputs, config, ...}: {
|
||||
imports = [
|
||||
../../hm-modules/nvim
|
||||
../../hm-modules/zsh
|
||||
../../hm-modules/tmux
|
||||
../../hm-modules/xonsh
|
||||
../../hm-modules/cli.nix
|
||||
../../hm-modules/files.nix
|
||||
];
|
||||
ragon.xonsh.enable = true;
|
||||
home-manager.users.ragon = { pkgs, lib, inputs, config, ... }: {
|
||||
imports = [
|
||||
../../hm-modules/nvim
|
||||
../../hm-modules/zsh
|
||||
../../hm-modules/tmux
|
||||
../../hm-modules/xonsh
|
||||
../../hm-modules/cli.nix
|
||||
../../hm-modules/files.nix
|
||||
];
|
||||
ragon.xonsh.enable = true;
|
||||
|
||||
programs.home-manager.enable = true;
|
||||
home.stateVersion = "23.11";
|
||||
programs.home-manager.enable = true;
|
||||
home.stateVersion = "23.11";
|
||||
};
|
||||
|
||||
ragon = {
|
||||
|
|
|
|||
|
|
@ -41,26 +41,26 @@
|
|||
'';
|
||||
|
||||
ragon.services = {
|
||||
samba.enable = true;
|
||||
samba.shares = {
|
||||
TimeMachine = {
|
||||
path = "/backups/DaedalusTimeMachine";
|
||||
comment = "DaedalusTimeMachine";
|
||||
"write list" = "@wheel";
|
||||
"read only" = "no";
|
||||
"writable" = "yes";
|
||||
"browseable" = "yes";
|
||||
"fruit:time machine" = "yes";
|
||||
"fruit:time machine max size" = "2050G";
|
||||
"vfs objects" = "acl_xattr fruit streams_xattr";
|
||||
"inherit acls" = "yes";
|
||||
};
|
||||
data = {
|
||||
path = "/data";
|
||||
comment = "some data for the people";
|
||||
"write list" = "@wheel";
|
||||
};
|
||||
samba.enable = true;
|
||||
samba.shares = {
|
||||
TimeMachine = {
|
||||
path = "/backups/DaedalusTimeMachine";
|
||||
comment = "DaedalusTimeMachine";
|
||||
"write list" = "@wheel";
|
||||
"read only" = "no";
|
||||
"writable" = "yes";
|
||||
"browseable" = "yes";
|
||||
"fruit:time machine" = "yes";
|
||||
"fruit:time machine max size" = "2050G";
|
||||
"vfs objects" = "acl_xattr fruit streams_xattr";
|
||||
"inherit acls" = "yes";
|
||||
};
|
||||
data = {
|
||||
path = "/data";
|
||||
comment = "some data for the people";
|
||||
"write list" = "@wheel";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -244,19 +244,19 @@
|
|||
services.lolpizza2.enable = true;
|
||||
programs.mosh.enable = true;
|
||||
|
||||
home-manager.users.ragon = { pkgs, lib, inputs, config, ...}: {
|
||||
imports = [
|
||||
../../hm-modules/nvim
|
||||
../../hm-modules/zsh
|
||||
../../hm-modules/tmux
|
||||
../../hm-modules/xonsh
|
||||
../../hm-modules/cli.nix
|
||||
../../hm-modules/files.nix
|
||||
];
|
||||
ragon.xonsh.enable = true;
|
||||
home-manager.users.ragon = { pkgs, lib, inputs, config, ... }: {
|
||||
imports = [
|
||||
../../hm-modules/nvim
|
||||
../../hm-modules/zsh
|
||||
../../hm-modules/tmux
|
||||
../../hm-modules/xonsh
|
||||
../../hm-modules/cli.nix
|
||||
../../hm-modules/files.nix
|
||||
];
|
||||
ragon.xonsh.enable = true;
|
||||
|
||||
programs.home-manager.enable = true;
|
||||
home.stateVersion = "23.11";
|
||||
programs.home-manager.enable = true;
|
||||
home.stateVersion = "23.11";
|
||||
};
|
||||
|
||||
ragon = {
|
||||
|
|
|
|||
|
|
@ -15,4 +15,4 @@ let
|
|||
in
|
||||
mylib.extend
|
||||
(self: super:
|
||||
foldr (a: b: a // b) { } (attrValues super))
|
||||
foldr (a: b: a // b) { } (attrValues super))
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ config, pkgs, lib, ...}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
cfg = config.ragon.services.caddy;
|
||||
in
|
||||
{
|
||||
in
|
||||
{
|
||||
options.ragon.services.caddy.enable = lib.mkEnableOption "enables the caddy webserver";
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.caddy = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, ...}:
|
||||
{ stdenv, ... }:
|
||||
stdenv.mkDerivation {
|
||||
name = "scripts";
|
||||
src = ./scripts;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue