Compare commits

..

14 Commits

Author SHA1 Message Date
afbb6b6357 fix: swaync -> swaynotificationcenter 2026-06-14 12:16:46 -04:00
424e66c78f feat: add home-manager + dotfiles via git way (Option 3) 2026-06-14 12:15:48 -04:00
36359de6aa Merge pull request 'feat: add Syncthing firewall port and update compose submodule' (#47) from feat/syncthing-org-sync into master
Reviewed-on: #47
2026-05-19 00:34:42 +00:00
Robert
10b8565fd6 Merge branch 'master' into feat/syncthing-org-sync 2026-05-18 20:33:29 -04:00
Robert
f672696b8e Update submodule for syncthing 2026-05-18 20:31:07 -04:00
0980dca455 fix: update compose submodule to Traefik-routed Syncthing 2026-05-14 21:40:12 -04:00
96bc20ab70 feat: add Syncthing firewall port and update compose submodule 2026-05-14 21:36:26 -04:00
670ae4f002 Merge pull request 'fix: update compose submodule — use ln -sf for iptables-nft' (#46) from fix/vpn-iptables-nft-v3 into master
Reviewed-on: #46
2026-05-13 17:00:16 +00:00
f785abfd49 fix: update compose submodule — use ln -sf for iptables-nft 2026-05-13 12:59:04 -04:00
6f44aa7f76 Merge pull request 'fix: update compose submodule — remove apk add iptables-nft' (#45) from fix/vpn-iptables-nft-v2 into master
Reviewed-on: #45
2026-05-13 16:49:39 +00:00
8d40f1691f fix: update compose submodule — remove apk add iptables-nft 2026-05-13 12:49:14 -04:00
Robert
2dd2e64986 Merge remote-tracking branch 'origin/master' 2026-05-13 12:42:54 -04:00
Robert
23fc5e0597 Give a little more ssh room for tramp 2026-05-13 12:41:09 -04:00
0c9c33d735 Merge pull request 'fix: update wg-easy to official ghcr image with iptables-nft' (#44) from fix/vpn-iptables-nft-upstream into master
Reviewed-on: #44
2026-05-13 16:39:56 +00:00
5 changed files with 112 additions and 4 deletions

View File

@@ -12,10 +12,17 @@
url = "git+https://git.lix.systems/lix-project/lix?ref=main";
inputs.nixpkgs.follows = "nixpkgs";
};
self.submodules = true;
home-manager = {
url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs";
};
dotfiles = {
url = "git+https://code.lazyworkhorse.net/gortium/dotfiles.git";
flake = false;
};
};
outputs = { self, nixpkgs, agenix, lix, ... }@inputs:
outputs = { self, nixpkgs, agenix, lix, home-manager, dotfiles, ... }@inputs:
let
system = "x86_64-linux";
keys = import ./lib/keys.nix;
@@ -56,6 +63,7 @@
agenix.nixosModules.default
./hosts/lazyworkhorse/configuration.nix
./hosts/lazyworkhorse/hardware-configuration.nix
./modules/nixos/home-manager/default.nix
./modules/nixos/filesystem/hoardingcow-mount.nix
./modules/nixos/services/docker_manager.nix
./modules/nixos/services/open_code_server.nix

View File

@@ -207,6 +207,7 @@
ai = {
path = self + "/assets/compose/ai";
envFile = config.age.secrets.containers_env.path;
ports = [ 22000 ]; # Syncthing TCP sync
};
cloudstorage = {
@@ -474,7 +475,7 @@
services.openssh.settings = {
PermitRootLogin = "no";
MaxAuthTries = 3;
MaxSessions = 10;
MaxSessions = 20;
LoginGraceTime = 30;
ClientAliveInterval = 300;
ClientAliveCountMax = 2;

View File

@@ -0,0 +1,12 @@
{ config, pkgs, lib, inputs, ... }:
{
imports = [ inputs.home-manager.nixosModules.home-manager ];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.gortium = import ./dotfiles.nix { inherit config pkgs lib inputs; };
};
}

View File

@@ -0,0 +1,87 @@
{ config, pkgs, lib, inputs, ... }:
{
home = {
username = "gortium";
homeDirectory = "/home/gortium";
stateVersion = "25.11";
};
# Import dotfiles as-is via home.file (Option 3 — git way)
# Hyprland
home.file.".config/hypr/hyprland.conf".source =
"${inputs.dotfiles}/hypr/.config/hypr/hyprland.conf";
home.file.".config/hypr/mocha.conf".source =
"${inputs.dotfiles}/hypr/.config/hypr/mocha.conf";
home.file.".config/hypr/hyprlock.conf".source =
"${inputs.dotfiles}/hypr/.config/hypr/hyprlock.conf";
home.file.".config/hypr/hypridle.conf".source =
"${inputs.dotfiles}/hypr/.config/hypr/hypridle.conf";
home.file.".config/hypr/hyprpaper.conf".source =
"${inputs.dotfiles}/hypr/.config/hypr/hyprpaper.conf";
home.file.".config/hypr/hyprshade.toml".source =
"${inputs.dotfiles}/hypr/.config/hypr/hyprshade.toml";
# Host-specific overrides: sourced from hyprland.conf
# hyprland.conf includes: source = ~/.config/hypr/hosts/$HOST.conf
# This file is created per-host and contains only the diffs.
home.file.".config/hypr/hosts" = {
source = "${inputs.dotfiles}/hypr/.config/hypr/hosts";
recursive = true;
};
# Zsh
home.file.".zshrc".source = "${inputs.dotfiles}/zsh/.zshrc";
# Tmux
home.file.".tmux.conf".source = "${inputs.dotfiles}/tmux/.tmux.conf";
# Neovim
home.file.".config/nvim" = {
source = "${inputs.dotfiles}/nvim/.config/nvim";
recursive = true;
};
# Wallpapers
home.file.".config/wallpapers" = {
source = "${inputs.dotfiles}/wallpapers/.config/wallpapers";
recursive = true;
};
# Wofi
home.file.".config/wofi" = {
source = "${inputs.dotfiles}/wofi/.config/wofi";
recursive = true;
};
# Packages that should be installed with home-manager
home.packages = with pkgs; [
# CLI tools
ripgrep
fd
jq
fzf
bat
eza
zoxide
# Development
git
lazygit
gh
# Hyprland extras
hyprshot
swaynotificationcenter
swww
wofi
waybar
kitty
foot
brightnessctl
playerctl
udiskie
hyprshade
pyprland
];
}