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" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
security.pam.enableSudoTouchIdAuth = true;
|
security.pam.enableSudoTouchIdAuth = true;
|
||||||
programs.zsh.shellInit = ''
|
programs.zsh.shellInit = ''
|
||||||
eval $(/opt/homebrew/bin/brew shellenv)'
|
eval $(/opt/homebrew/bin/brew shellenv)'
|
||||||
'';
|
'';
|
||||||
environment.systemPath = [ "/opt/homebrew/bin" "/opt/homebrew/sbin" ];
|
environment.systemPath = [ "/opt/homebrew/bin" "/opt/homebrew/sbin" ];
|
||||||
#nix.settings.auto-optimise-store = true;
|
#nix.settings.auto-optimise-store = true;
|
||||||
|
|
@ -22,8 +22,7 @@
|
||||||
hostName = "ds9";
|
hostName = "ds9";
|
||||||
sshKey = "/Users/xyno/.ssh/id_ed25519";
|
sshKey = "/Users/xyno/.ssh/id_ed25519";
|
||||||
publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUorQkJYdWZYQUpoeVVIVmZocWxrOFk0ekVLSmJLWGdKUXZzZEU0ODJscFYgcm9vdEBpc28K";
|
publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUorQkJYdWZYQUpoeVVIVmZocWxrOFk0ekVLSmJLWGdKUXZzZEU0ODJscFYgcm9vdEBpc28K";
|
||||||
}
|
}];
|
||||||
];
|
|
||||||
nix.extraOptions = ''
|
nix.extraOptions = ''
|
||||||
builders-use-substitutes = true
|
builders-use-substitutes = true
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
|
|
@ -131,9 +131,7 @@
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||||
}
|
}])
|
||||||
|
|
||||||
])
|
|
||||||
./nixos-common.nix
|
./nixos-common.nix
|
||||||
] ++ extraModules;
|
] ++ extraModules;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -3,13 +3,13 @@
|
||||||
imports = [
|
imports = [
|
||||||
"${inputs.impermanence}/home-manager.nix"
|
"${inputs.impermanence}/home-manager.nix"
|
||||||
];
|
];
|
||||||
home.file = {
|
home.file = {
|
||||||
# Home nix config.
|
# Home nix config.
|
||||||
".config/nixpkgs/config.nix".text = "{ allowUnfree = true; }";
|
".config/nixpkgs/config.nix".text = "{ allowUnfree = true; }";
|
||||||
".local/share/pandoc/templates/default.latex".source = "${inputs.pandoc-latex-template}/eisvogel.tex";
|
".local/share/pandoc/templates/default.latex".source = "${inputs.pandoc-latex-template}/eisvogel.tex";
|
||||||
|
|
||||||
# empty zshrc to stop zsh-newuser-install from running
|
# empty zshrc to stop zsh-newuser-install from running
|
||||||
".zshrc".text = "";
|
".zshrc".text = "";
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ in
|
||||||
jdinhlife.gruvbox # theme
|
jdinhlife.gruvbox # theme
|
||||||
mkhl.direnv # direnv
|
mkhl.direnv # direnv
|
||||||
|
|
||||||
|
|
||||||
marketplace.eamodio.gitlens
|
marketplace.eamodio.gitlens
|
||||||
marketplace.ms-vscode-remote.remote-containers
|
marketplace.ms-vscode-remote.remote-containers
|
||||||
|
|
||||||
|
|
@ -228,9 +228,9 @@ in
|
||||||
"hediet.vscode-drawio.resizeImages" = "null";
|
"hediet.vscode-drawio.resizeImages" = "null";
|
||||||
|
|
||||||
};
|
};
|
||||||
keybindings = [
|
keybindings = [
|
||||||
{ "key" = "ctrl+w"; "command" = "whichkey.show"; }
|
{ "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
|
in
|
||||||
{
|
{
|
||||||
options.ragon.xonsh.enable = lib.mkOption { default = false; };
|
options.ragon.xonsh.enable = lib.mkOption { default = false; };
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ with lib.my;
|
||||||
"android-platform-tools"
|
"android-platform-tools"
|
||||||
"raycast"
|
"raycast"
|
||||||
"ukelele"
|
"ukelele"
|
||||||
# "homebrew/cask-drivers/zsa-wally"
|
# "homebrew/cask-drivers/zsa-wally"
|
||||||
"thunderbird"
|
"thunderbird"
|
||||||
"openlens"
|
"openlens"
|
||||||
"ferdium"
|
"ferdium"
|
||||||
|
|
|
||||||
|
|
@ -39,4 +39,4 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,8 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.caddy.serviceConfig.EnvironmentFile = config.age.secrets.ionos.path;
|
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 = ''
|
globalConfig = ''
|
||||||
acme_dns ionos {
|
acme_dns ionos {
|
||||||
api_token "{$IONOS_API_KEY}"
|
api_token "{$IONOS_API_KEY}"
|
||||||
|
|
@ -145,19 +146,19 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.ragon = { pkgs, lib, inputs, config, ...}: {
|
home-manager.users.ragon = { pkgs, lib, inputs, config, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
../../hm-modules/nvim
|
../../hm-modules/nvim
|
||||||
../../hm-modules/zsh
|
../../hm-modules/zsh
|
||||||
../../hm-modules/tmux
|
../../hm-modules/tmux
|
||||||
../../hm-modules/xonsh
|
../../hm-modules/xonsh
|
||||||
../../hm-modules/cli.nix
|
../../hm-modules/cli.nix
|
||||||
../../hm-modules/files.nix
|
../../hm-modules/files.nix
|
||||||
];
|
];
|
||||||
ragon.xonsh.enable = true;
|
ragon.xonsh.enable = true;
|
||||||
|
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
home.stateVersion = "23.11";
|
home.stateVersion = "23.11";
|
||||||
};
|
};
|
||||||
|
|
||||||
ragon = {
|
ragon = {
|
||||||
|
|
|
||||||
|
|
@ -6,4 +6,4 @@
|
||||||
user = "ragon";
|
user = "ragon";
|
||||||
group = "users";
|
group = "users";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -41,26 +41,26 @@
|
||||||
'';
|
'';
|
||||||
|
|
||||||
ragon.services = {
|
ragon.services = {
|
||||||
samba.enable = true;
|
samba.enable = true;
|
||||||
samba.shares = {
|
samba.shares = {
|
||||||
TimeMachine = {
|
TimeMachine = {
|
||||||
path = "/backups/DaedalusTimeMachine";
|
path = "/backups/DaedalusTimeMachine";
|
||||||
comment = "DaedalusTimeMachine";
|
comment = "DaedalusTimeMachine";
|
||||||
"write list" = "@wheel";
|
"write list" = "@wheel";
|
||||||
"read only" = "no";
|
"read only" = "no";
|
||||||
"writable" = "yes";
|
"writable" = "yes";
|
||||||
"browseable" = "yes";
|
"browseable" = "yes";
|
||||||
"fruit:time machine" = "yes";
|
"fruit:time machine" = "yes";
|
||||||
"fruit:time machine max size" = "2050G";
|
"fruit:time machine max size" = "2050G";
|
||||||
"vfs objects" = "acl_xattr fruit streams_xattr";
|
"vfs objects" = "acl_xattr fruit streams_xattr";
|
||||||
"inherit acls" = "yes";
|
"inherit acls" = "yes";
|
||||||
};
|
|
||||||
data = {
|
|
||||||
path = "/data";
|
|
||||||
comment = "some data for the people";
|
|
||||||
"write list" = "@wheel";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
data = {
|
||||||
|
path = "/data";
|
||||||
|
comment = "some data for the people";
|
||||||
|
"write list" = "@wheel";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -244,19 +244,19 @@
|
||||||
services.lolpizza2.enable = true;
|
services.lolpizza2.enable = true;
|
||||||
programs.mosh.enable = true;
|
programs.mosh.enable = true;
|
||||||
|
|
||||||
home-manager.users.ragon = { pkgs, lib, inputs, config, ...}: {
|
home-manager.users.ragon = { pkgs, lib, inputs, config, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
../../hm-modules/nvim
|
../../hm-modules/nvim
|
||||||
../../hm-modules/zsh
|
../../hm-modules/zsh
|
||||||
../../hm-modules/tmux
|
../../hm-modules/tmux
|
||||||
../../hm-modules/xonsh
|
../../hm-modules/xonsh
|
||||||
../../hm-modules/cli.nix
|
../../hm-modules/cli.nix
|
||||||
../../hm-modules/files.nix
|
../../hm-modules/files.nix
|
||||||
];
|
];
|
||||||
ragon.xonsh.enable = true;
|
ragon.xonsh.enable = true;
|
||||||
|
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
home.stateVersion = "23.11";
|
home.stateVersion = "23.11";
|
||||||
};
|
};
|
||||||
|
|
||||||
ragon = {
|
ragon = {
|
||||||
|
|
|
||||||
|
|
@ -15,4 +15,4 @@ let
|
||||||
in
|
in
|
||||||
mylib.extend
|
mylib.extend
|
||||||
(self: super:
|
(self: super:
|
||||||
foldr (a: b: a // b) { } (attrValues super))
|
foldr (a: b: a // b) { } (attrValues super))
|
||||||
|
|
|
||||||
|
|
@ -45,4 +45,4 @@ caddy.override {
|
||||||
ldflags = [ "-s" "-w" ]; ## don't include version info twice
|
ldflags = [ "-s" "-w" ]; ## don't include version info twice
|
||||||
vendorHash = null;
|
vendorHash = null;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
{ config, pkgs, lib, ...}:
|
{ config, pkgs, lib, ... }:
|
||||||
let
|
let
|
||||||
cfg = config.ragon.services.caddy;
|
cfg = config.ragon.services.caddy;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.ragon.services.caddy.enable = lib.mkEnableOption "enables the caddy webserver";
|
options.ragon.services.caddy.enable = lib.mkEnableOption "enables the caddy webserver";
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
services.caddy = {
|
services.caddy = {
|
||||||
|
|
@ -11,4 +11,4 @@ let
|
||||||
};
|
};
|
||||||
ragon.persist.extraDirectories = [ config.services.caddy.dataDir ];
|
ragon.persist.extraDirectories = [ config.services.caddy.dataDir ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, ...}:
|
{ stdenv, ... }:
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "scripts";
|
name = "scripts";
|
||||||
src = ./scripts;
|
src = ./scripts;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue