diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..c08cda6 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,5 @@ +root=true + +[*] +indent_style: "tab" +indent_size: "2" \ No newline at end of file diff --git a/nixpkgs/machines/loft/config.nix b/nixpkgs/machines/loft/config.nix index 1dd1750..6e55391 100644 --- a/nixpkgs/machines/loft/config.nix +++ b/nixpkgs/machines/loft/config.nix @@ -1,3 +1,3 @@ { - allowUnfree = true; + allowUnfree = true; } diff --git a/nixpkgs/machines/loft/home.nix b/nixpkgs/machines/loft/home.nix index 4b4579a..24f89e4 100644 --- a/nixpkgs/machines/loft/home.nix +++ b/nixpkgs/machines/loft/home.nix @@ -1,22 +1,22 @@ { config, pkgs, ... }: { - imports = [ - ../../modules/home-manager.nix - ../../modules/dev.nix - ../../modules/fonts.nix - ../../modules/git.nix - ../../modules/git_nixos.nix - ../../modules/gnome.nix - ../../modules/vscode.nix - ../../modules/zsh.nix - ]; + imports = [ + ../../modules/home-manager.nix + ../../modules/dev.nix + ../../modules/fonts.nix + ../../modules/git.nix + ../../modules/git_nixos.nix + ../../modules/gnome.nix + ../../modules/vscode.nix + ../../modules/zsh.nix + ]; - home.packages = with pkgs; [ - neofetch - fortune - google-chrome - firefox - ]; + home.packages = with pkgs; [ + neofetch + fortune + google-chrome + firefox + ]; } diff --git a/nixpkgs/machines/mac/config.nix b/nixpkgs/machines/mac/config.nix index 1dd1750..6e55391 100644 --- a/nixpkgs/machines/mac/config.nix +++ b/nixpkgs/machines/mac/config.nix @@ -1,3 +1,3 @@ { - allowUnfree = true; + allowUnfree = true; } diff --git a/nixpkgs/machines/mac/home.nix b/nixpkgs/machines/mac/home.nix index 64f4c5c..7febef6 100644 --- a/nixpkgs/machines/mac/home.nix +++ b/nixpkgs/machines/mac/home.nix @@ -1,13 +1,13 @@ { config, pkgs, ... }: { - imports = [ - ../../modules/home-manager.nix - ../../modules/zsh.nix - ../../modules/dev.nix - ../../modules/fonts.nix - ]; + imports = [ + ../../modules/home-manager.nix + ../../modules/zsh.nix + ../../modules/dev.nix + ../../modules/fonts.nix + ]; - home.packages = with pkgs; [ - neofetch - ]; + home.packages = with pkgs; [ + neofetch + ]; } \ No newline at end of file diff --git a/nixpkgs/machines/wsl/config.nix b/nixpkgs/machines/wsl/config.nix index 1dd1750..6e55391 100644 --- a/nixpkgs/machines/wsl/config.nix +++ b/nixpkgs/machines/wsl/config.nix @@ -1,3 +1,3 @@ { - allowUnfree = true; + allowUnfree = true; } diff --git a/nixpkgs/machines/wsl/home.nix b/nixpkgs/machines/wsl/home.nix index 124e742..ba8f36b 100644 --- a/nixpkgs/machines/wsl/home.nix +++ b/nixpkgs/machines/wsl/home.nix @@ -1,20 +1,20 @@ { config, pkgs, ... }: { - imports = [ - ../../modules/home-manager.nix - ../../modules/git.nix - ../../modules/zsh.nix - ]; + imports = [ + ../../modules/home-manager.nix + ../../modules/git.nix + ../../modules/zsh.nix + ]; - home.packages = with pkgs; [ - neofetch - pfetch - fortune - ]; + home.packages = with pkgs; [ + neofetch + pfetch + fortune + ]; - programs.zsh.shellAliases = { - code = "/mnt/c/Program\\ Files/Microsoft\\ VS\\ Code/Code.exe"; - }; + programs.zsh.shellAliases = { + code = "/mnt/c/Program\\ Files/Microsoft\\ VS\\ Code/Code.exe"; + }; } \ No newline at end of file diff --git a/nixpkgs/modules/dev.nix b/nixpkgs/modules/dev.nix index 4a6359f..dcd64e4 100644 --- a/nixpkgs/modules/dev.nix +++ b/nixpkgs/modules/dev.nix @@ -1,7 +1,7 @@ { config, pkgs, libs, ... }: { - home.packages = with pkgs; [ - nodePackages.yarn - php - ]; + home.packages = with pkgs; [ + nodePackages.yarn + php + ]; } \ No newline at end of file diff --git a/nixpkgs/modules/fonts.nix b/nixpkgs/modules/fonts.nix index 2dd1135..cfee23a 100644 --- a/nixpkgs/modules/fonts.nix +++ b/nixpkgs/modules/fonts.nix @@ -1,10 +1,10 @@ { config, pkgs, libs, ... }: { - home.packages = with pkgs; [ - (nerdfonts.override { fonts = [ "FiraCode" ]; }) - google-fonts - inter - ]; + home.packages = with pkgs; [ + (nerdfonts.override { fonts = [ "FiraCode" ]; }) + google-fonts + inter + ]; - fonts.fontconfig.enable = true; + fonts.fontconfig.enable = true; } \ No newline at end of file diff --git a/nixpkgs/modules/git.nix b/nixpkgs/modules/git.nix index e02401a..ff63f56 100644 --- a/nixpkgs/modules/git.nix +++ b/nixpkgs/modules/git.nix @@ -1,13 +1,13 @@ { config, pkgs, libs, ... }: { - home.packages = with pkgs; [ - git-lfs - ]; + home.packages = with pkgs; [ + git-lfs + ]; - # Use pkgs.gitAndTools.gitFull in order to get libsecret support - programs.git = { - enable = true; - userEmail = "michaelhthomas@outlook.com"; - userName = "Michael Thomas"; - }; + # Use pkgs.gitAndTools.gitFull in order to get libsecret support + programs.git = { + enable = true; + userEmail = "michaelhthomas@outlook.com"; + userName = "Michael Thomas"; + }; } \ No newline at end of file diff --git a/nixpkgs/modules/git_nixos.nix b/nixpkgs/modules/git_nixos.nix index 0d46109..90cd747 100644 --- a/nixpkgs/modules/git_nixos.nix +++ b/nixpkgs/modules/git_nixos.nix @@ -1,10 +1,10 @@ { config, pkgs, libs, ... }: { - # Use pkgs.gitAndTools.gitFull in order to get libsecret support - programs.git = { - package = pkgs.gitAndTools.gitFull; - extraConfig = { - credential.helper = "libsecret"; - }; - }; + # Use pkgs.gitAndTools.gitFull in order to get libsecret support + programs.git = { + package = pkgs.gitAndTools.gitFull; + extraConfig = { + credential.helper = "libsecret"; + }; + }; } \ No newline at end of file diff --git a/nixpkgs/modules/gnome.nix b/nixpkgs/modules/gnome.nix index ff1e3d9..3785d07 100644 --- a/nixpkgs/modules/gnome.nix +++ b/nixpkgs/modules/gnome.nix @@ -1,34 +1,34 @@ { config, pkgs, libs, ... }: { - home.packages = with pkgs; [ - gnomeExtensions.caffeine - gnomeExtensions.paperwm - gnomeExtensions.cleaner-overview - gnomeExtensions.vertical-overview - gnomeExtensions.disable-workspace-switch-animation-for-gnome-40 - ]; + home.packages = with pkgs; [ + gnomeExtensions.caffeine + gnomeExtensions.paperwm + gnomeExtensions.cleaner-overview + gnomeExtensions.vertical-overview + gnomeExtensions.disable-workspace-switch-animation-for-gnome-40 + ]; - gtk = { - enable = true; - theme = { - name = "Adwaita-dark"; - # package = pkgs.arc-theme; - }; - font.name = "Inter 11"; - iconTheme = { - name = "Papirus"; - package = pkgs.papirus-icon-theme; - }; - }; + gtk = { + enable = true; + theme = { + name = "Adwaita-dark"; + # package = pkgs.arc-theme; + }; + font.name = "Inter 11"; + iconTheme = { + name = "Papirus"; + package = pkgs.papirus-icon-theme; + }; + }; - programs.gnome-terminal = { - enable = true; - profile = { - "5ddfe964-7ee6-4131-b449-26bdd97518f7" = { - default = true; - visibleName = "Michael"; - font = "FiraCode Nerd Font 12"; - }; - }; - }; + programs.gnome-terminal = { + enable = true; + profile = { + "5ddfe964-7ee6-4131-b449-26bdd97518f7" = { + default = true; + visibleName = "Michael"; + font = "FiraCode Nerd Font 12"; + }; + }; + }; } diff --git a/nixpkgs/modules/home-manager.nix b/nixpkgs/modules/home-manager.nix index 114b75f..69f5911 100644 --- a/nixpkgs/modules/home-manager.nix +++ b/nixpkgs/modules/home-manager.nix @@ -1,20 +1,20 @@ { config, pkgs, libs, ... }: { - # Let Home Manager install and manage itself. - programs.home-manager.enable = true; + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; - # Home Manager needs a bit of information about you and the - # paths it should manage. - home.username = builtins.getEnv "USER"; - home.homeDirectory = builtins.getEnv "HOME"; + # Home Manager needs a bit of information about you and the + # paths it should manage. + home.username = builtins.getEnv "USER"; + home.homeDirectory = builtins.getEnv "HOME"; - # This value determines the Home Manager release that your - # configuration is compatible with. This helps avoid breakage - # when a new Home Manager release introduces backwards - # incompatible changes. - # - # You can update Home Manager without changing this value. See - # the Home Manager release notes for a list of state version - # changes in each release. - home.stateVersion = "21.03"; + # This value determines the Home Manager release that your + # configuration is compatible with. This helps avoid breakage + # when a new Home Manager release introduces backwards + # incompatible changes. + # + # You can update Home Manager without changing this value. See + # the Home Manager release notes for a list of state version + # changes in each release. + home.stateVersion = "21.03"; } diff --git a/nixpkgs/modules/vscode.nix b/nixpkgs/modules/vscode.nix index 6451520..0d9d9ed 100644 --- a/nixpkgs/modules/vscode.nix +++ b/nixpkgs/modules/vscode.nix @@ -1,15 +1,15 @@ { config, pkgs, libs, ... }: { - programs = { - vscode = { - enable = true; - extensions = [ - pkgs.vscode-extensions.bbenoist.Nix - ]; - # userSettings = { - # "editor.fontFamily" = "'FiraCode Nerd Font', 'Droid Sans Mono', 'monospace', monospace, 'Droid Sans Fallback'"; - # "editor.tabSize" = 2; - # }; - }; - }; + programs = { + vscode = { + enable = true; + extensions = [ + pkgs.vscode-extensions.bbenoist.Nix + ]; + # userSettings = { + # "editor.fontFamily" = "'FiraCode Nerd Font', 'Droid Sans Mono', 'monospace', monospace, 'Droid Sans Fallback'"; + # "editor.tabSize" = 2; + # }; + }; + }; } \ No newline at end of file diff --git a/nixpkgs/modules/zsh.nix b/nixpkgs/modules/zsh.nix index 9d5f5a0..d1ac3e1 100644 --- a/nixpkgs/modules/zsh.nix +++ b/nixpkgs/modules/zsh.nix @@ -1,46 +1,46 @@ { config, pkgs, libs, ... }: { - programs.zsh = { - enable = true; - plugins = [ - { - name = "zsh-nix-shell"; - file = "nix-shell.plugin.zsh"; - src = pkgs.fetchFromGitHub { - owner = "chisui"; - repo = "zsh-nix-shell"; - rev = "v0.1.0"; - sha256 = "0snhch9hfy83d4amkyxx33izvkhbwmindy0zjjk28hih1a9l2jmx"; - }; - } - ]; - prezto = { - enable = true; - pmodules = [ - "archive" - "docker" - "environment" - "git" - "terminal" - "editor" - "history" - "directory" - "spectrum" - "utility" - "completion" - "command-not-found" - "syntax-highlighting" - "history-substring-search" - "autosuggestions" - "prompt" - ]; - }; - }; - programs.starship = { - enable = true; - enableZshIntegration = true; - settings = { - character.success_symbol = "[➜](green)"; - }; - }; + programs.zsh = { + enable = true; + plugins = [ + { + name = "zsh-nix-shell"; + file = "nix-shell.plugin.zsh"; + src = pkgs.fetchFromGitHub { + owner = "chisui"; + repo = "zsh-nix-shell"; + rev = "v0.1.0"; + sha256 = "0snhch9hfy83d4amkyxx33izvkhbwmindy0zjjk28hih1a9l2jmx"; + }; + } + ]; + prezto = { + enable = true; + pmodules = [ + "archive" + "docker" + "environment" + "git" + "terminal" + "editor" + "history" + "directory" + "spectrum" + "utility" + "completion" + "command-not-found" + "syntax-highlighting" + "history-substring-search" + "autosuggestions" + "prompt" + ]; + }; + }; + programs.starship = { + enable = true; + enableZshIntegration = true; + settings = { + character.success_symbol = "[➜](green)"; + }; + }; } \ No newline at end of file diff --git a/nixpkgs/overlays/paperwm.nix b/nixpkgs/overlays/paperwm.nix index ce78f67..ee2c3ec 100644 --- a/nixpkgs/overlays/paperwm.nix +++ b/nixpkgs/overlays/paperwm.nix @@ -1,11 +1,11 @@ self: super: { - gnomeExtensions = super.gnomeExtensions // { - paperwm = super.gnomeExtensions.paperwm.overrideDerivation (old: { - version = "pre-40.0"; - src = builtins.fetchGit { - url = https://github.com/paperwm/paperwm.git; - ref = "next-release"; - }; - }); - }; + gnomeExtensions = super.gnomeExtensions // { + paperwm = super.gnomeExtensions.paperwm.overrideDerivation (old: { + version = "pre-40.0"; + src = builtins.fetchGit { + url = https://github.com/paperwm/paperwm.git; + ref = "next-release"; + }; + }); + }; } \ No newline at end of file diff --git a/systems/loft/configuration.nix b/systems/loft/configuration.nix deleted file mode 120000 index faf36fd..0000000 --- a/systems/loft/configuration.nix +++ /dev/null @@ -1 +0,0 @@ -/etc/nixos/configuration.nix \ No newline at end of file diff --git a/systems/loft/hardware-configuration.nix b/systems/loft/hardware-configuration.nix deleted file mode 120000 index 4dde6be..0000000 --- a/systems/loft/hardware-configuration.nix +++ /dev/null @@ -1 +0,0 @@ -/etc/nixos/hardware-configuration.nix \ No newline at end of file