Skip to content

Commit

Permalink
Merge pull request #125 from erictossell/dev
Browse files Browse the repository at this point in the history
hello again old friend
  • Loading branch information
erictossell authored Oct 26, 2024
2 parents 1b2085b + ef1f710 commit 277d904
Show file tree
Hide file tree
Showing 25 changed files with 717 additions and 553 deletions.
104 changes: 59 additions & 45 deletions README.md

Large diffs are not rendered by default.

Binary file added assets/backgrounds/OutsetIslandday.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/backgrounds/OutsetIslandevening.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/backgrounds/OutsetIslandmorning.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/backgrounds/OutsetIslandnight.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/backgrounds/darkportal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/backgrounds/groot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/backgrounds/nightcity.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
454 changes: 304 additions & 150 deletions flake.lock

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion modules/apps/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,21 @@
./firefox
#./jetbrains
#./libreoffice
#./obsidian
./obsidian
#./vscode
];
home-manager.users.${username} = {
programs.chromium = {
enable = true;
package = pkgs.brave;
};
home.packages = with pkgs; [
microsoft-edge
ticktick
remmina
openvpn
vivaldi
vscode
];

programs.zathura = {
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/firefox/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
home-manager.users.${username} = {

home.sessionVariables = {
MOZ_ENABLE_WAYLAND = 1;
MOZ_ENABLE_WAYLAND = 0;
};

programs.firefox = {
Expand Down
1 change: 0 additions & 1 deletion modules/apps/obs/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
pkgs,
home-manager,
username,
...
}:
Expand Down
1 change: 0 additions & 1 deletion modules/apps/obsidian/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
pkgs,
home-manager,
username,
...
}:
Expand Down
13 changes: 0 additions & 13 deletions modules/apps/vscode/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
pkgs,
home-manager,
username,
...
}:
Expand All @@ -22,18 +21,6 @@
ms-vscode.powershell
bbenoist.nix
];
userSettings = {
"window.titleBarStyle" = "custom";
"workbench.colorTheme" = "Github Dark Colorblind (Beta)";
"editor.fontFamily" = "'M+1Code Nerd Font','Droid Sans Mono', 'monospace', monospace";
"github.copilot.enable" = {
"*" = true;
"plaintext" = false;
"markdown" = true;
"scminput" = false;
};
"powershell.powerShellAdditionalExePaths" = "/run/current-system/sw/bin/pwsh";
};
};
};
}
2 changes: 1 addition & 1 deletion modules/core/terminal/fonts/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
monaspace
nerdfonts
noto-fonts
noto-fonts-cjk
noto-fonts-cjk-sans
noto-fonts-emoji
roboto
];
Expand Down
6 changes: 3 additions & 3 deletions modules/core/terminal/starship/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
};
hostname = {
ssh_only = false;
format = " on [$hostname](bold red)\n";
format = " on [$hostname](bold #FFA500)\n";
disabled = false;
};
lua = {
Expand Down Expand Up @@ -138,8 +138,8 @@
symbol = "terraform ";
};
username = {
style_user = "green bold";
style_root = "red bold";
style_user = "blue bold";
style_root = "orange bold";
format = "[$user]($style)";
disabled = false;
show_always = true;
Expand Down
18 changes: 11 additions & 7 deletions modules/core/terminal/tmux/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
{ pkgs, ... }:
{ pkgs, username, ... }:
{
# ---- System Configuration ----
programs = {
tmux = {
enable = true;
newSession = true;
plugins = with pkgs.tmuxPlugins; [ yank ];
home-manager.users.${username} = _: {
programs = {
tmux = {
enable = true;
newSession = true;
plugins = with pkgs.tmuxPlugins; [
gruvbox
yank
];
};
};
};
}
Loading

0 comments on commit 277d904

Please sign in to comment.