Fix indentation :)

This commit is contained in:
Michael Thomas 2021-08-16 16:12:04 -04:00
parent 0f87c01fdc
commit 79f9cb89b6
18 changed files with 180 additions and 177 deletions

5
.editorconfig Normal file

@ -0,0 +1,5 @@
root=true
[*]
indent_style: "tab"
indent_size: "2"

@ -1,3 +1,3 @@
{ {
allowUnfree = true; allowUnfree = true;
} }

@ -1,22 +1,22 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [
../../modules/home-manager.nix ../../modules/home-manager.nix
../../modules/dev.nix ../../modules/dev.nix
../../modules/fonts.nix ../../modules/fonts.nix
../../modules/git.nix ../../modules/git.nix
../../modules/git_nixos.nix ../../modules/git_nixos.nix
../../modules/gnome.nix ../../modules/gnome.nix
../../modules/vscode.nix ../../modules/vscode.nix
../../modules/zsh.nix ../../modules/zsh.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
neofetch neofetch
fortune fortune
google-chrome google-chrome
firefox firefox
]; ];
} }

@ -1,3 +1,3 @@
{ {
allowUnfree = true; allowUnfree = true;
} }

@ -1,13 +1,13 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [
../../modules/home-manager.nix ../../modules/home-manager.nix
../../modules/zsh.nix ../../modules/zsh.nix
../../modules/dev.nix ../../modules/dev.nix
../../modules/fonts.nix ../../modules/fonts.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
neofetch neofetch
]; ];
} }

@ -1,3 +1,3 @@
{ {
allowUnfree = true; allowUnfree = true;
} }

@ -1,20 +1,20 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [
../../modules/home-manager.nix ../../modules/home-manager.nix
../../modules/git.nix ../../modules/git.nix
../../modules/zsh.nix ../../modules/zsh.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
neofetch neofetch
pfetch pfetch
fortune fortune
]; ];
programs.zsh.shellAliases = { programs.zsh.shellAliases = {
code = "/mnt/c/Program\\ Files/Microsoft\\ VS\\ Code/Code.exe"; code = "/mnt/c/Program\\ Files/Microsoft\\ VS\\ Code/Code.exe";
}; };
} }

@ -1,7 +1,7 @@
{ config, pkgs, libs, ... }: { config, pkgs, libs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
nodePackages.yarn nodePackages.yarn
php php
]; ];
} }

@ -1,10 +1,10 @@
{ config, pkgs, libs, ... }: { config, pkgs, libs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
(nerdfonts.override { fonts = [ "FiraCode" ]; }) (nerdfonts.override { fonts = [ "FiraCode" ]; })
google-fonts google-fonts
inter inter
]; ];
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
} }

@ -1,13 +1,13 @@
{ config, pkgs, libs, ... }: { config, pkgs, libs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
git-lfs git-lfs
]; ];
# Use pkgs.gitAndTools.gitFull in order to get libsecret support # Use pkgs.gitAndTools.gitFull in order to get libsecret support
programs.git = { programs.git = {
enable = true; enable = true;
userEmail = "michaelhthomas@outlook.com"; userEmail = "michaelhthomas@outlook.com";
userName = "Michael Thomas"; userName = "Michael Thomas";
}; };
} }

@ -1,10 +1,10 @@
{ config, pkgs, libs, ... }: { config, pkgs, libs, ... }:
{ {
# Use pkgs.gitAndTools.gitFull in order to get libsecret support # Use pkgs.gitAndTools.gitFull in order to get libsecret support
programs.git = { programs.git = {
package = pkgs.gitAndTools.gitFull; package = pkgs.gitAndTools.gitFull;
extraConfig = { extraConfig = {
credential.helper = "libsecret"; credential.helper = "libsecret";
}; };
}; };
} }

@ -1,34 +1,34 @@
{ config, pkgs, libs, ... }: { config, pkgs, libs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
gnomeExtensions.caffeine gnomeExtensions.caffeine
gnomeExtensions.paperwm gnomeExtensions.paperwm
gnomeExtensions.cleaner-overview gnomeExtensions.cleaner-overview
gnomeExtensions.vertical-overview gnomeExtensions.vertical-overview
gnomeExtensions.disable-workspace-switch-animation-for-gnome-40 gnomeExtensions.disable-workspace-switch-animation-for-gnome-40
]; ];
gtk = { gtk = {
enable = true; enable = true;
theme = { theme = {
name = "Adwaita-dark"; name = "Adwaita-dark";
# package = pkgs.arc-theme; # package = pkgs.arc-theme;
}; };
font.name = "Inter 11"; font.name = "Inter 11";
iconTheme = { iconTheme = {
name = "Papirus"; name = "Papirus";
package = pkgs.papirus-icon-theme; package = pkgs.papirus-icon-theme;
}; };
}; };
programs.gnome-terminal = { programs.gnome-terminal = {
enable = true; enable = true;
profile = { profile = {
"5ddfe964-7ee6-4131-b449-26bdd97518f7" = { "5ddfe964-7ee6-4131-b449-26bdd97518f7" = {
default = true; default = true;
visibleName = "Michael"; visibleName = "Michael";
font = "FiraCode Nerd Font 12"; font = "FiraCode Nerd Font 12";
}; };
}; };
}; };
} }

@ -1,20 +1,20 @@
{ config, pkgs, libs, ... }: { config, pkgs, libs, ... }:
{ {
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;
# Home Manager needs a bit of information about you and the # Home Manager needs a bit of information about you and the
# paths it should manage. # paths it should manage.
home.username = builtins.getEnv "USER"; home.username = builtins.getEnv "USER";
home.homeDirectory = builtins.getEnv "HOME"; home.homeDirectory = builtins.getEnv "HOME";
# This value determines the Home Manager release that your # This value determines the Home Manager release that your
# configuration is compatible with. This helps avoid breakage # configuration is compatible with. This helps avoid breakage
# when a new Home Manager release introduces backwards # when a new Home Manager release introduces backwards
# incompatible changes. # incompatible changes.
# #
# You can update Home Manager without changing this value. See # You can update Home Manager without changing this value. See
# the Home Manager release notes for a list of state version # the Home Manager release notes for a list of state version
# changes in each release. # changes in each release.
home.stateVersion = "21.03"; home.stateVersion = "21.03";
} }

@ -1,15 +1,15 @@
{ config, pkgs, libs, ... }: { config, pkgs, libs, ... }:
{ {
programs = { programs = {
vscode = { vscode = {
enable = true; enable = true;
extensions = [ extensions = [
pkgs.vscode-extensions.bbenoist.Nix pkgs.vscode-extensions.bbenoist.Nix
]; ];
# userSettings = { # userSettings = {
# "editor.fontFamily" = "'FiraCode Nerd Font', 'Droid Sans Mono', 'monospace', monospace, 'Droid Sans Fallback'"; # "editor.fontFamily" = "'FiraCode Nerd Font', 'Droid Sans Mono', 'monospace', monospace, 'Droid Sans Fallback'";
# "editor.tabSize" = 2; # "editor.tabSize" = 2;
# }; # };
}; };
}; };
} }

@ -1,46 +1,46 @@
{ config, pkgs, libs, ... }: { config, pkgs, libs, ... }:
{ {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
plugins = [ plugins = [
{ {
name = "zsh-nix-shell"; name = "zsh-nix-shell";
file = "nix-shell.plugin.zsh"; file = "nix-shell.plugin.zsh";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "chisui"; owner = "chisui";
repo = "zsh-nix-shell"; repo = "zsh-nix-shell";
rev = "v0.1.0"; rev = "v0.1.0";
sha256 = "0snhch9hfy83d4amkyxx33izvkhbwmindy0zjjk28hih1a9l2jmx"; sha256 = "0snhch9hfy83d4amkyxx33izvkhbwmindy0zjjk28hih1a9l2jmx";
}; };
} }
]; ];
prezto = { prezto = {
enable = true; enable = true;
pmodules = [ pmodules = [
"archive" "archive"
"docker" "docker"
"environment" "environment"
"git" "git"
"terminal" "terminal"
"editor" "editor"
"history" "history"
"directory" "directory"
"spectrum" "spectrum"
"utility" "utility"
"completion" "completion"
"command-not-found" "command-not-found"
"syntax-highlighting" "syntax-highlighting"
"history-substring-search" "history-substring-search"
"autosuggestions" "autosuggestions"
"prompt" "prompt"
]; ];
}; };
}; };
programs.starship = { programs.starship = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
settings = { settings = {
character.success_symbol = "[](green)"; character.success_symbol = "[](green)";
}; };
}; };
} }

@ -1,11 +1,11 @@
self: super: { self: super: {
gnomeExtensions = super.gnomeExtensions // { gnomeExtensions = super.gnomeExtensions // {
paperwm = super.gnomeExtensions.paperwm.overrideDerivation (old: { paperwm = super.gnomeExtensions.paperwm.overrideDerivation (old: {
version = "pre-40.0"; version = "pre-40.0";
src = builtins.fetchGit { src = builtins.fetchGit {
url = https://github.com/paperwm/paperwm.git; url = https://github.com/paperwm/paperwm.git;
ref = "next-release"; ref = "next-release";
}; };
}); });
}; };
} }

@ -1 +0,0 @@
/etc/nixos/configuration.nix

@ -1 +0,0 @@
/etc/nixos/hardware-configuration.nix