Merge branch 'nightly'
This commit is contained in:
commit
bf752a85e4
4 changed files with 27 additions and 22 deletions
|
|
@ -1,3 +1,8 @@
|
||||||
|
{ homeDirectory }:
|
||||||
|
|
||||||
|
let
|
||||||
|
homePath = path: "${homeDirectory}/${path}";
|
||||||
|
in
|
||||||
{
|
{
|
||||||
projects = {
|
projects = {
|
||||||
nix-config = {
|
nix-config = {
|
||||||
|
|
@ -6,7 +11,7 @@
|
||||||
windows = [
|
windows = [
|
||||||
{
|
{
|
||||||
name = "nix";
|
name = "nix";
|
||||||
path = "/Users/yanlin/.config/nix";
|
path = "${homeDirectory}/.config/nix";
|
||||||
ai = true;
|
ai = true;
|
||||||
git = true;
|
git = true;
|
||||||
shell = true;
|
shell = true;
|
||||||
|
|
@ -20,7 +25,7 @@
|
||||||
windows = [
|
windows = [
|
||||||
{
|
{
|
||||||
name = "homelab";
|
name = "homelab";
|
||||||
path = "/Users/yanlin/Documents/Projects/Homelab-deploy";
|
path = homePath "Documents/Projects/Homelab-deploy";
|
||||||
ai = true;
|
ai = true;
|
||||||
git = true;
|
git = true;
|
||||||
shell = true;
|
shell = true;
|
||||||
|
|
@ -34,7 +39,7 @@
|
||||||
windows = [
|
windows = [
|
||||||
{
|
{
|
||||||
name = "note";
|
name = "note";
|
||||||
path = "/Users/yanlin/Obsidian/Personal";
|
path = homePath "Obsidian/Personal";
|
||||||
ai = true;
|
ai = true;
|
||||||
git = true;
|
git = true;
|
||||||
shell = false;
|
shell = false;
|
||||||
|
|
@ -48,7 +53,7 @@
|
||||||
windows = [
|
windows = [
|
||||||
{
|
{
|
||||||
name = "pro";
|
name = "pro";
|
||||||
path = "/Users/yanlin/Documents/Programs";
|
path = homePath "Documents/Programs";
|
||||||
ai = true;
|
ai = true;
|
||||||
git = true;
|
git = true;
|
||||||
shell = false;
|
shell = false;
|
||||||
|
|
@ -62,14 +67,14 @@
|
||||||
windows = [
|
windows = [
|
||||||
{
|
{
|
||||||
name = "code";
|
name = "code";
|
||||||
path = "/Users/yanlin/Documents/Projects/personal-blog";
|
path = homePath "Documents/Projects/personal-blog";
|
||||||
ai = true;
|
ai = true;
|
||||||
git = true;
|
git = true;
|
||||||
shell = true;
|
shell = true;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "content";
|
name = "content";
|
||||||
path = "/Users/yanlin/Documents/Projects/personal-blog/content";
|
path = homePath "Documents/Projects/personal-blog/content";
|
||||||
ai = true;
|
ai = true;
|
||||||
git = false;
|
git = false;
|
||||||
}
|
}
|
||||||
|
|
@ -82,7 +87,7 @@
|
||||||
windows = [
|
windows = [
|
||||||
{
|
{
|
||||||
name = "homepage";
|
name = "homepage";
|
||||||
path = "/Users/yanlin/Documents/Projects/Homepage/";
|
path = homePath "Documents/Projects/Homepage";
|
||||||
ai = true;
|
ai = true;
|
||||||
git = true;
|
git = true;
|
||||||
shell = true;
|
shell = true;
|
||||||
|
|
@ -96,14 +101,14 @@
|
||||||
windows = [
|
windows = [
|
||||||
{
|
{
|
||||||
name = "code";
|
name = "code";
|
||||||
path = "/Users/yanlin/Documents/Projects/Material Design Shortcut/MDShortcut-code";
|
path = homePath "Documents/Projects/Material Design Shortcut/MDShortcut-code";
|
||||||
ai = true;
|
ai = true;
|
||||||
git = true;
|
git = true;
|
||||||
shell = true;
|
shell = true;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "paper";
|
name = "paper";
|
||||||
path = "/Users/yanlin/Documents/Projects/Material Design Shortcut/MDShortcut-paper";
|
path = homePath "Documents/Projects/Material Design Shortcut/MDShortcut-paper";
|
||||||
ai = true;
|
ai = true;
|
||||||
git = true;
|
git = true;
|
||||||
shell = false;
|
shell = false;
|
||||||
|
|
@ -117,14 +122,14 @@
|
||||||
windows = [
|
windows = [
|
||||||
{
|
{
|
||||||
name = "code";
|
name = "code";
|
||||||
path = "/Users/yanlin/Documents/Projects/AI systems & infrastructure/Codes";
|
path = homePath "Documents/Projects/AI systems & infrastructure/Codes";
|
||||||
ai = true;
|
ai = true;
|
||||||
git = true;
|
git = true;
|
||||||
shell = true;
|
shell = true;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "slides";
|
name = "slides";
|
||||||
path = "/Users/yanlin/Documents/Projects/AI systems & infrastructure/Slides";
|
path = homePath "Documents/Projects/AI systems & infrastructure/Slides";
|
||||||
ai = true;
|
ai = true;
|
||||||
git = true;
|
git = true;
|
||||||
shell = false;
|
shell = false;
|
||||||
|
|
@ -138,7 +143,7 @@
|
||||||
windows = [
|
windows = [
|
||||||
{
|
{
|
||||||
name = "group";
|
name = "group";
|
||||||
path = "/Users/yanlin/Documents/Projects/DAKI3 Semester Project Group";
|
path = homePath "Documents/Projects/DAKI3 Semester Project Group";
|
||||||
ai = true;
|
ai = true;
|
||||||
git = true;
|
git = true;
|
||||||
shell = false;
|
shell = false;
|
||||||
|
|
@ -152,7 +157,7 @@
|
||||||
windows = [
|
windows = [
|
||||||
{
|
{
|
||||||
name = "slides";
|
name = "slides";
|
||||||
path = "/Users/yanlin/Documents/Projects/Material Project Group Meeting";
|
path = homePath "Documents/Projects/Material Project Group Meeting";
|
||||||
ai = true;
|
ai = true;
|
||||||
git = true;
|
git = true;
|
||||||
shell = false;
|
shell = false;
|
||||||
|
|
@ -166,14 +171,14 @@
|
||||||
windows = [
|
windows = [
|
||||||
{
|
{
|
||||||
name = "code";
|
name = "code";
|
||||||
path = "/Users/yanlin/Documents/Projects/Inverse Design of Disordered Materials/DiffDisMatter-dev";
|
path = homePath "Documents/Projects/Inverse Design of Disordered Materials/DiffDisMatter-dev";
|
||||||
ai = true;
|
ai = true;
|
||||||
git = true;
|
git = true;
|
||||||
shell = true;
|
shell = true;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "paper";
|
name = "paper";
|
||||||
path = "/Users/yanlin/Documents/Projects/Inverse Design of Disordered Materials/mc-denoising-paper";
|
path = homePath "Documents/Projects/Inverse Design of Disordered Materials/mc-denoising-paper";
|
||||||
ai = true;
|
ai = true;
|
||||||
git = true;
|
git = true;
|
||||||
shell = false;
|
shell = false;
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
# Create userChrome.css to hide Firefox View button
|
# Create userChrome.css to hide Firefox View button
|
||||||
home.file.".mozilla/firefox/yanlin/chrome/userChrome.css".text = ''
|
home.file."${config.home.homeDirectory}/.mozilla/firefox/yanlin/chrome/userChrome.css".text = ''
|
||||||
/* Hide Firefox View button */
|
/* Hide Firefox View button */
|
||||||
#firefox-view-button {
|
#firefox-view-button {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
home.file."Library/Application Support/termscp/config.toml".text = ''
|
home.file."Library/Application Support/termscp/config.toml".text = ''
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
# Generated by Nix - see modules/termscp.nix for customization
|
# Generated by Nix - see modules/termscp.nix for customization
|
||||||
|
|
||||||
[user_interface]
|
[user_interface]
|
||||||
text_editor = "/Users/yanlin/.nix-profile/bin/nvim"
|
text_editor = "${config.home.homeDirectory}/.nix-profile/bin/nvim"
|
||||||
default_protocol = "SFTP"
|
default_protocol = "SFTP"
|
||||||
show_hidden_files = true
|
show_hidden_files = true
|
||||||
check_for_updates = true
|
check_for_updates = true
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
notification_threshold = 536870912
|
notification_threshold = 536870912
|
||||||
|
|
||||||
[remote]
|
[remote]
|
||||||
ssh_config = "/Users/yanlin/.ssh/config"
|
ssh_config = "${config.home.homeDirectory}/.ssh/config"
|
||||||
|
|
||||||
[remote.ssh_keys]
|
[remote.ssh_keys]
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
{ pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
projectsConfig = import ../config/projects.nix;
|
projectsConfig = import ../config/projects.nix { homeDirectory = config.home.homeDirectory; };
|
||||||
projectLauncher = "/Users/yanlin/.config/nix/scripts/project-launcher.sh";
|
projectLauncher = "${config.home.homeDirectory}/.config/nix/scripts/project-launcher.sh";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue