mirror of
https://github.com/Noratrieb/nixos.git
synced 2026-01-14 11:45:06 +01:00
cleanup
This commit is contained in:
parent
bc6f9e293f
commit
6ab5c496f3
5 changed files with 114 additions and 141 deletions
11
flake.nix
11
flake.nix
|
|
@ -38,16 +38,5 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Standalone home-manager configuration entrypoint
|
|
||||||
# Available through 'home-manager --flake .#nils@nixos'
|
|
||||||
/*homeConfigurations = {
|
|
||||||
"nils@nixos" = home-manager.lib.homeManagerConfiguration {
|
|
||||||
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
|
|
||||||
extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config
|
|
||||||
# > Our main home-manager configuration file <
|
|
||||||
modules = [ ./home-manager/home.nix ];
|
|
||||||
};
|
|
||||||
};*/
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,36 +1,38 @@
|
||||||
{ pkgs }: {
|
{ pkgs, ... }: {
|
||||||
enable = true;
|
programs.firefox = {
|
||||||
profiles = {
|
enable = true;
|
||||||
nils = {
|
profiles = {
|
||||||
id = 0;
|
nils = {
|
||||||
name = "nils";
|
id = 0;
|
||||||
|
name = "nils";
|
||||||
|
|
||||||
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||||
ublock-origin
|
ublock-origin
|
||||||
bitwarden
|
bitwarden
|
||||||
tampermonkey
|
tampermonkey
|
||||||
];
|
];
|
||||||
|
|
||||||
bookmarks = [
|
bookmarks = [
|
||||||
{
|
{
|
||||||
name = "Nix sites";
|
name = "Nix sites";
|
||||||
toolbar = true;
|
toolbar = true;
|
||||||
bookmarks = [
|
bookmarks = [
|
||||||
{
|
{
|
||||||
name = "NixOS options";
|
name = "NixOS options";
|
||||||
url = "https://search.nixos.org/options";
|
url = "https://search.nixos.org/options";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "home-manager options";
|
name = "home-manager options";
|
||||||
url = "https://rycee.gitlab.io/home-manager/options.html";
|
url = "https://rycee.gitlab.io/home-manager/options.html";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "nixpkgs search";
|
name = "nixpkgs search";
|
||||||
url = "https://search.nixos.org/packages";
|
url = "https://search.nixos.org/packages";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,25 @@
|
||||||
{ pkgs }: {
|
{ pkgs, ... }: {
|
||||||
enable = true;
|
programs.git = {
|
||||||
|
|
||||||
userEmail = "48135649+Nilstrieb@users.noreply.github.com";
|
|
||||||
userName = "Nilstrieb";
|
|
||||||
|
|
||||||
aliases = {
|
|
||||||
hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
|
|
||||||
fpush = "push --force-with-lease";
|
|
||||||
resq = "rebase --autosquash -i";
|
|
||||||
pfush = "!echo \"hör uf ume z'pfusche und machs richtig\"";
|
|
||||||
};
|
|
||||||
difftastic = {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
|
||||||
extraConfig = {
|
userEmail = "48135649+Nilstrieb@users.noreply.github.com";
|
||||||
core.autocrlf = false;
|
userName = "Nilstrieb";
|
||||||
core.editor = "nvim";
|
|
||||||
pull.ff = "only";
|
aliases = {
|
||||||
push.autoSetupRemote = true;
|
hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
|
||||||
init.defaultBranch = "main";
|
fpush = "push --force-with-lease";
|
||||||
|
resq = "rebase --autosquash -i";
|
||||||
|
pfush = "!echo \"hör uf ume z'pfusche und machs richtig\"";
|
||||||
|
};
|
||||||
|
difftastic = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
extraConfig = {
|
||||||
|
core.autocrlf = false;
|
||||||
|
core.editor = "nvim";
|
||||||
|
pull.ff = "only";
|
||||||
|
push.autoSetupRemote = true;
|
||||||
|
init.defaultBranch = "main";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,29 +18,11 @@ in
|
||||||
|
|
||||||
# You can also split up your configuration and import pieces of it here:
|
# You can also split up your configuration and import pieces of it here:
|
||||||
# ./nvim.nix
|
# ./nvim.nix
|
||||||
|
./git.nix
|
||||||
|
./firefox.nix
|
||||||
|
./vscode.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
/*nixpkgs = {
|
|
||||||
# You can add overlays here
|
|
||||||
overlays = [
|
|
||||||
# If you want to use overlays exported from other flakes:
|
|
||||||
# neovim-nightly-overlay.overlays.default
|
|
||||||
|
|
||||||
# Or define it inline, for example:
|
|
||||||
# (final: prev: {
|
|
||||||
# hi = final.hello.overrideAttrs (oldAttrs: {
|
|
||||||
# patches = [ ./change-hello-to-hi.patch ];
|
|
||||||
# });
|
|
||||||
# })
|
|
||||||
];
|
|
||||||
# Configure your nixpkgs instance
|
|
||||||
config = {
|
|
||||||
allowUnfree = true;
|
|
||||||
# Workaround for https://github.com/nix-community/home-manager/issues/2942
|
|
||||||
allowUnfreePredicate = (_: true);
|
|
||||||
};
|
|
||||||
};*/
|
|
||||||
|
|
||||||
home = {
|
home = {
|
||||||
username = "nils";
|
username = "nils";
|
||||||
homeDirectory = "/home/nils";
|
homeDirectory = "/home/nils";
|
||||||
|
|
@ -80,10 +62,6 @@ in
|
||||||
|
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
|
|
||||||
programs.git = import ./git.nix { inherit pkgs; };
|
|
||||||
programs.firefox = import ./firefox.nix { inherit pkgs; };
|
|
||||||
programs.vscode = import ./vscode.nix { inherit pkgs; };
|
|
||||||
|
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
interactiveShellInit = ''
|
interactiveShellInit = ''
|
||||||
|
|
|
||||||
|
|
@ -1,55 +1,57 @@
|
||||||
{ pkgs }: {
|
{ pkgs, ... }: {
|
||||||
enable = true;
|
programs.vscode = {
|
||||||
package = pkgs.vscode;
|
enable = true;
|
||||||
extensions = with pkgs.vscode-extensions; [
|
package = pkgs.vscode;
|
||||||
jnoortheen.nix-ide
|
extensions = with pkgs.vscode-extensions; [
|
||||||
usernamehw.errorlens
|
jnoortheen.nix-ide
|
||||||
ms-vscode.cmake-tools
|
usernamehw.errorlens
|
||||||
ms-vscode.cpptools
|
ms-vscode.cmake-tools
|
||||||
eamodio.gitlens
|
ms-vscode.cpptools
|
||||||
tamasfe.even-better-toml
|
eamodio.gitlens
|
||||||
ms-vscode-remote.remote-ssh
|
tamasfe.even-better-toml
|
||||||
esbenp.prettier-vscode
|
ms-vscode-remote.remote-ssh
|
||||||
dbaeumer.vscode-eslint
|
esbenp.prettier-vscode
|
||||||
ms-python.python
|
dbaeumer.vscode-eslint
|
||||||
redhat.vscode-yaml
|
ms-python.python
|
||||||
mads-hartmann.bash-ide-vscode
|
redhat.vscode-yaml
|
||||||
ms-azuretools.vscode-docker
|
mads-hartmann.bash-ide-vscode
|
||||||
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
ms-azuretools.vscode-docker
|
||||||
{
|
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
||||||
publisher = "dtsvet";
|
{
|
||||||
name = "vscode-wasm";
|
publisher = "dtsvet";
|
||||||
version = "1.4.1";
|
name = "vscode-wasm";
|
||||||
sha256 = "sha256-zs7E3pxf4P8kb3J+5zLoAO2dvTeepuCuBJi5s354k0I=";
|
version = "1.4.1";
|
||||||
}
|
sha256 = "sha256-zs7E3pxf4P8kb3J+5zLoAO2dvTeepuCuBJi5s354k0I=";
|
||||||
{
|
}
|
||||||
publisher = "redhat";
|
{
|
||||||
name = "ansible";
|
publisher = "redhat";
|
||||||
version = "2.7.98";
|
name = "ansible";
|
||||||
sha256 = "sha256-b3Z40IeQbtYci2LA4/OlJkfqMB78cWRNTNWd89lfhy4=";
|
version = "2.7.98";
|
||||||
}
|
sha256 = "sha256-b3Z40IeQbtYci2LA4/OlJkfqMB78cWRNTNWd89lfhy4=";
|
||||||
{
|
}
|
||||||
publisher = "matthewpi";
|
{
|
||||||
name = "caddyfile-support";
|
publisher = "matthewpi";
|
||||||
version = "0.3.0";
|
name = "caddyfile-support";
|
||||||
sha256 = "sha256-1yiOnvC2w33kiPRdQYskee38Cid/GOj9becLadP1fUY=";
|
version = "0.3.0";
|
||||||
}
|
sha256 = "sha256-1yiOnvC2w33kiPRdQYskee38Cid/GOj9becLadP1fUY=";
|
||||||
] ++ [
|
}
|
||||||
(pkgs.vscode-utils.buildVscodeExtension {
|
] ++ [
|
||||||
name = "riverdelta";
|
(pkgs.vscode-utils.buildVscodeExtension {
|
||||||
version = "0.1.0";
|
name = "riverdelta";
|
||||||
src = builtins.fetchGit {
|
version = "0.1.0";
|
||||||
url = "https://github.com/Nilstrieb/riverdelta";
|
src = builtins.fetchGit {
|
||||||
rev = "64d81b56084d9a7663517b367b4533fb8ea83a92";
|
url = "https://github.com/Nilstrieb/riverdelta";
|
||||||
};
|
rev = "64d81b56084d9a7663517b367b4533fb8ea83a92";
|
||||||
vscodeExtPublisher = "Nilstrieb";
|
};
|
||||||
vscodeExtName = "riverdelta";
|
vscodeExtPublisher = "Nilstrieb";
|
||||||
vscodeExtUniqueId = "Nilstrieb.riverdelta";
|
vscodeExtName = "riverdelta";
|
||||||
buildPhase = ''
|
vscodeExtUniqueId = "Nilstrieb.riverdelta";
|
||||||
runHook preBuild;
|
buildPhase = ''
|
||||||
cd ./vscode
|
runHook preBuild;
|
||||||
runHook postBuild;
|
cd ./vscode
|
||||||
'';
|
runHook postBuild;
|
||||||
})
|
'';
|
||||||
];
|
})
|
||||||
|
];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue