pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Rewrite to simplify some home-manager setup

Browse source 
Remove work.nix variants of expressions
Better use of defaults across all machines

Set TERM env to xterm-256color for ssh connections by default
This commit is contained in:
Evie Litherland-Smith 2023-08-07 10:00:57 +01:00
parent efa0909c15
commit 23f74093d8
12 changed files with 172 additions and 190 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
home/default.nix
View file

@ -1,10 +1,22 @@
{ config, lib, pkgs, ... }:
{ pkgs, wallpapers, ... }:
{
imports = [
./git
./ssh
./tui
./hyprland
./alacritty
./firefox
./zathura
./emacs/server.nix
];
home.packages = with pkgs; [
bitwarden
signal-desktop
libreoffice
zotero
];
programs.home-manager.enable = true;
xdg.configFile."wallpaper.jpg".source = wallpapers.outputs.default;
}

105
home/firefox/work.nix
View file

@ -1,105 +0,0 @@
{ ... }:
{
imports = [ ./default.nix ];
programs.firefox.profiles.default = {
settings."browser.startup.homepage" = "https://nucleus.ukaea.uk";
bookmarks = [{
name = "toolbar";
toolbar = true;
bookmarks = [
{
name = "Gitea";
tags = [ "git" "source" "xenia" ];
url = "https://git.xenia.me.uk";
}
{
name = "GitHub";
tags = [ "git" "source" ];
url = "https://github.com";
}
{
name = "GitLab";
tags = [ "git" "source" ];
url = "https://gitlab.com";
}
{
name = "UKAEA GitLab";
tags = [ "git" "source" ];
url = "https://git.ccfe.ac.uk";
}
{
name = "Nucleus";
url = "https://nucleus.ukaea.uk";
}
{
name = "U4BW";
tags = [ "admin" ];
url = "https://ubw.unit4cloud.com/uk_aea_prod_web";
}
{
name = "JET homepage";
tags = [ "JET" ];
url = "w3.jet.uk";
}
{
name = "Physics Summary";
tags = [ "JET" "operations" ];
url =
"https://users.euro-fusion.org/pages/physics-summary/LatestSession.php";
}
{
name = "JSPO";
tags = [ "JET" "operations" ];
url = "https://www.jspo.jet.uk/";
}
{
name = "OpenWikis";
bookmarks = [
{
name = "Home page";
tags = [ "JET" "operations" "wiki" ];
url = "https://wiki.jetdata.eu/open/index.php?title=Main_Page";
}
{
name = "Spectroscopy Group";
tags = [ "JET" "operations" "wiki" ];
url =
"https://wiki.jetdata.eu/open/index.php?title=Spectroscopy_Group:index";
}
{
name = "KS5";
tags = [ "JET" "operations" "wiki" ];
url = "https://wiki.jetdata.eu/open/index.php?title=CXS:Topic3";
}
{
name = "KT3";
tags = [ "JET" "operations" "wiki" ];
url = "https://wiki.jetdata.eu/open/index.php?title=KT3_Journals";
}
];
}
{
name = "JET Mimics";
bookmarks = [
{
name = "Countdown";
tags = [ "JET" "operations" "mimics" ];
url = "http://webmimic.jet.uk/mc/codas/countdown";
}
{
name = "KS5";
tags = [ "JET" "operations" "mimics" ];
url = "http://webmimic.jet.uk/DG/codas/ks5.mim.html";
}
{
name = "KT3";
tags = [ "JET" "operations" "mimics" ];
url = "http://webmimic.jet.uk/DG/codas/kt3.mim.html";
}
];
}
];
}];
};
}

5
home/git/default.nix
View file

@ -1,9 +1,10 @@
{tokyonight, ...}: {
{ lib, tokyonight, ... }: {
xdg.configFile."git/tokyonight_night.gitconfig".source = "${tokyonight}/extras/delta/tokyonight_night.gitconfig";
programs.git = {
enable = true;
userName = "Evie Litherland-Smith";
includes = [{path = "tokyonight_night.gitconfig";}];
userEmail = lib.mkDefault "evie@xenia.me.uk";
includes = [{ path = "tokyonight_night.gitconfig"; }];
delta = {
enable = true;
options = {

4
home/git/personal.nix
View file

@ -1,4 +0,0 @@
{...}: {
imports = [./default.nix];
programs.git.userEmail = "evie@xenia.me.uk";
}

4
home/git/work.nix
View file

@ -1,4 +0,0 @@
{...}: {
imports = [./default.nix];
programs.git.userEmail = "evie.litherland-smith@ukaea.uk";
}

24
home/ssh/default.nix
View file

@ -1,4 +1,5 @@
{...}: {
{ pkgs, lib, ... }: {
home.packages = with pkgs; [ sshfs ];
programs.ssh = {
enable = true;
forwardAgent = true;
@ -6,9 +7,28 @@
serverAliveCountMax = 3;
controlMaster = "auto";
controlPersist = "10s";
matchBlocks."git*".user = "git";
extraConfig = ''
AddKeysToAgent=yes
SetEnv TERM=xterm-256color
'';
matchBlocks = {
"vanguard" = {
user = "xenia";
hostname = "192.168.1.166";
};
"legion" = {
user = "xenia";
hostname = "192.168.1.230";
};
"ionos" = {
user = "root";
hostname = "77.68.67.133";
};
"git.xenia.me.uk" = lib.hm.dag.entryBefore [ "git*" ] {
user = "gitea";
port = 2222;
};
"git*".user = "git";
};
};
}

21
home/ssh/personal.nix
View file

@ -1,21 +0,0 @@
{lib, ...}: {
imports = [./default.nix];
programs.ssh.matchBlocks = {
"vanguard" = {
user = "xenia";
hostname = "192.168.1.166";
};
"legion" = {
user = "xenia";
hostname = "192.168.1.230";
};
"ionos" = {
user = "root";
hostname = "77.68.67.133";
};
"git.xenia.me.uk" = lib.hm.dag.entryBefore ["git*"] {
user = "gitea";
port = 2222;
};
};
}

31
home/ssh/work.nix
View file

@ -1,31 +0,0 @@
{
pkgs,
lib,
...
}: {
imports = [./default.nix];
home.packages = with pkgs; [sshfs];
programs.ssh.matchBlocks = {
"git.ccfe.ac.uk" = {user = "git";};
"jupyter" = {
localForwards = [
{
bind.port = 6702;
host.address = "localhost";
host.port = 6702;
}
];
};
"freia jupyter" = {hostname = "freia020.hpc.l";};
"freia???" = lib.hm.dag.entryAfter ["freia"] {hostname = "%h.hpc.l";};
"heimdall" = {hostname = "heimdall003.jet.uk";};
"heimdall???" = lib.hm.dag.entryAfter ["heimdall"] {hostname = "%h.jet.uk";};
"freia* jupyter" = lib.hm.dag.entryAfter [
"jupyter"
"freia jupyter"
"freia???"
"heimdall"
"heimdall???"
] {user = "elitherl";};
};
}

4
hosts/Legion/home.nix
View file

@ -5,8 +5,8 @@ in {
imports = [
shellConfig
../../home/emacs/server.nix
../../home/git/personal.nix
../../home/ssh/personal.nix
../../home/git
../../home/ssh
../../home/tui
];
home = {

4
hosts/Monarch/home.nix
View file

@ -5,8 +5,8 @@ let
in {
imports = [
../../home/shell/zsh.nix
../../home/git/personal.nix
../../home/ssh/personal.nix
../../home/git
../../home/ssh
../../home/tui
../../home/alacritty
../../home/emacs

142
hosts/Ronin/home.nix
View file

@ -1,4 +1,4 @@
{ pkgs, shellConfig, wallpapers, ... }:
{ pkgs, lib, shellConfig, ... }:
let
username = "elitherl";
homeDirectory = "/home/${username}";
@ -10,17 +10,7 @@ let
};
in
{
imports = [
shellConfig
../../home/git/work.nix
../../home/ssh/work.nix
../../home/tui
../../home/hyprland
../../home/alacritty
../../home/emacs/server.nix
../../home/firefox/work.nix
../../home/zathura
];
imports = [ shellConfig ../../home ];
home = {
inherit username homeDirectory;
stateVersion = "22.11";
@ -32,8 +22,132 @@ in
zoom-us
];
};
programs.home-manager.enable = true;
xdg.configFile."wallpaper.jpg".source = wallpapers.outputs.default;
programs = {
git.userEmail = "evie.litherland-smith@ukaea.uk";
ssh.matchBlocks = {
"git.ccfe.ac.uk" = { user = "git"; };
"jupyter" = {
localForwards = [{
bind.port = 6702;
host.address = "localhost";
host.port = 6702;
}];
};
"freia jupyter" = { hostname = "freia020.hpc.l"; };
"freia???" = lib.hm.dag.entryAfter [ "freia" ] { hostname = "%h.hpc.l"; };
"heimdall" = { hostname = "heimdall003.jet.uk"; };
"heimdall???" =
lib.hm.dag.entryAfter [ "heimdall" ] { hostname = "%h.jet.uk"; };
"freia* jupyter" = lib.hm.dag.entryAfter [
"jupyter"
"freia jupyter"
"freia???"
"heimdall"
"heimdall???"
]
{ user = "elitherl"; };
};
firefox.profiles.default = {
settings."browser.startup.homepage" = "https://nucleus.ukaea.uk";
bookmarks = [{
name = "toolbar";
toolbar = true;
bookmarks = [
{
name = "Gitea";
tags = [ "git" "source" "xenia" ];
url = "https://git.xenia.me.uk";
}
{
name = "GitHub";
tags = [ "git" "source" ];
url = "https://github.com";
}
{
name = "GitLab";
tags = [ "git" "source" ];
url = "https://gitlab.com";
}
{
name = "UKAEA GitLab";
tags = [ "git" "source" ];
url = "https://git.ccfe.ac.uk";
}
{
name = "Nucleus";
url = "https://nucleus.ukaea.uk";
}
{
name = "U4BW";
tags = [ "admin" ];
url = "https://ubw.unit4cloud.com/uk_aea_prod_web";
}
{
name = "JET homepage";
tags = [ "JET" ];
url = "w3.jet.uk";
}
{
name = "Physics Summary";
tags = [ "JET" "operations" ];
url =
"https://users.euro-fusion.org/pages/physics-summary/LatestSession.php";
}
{
name = "JSPO";
tags = [ "JET" "operations" ];
url = "https://www.jspo.jet.uk/";
}
{
name = "OpenWikis";
bookmarks = [
{
name = "Home page";
tags = [ "JET" "operations" "wiki" ];
url = "https://wiki.jetdata.eu/open/index.php?title=Main_Page";
}
{
name = "Spectroscopy Group";
tags = [ "JET" "operations" "wiki" ];
url =
"https://wiki.jetdata.eu/open/index.php?title=Spectroscopy_Group:index";
}
{
name = "KS5";
tags = [ "JET" "operations" "wiki" ];
url = "https://wiki.jetdata.eu/open/index.php?title=CXS:Topic3";
}
{
name = "KT3";
tags = [ "JET" "operations" "wiki" ];
url = "https://wiki.jetdata.eu/open/index.php?title=KT3_Journals";
}
];
}
{
name = "JET Mimics";
bookmarks = [
{
name = "Countdown";
tags = [ "JET" "operations" "mimics" ];
url = "http://webmimic.jet.uk/mc/codas/countdown";
}
{
name = "KS5";
tags = [ "JET" "operations" "mimics" ];
url = "http://webmimic.jet.uk/DG/codas/ks5.mim.html";
}
{
name = "KT3";
tags = [ "JET" "operations" "mimics" ];
url = "http://webmimic.jet.uk/DG/codas/kt3.mim.html";
}
];
}
];
}];
};
};
services.kanshi = {
enable = true;
systemdTarget = "hyprland-session.target";

4
hosts/Vanguard/home.nix
View file

@ -6,8 +6,8 @@ in
{
imports = [
shellConfig
../../home/git/personal.nix
../../home/ssh/personal.nix
../../home/git
../../home/ssh
../../home/tui
];
home = {