alteur/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix and cleanup

Browse source
This commit is contained in:
alsaiduq-lab 2025-03-16 04:58:11 -06:00
parent b4cf61bc23
commit f52aee3469
18 changed files with 45 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

17
home-manager/cobray.nix
View file

@ -30,23 +30,8 @@
findutils
htop
btop
nvtop
nvtopPackages.full
arandr
nitrogen
];
xdg.configFile = {
"user-dirs.dirs".source = lib.mkIf (builtins.pathExists "${config.home.homeDirectory}/.config/user-dirs.dirs")
(config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/user-dirs.dirs");
"user-dirs.locale".source = lib.mkIf (builtins.pathExists "${config.home.homeDirectory}/.config/user-dirs.locale")
(config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/user-dirs.locale");
"mimeapps.list".source = lib.mkIf (builtins.pathExists "${config.home.homeDirectory}/.config/mimeapps.list")
(config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/mimeapps.list");
"systemd".source = lib.mkIf (builtins.pathExists "${config.home.homeDirectory}/.config/systemd")
(config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/systemd");
"systemd".recursive = true;
"environment.d".source = lib.mkIf (builtins.pathExists "${config.home.homeDirectory}/.config/environment.d")
(config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/environment.d");
"environment.d".recursive = true;
};
}

7
home-manager/modules/cava.nix
View file

@ -4,11 +4,4 @@
home.packages = with pkgs; [
cava
];
xdg.configFile = {
"cava" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/cava";
recursive = true;
};
};
}

6
home-manager/modules/dunst.nix
View file

@ -4,10 +4,4 @@
home.packages = with pkgs; [
dunst
];
xdg.configFile = {
"dunst" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/dunst";
recursive = true;
};
};
}

25
home-manager/modules/fish.nix
View file

@ -1,27 +1,6 @@
{ config, pkgs, lib, ... }:
{
xdg.configFile = {
"fish/config.fish".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/fish/config.fish";
"fish/fish_plugins".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/fish/fish_plugins";
"fish/fish_variables".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/fish/fish_variables";
"fish/themes" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/fish/themes";
recursive = true;
};
"fish/functions" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/fish/functions";
recursive = true;
};
"fish/completions" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/fish/completions";
recursive = true;
};
"fish/conf.d" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/fish/conf.d";
recursive = true;
};
};
home.packages = with pkgs; [
starship
fzf
@ -30,4 +9,8 @@
fd
ripgrep
];
programs.fish = {
enable = true;
};
}

9
home-manager/modules/ghostty.nix
View file

@ -1,10 +1,7 @@
{ config, pkgs, lib, ... }:
{
xdg.configFile = {
"ghostty" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/ghostty";
recursive = true;
};
};
home.packages = with pkgs; [
ghostty
];
}

7
home-manager/modules/i3.nix
View file

@ -8,11 +8,4 @@
i3blocks
feh
];
xdg.configFile = {
"i3" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/i3";
recursive = true;
};
};
}

7
home-manager/modules/lazygit.nix
View file

@ -4,11 +4,4 @@
home.packages = with pkgs; [
lazygit
];
xdg.configFile = {
"lazygit" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/lazygit";
recursive = true;
};
};
}

4
home-manager/modules/nvim.nix
View file

@ -1,5 +1,4 @@
{ config, pkgs, lib, ... }:
{
home.packages = with pkgs; [
neovim
@ -13,7 +12,8 @@
source = builtins.fetchGit {
url = "https://github.com/alsaiduq-lab/dotfiles.git";
ref = "dev";
}
rev = "99e2cab828459373bc7524690668fdd209b3f517";
};
recursive = true;
};
}

7
home-manager/modules/picom.nix
View file

@ -4,11 +4,4 @@
home.packages = with pkgs; [
picom
];
xdg.configFile = {
"picom" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/picom";
recursive = true;
};
};
}

7
home-manager/modules/polybar.nix
View file

@ -4,11 +4,4 @@
home.packages = with pkgs; [
polybar
];
xdg.configFile = {
"polybar" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/polybar";
recursive = true;
};
};
}

7
home-manager/modules/rofi.nix
View file

@ -4,11 +4,4 @@
home.packages = with pkgs; [
rofi
];
xdg.configFile = {
"rofi" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/rofi";
recursive = true;
};
};
}

1
home-manager/modules/starship.nix
View file

@ -4,5 +4,4 @@
home.packages = with pkgs; [
starship
];
xdg.configFile."starship.toml".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/starship.toml";
}

27
home-manager/modules/systemd.nix
View file

@ -1,21 +1,16 @@
{ config, lib, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
autossh
];
home.packages = with pkgs; [ autossh ];
systemd.services.autossh-redbot = {
description = "Persistent SSH Tunnel to server";
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
systemd.user.services.autossh-redbot = {
unitConfig = {
Description = "Persistent SSH Tunnel to server";
WantedBy = "default.target";
};
serviceConfig = {
User = "cobray";
Group = "cobray";
Restart = "always";
RestartSec = 30;
EnvironmentFile = "/home/cobray/.secrets/autossh-redbot.conf";
RestartSec = "30";
EnvironmentFile = "/home/cobray/nix/.secrets/autossh-redbot.conf";
Environment = [
"AUTOSSH_GATETIME=0"
"AUTOSSH_POLL=60"
@ -23,13 +18,13 @@
"AUTOSSH_PORT=0"
];
ExecStart = ''
${pkgs.autossh}/bin/autossh -M 0 -N \
/nix/store/abc123-autossh-1.4g/bin/autossh -M 0 -N \
-o "ServerAliveInterval 60" \
-o "ServerAliveCountMax 3" \
-o "ExitOnForwardFailure=yes" \
-o "ConnectTimeout=10" \
-R "0.0.0.0:$REMOTE_PORT:localhost:$LOCAL_PORT" \
root@$REMOTE_HOST
-R "0.0.0.0:2222:localhost:22" \
root@your-real-host.com
'';
};
};

7
home-manager/modules/zellij.nix
View file

@ -4,11 +4,4 @@
home.packages = with pkgs; [
zellij
];
xdg.configFile = {
"zellij" = {
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/zellij";
recursive = true;
};
};
}