Compare commits

...

4 commits

Author SHA1 Message Date
6a4c1b34bf
Autoformat 2024-12-02 23:09:33 +01:00
dd5a1d52da
NixVim: Add Rust 2024-12-02 23:08:51 +01:00
265b1ab049
Remove nixos-hardware input override 2024-12-02 23:08:34 +01:00
4b2997c4de
NixVim: Make some keybinds silent 2024-12-02 23:08:18 +01:00
6 changed files with 166 additions and 156 deletions

211
flake.nix
View file

@ -12,10 +12,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hardware = { hardware.url = "github:nixos/nixos-hardware";
url = "github:nixos/nixos-hardware";
inputs.nixpkgs.follows = "nixpkgs";
};
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
@ -73,117 +70,115 @@
}; };
}; };
outputs = outputs = {
{ self self,
, nixpkgs nixpkgs,
, home-manager home-manager,
, ... ...
} @ inputs: } @ inputs: let
let inherit (self) outputs;
inherit (self) outputs; # Supported systems for your flake packages, shell, etc.
# Supported systems for your flake packages, shell, etc. systems = [
systems = [ "aarch64-linux"
"aarch64-linux" "i686-linux"
"i686-linux" "x86_64-linux"
"x86_64-linux" "aarch64-darwin"
"aarch64-darwin" "x86_64-darwin"
"x86_64-darwin" ];
]; # This is a function that generates an attribute by calling a function you
# This is a function that generates an attribute by calling a function you # pass to it, with each system as an argument
# pass to it, with each system as an argument forAllSystems = nixpkgs.lib.genAttrs systems;
forAllSystems = nixpkgs.lib.genAttrs systems; vars = import ./vars.nix;
vars = import ./vars.nix; in {
in # Your custom packages
{ # Accessible through 'nix build', 'nix shell', etc
# Your custom packages packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
# Accessible through 'nix build', 'nix shell', etc # Formatter for your nix files, available through 'nix fmt'
packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); # Other options beside 'alejandra' include 'nixpkgs-fmt'
# Formatter for your nix files, available through 'nix fmt' formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
# Other options beside 'alejandra' include 'nixpkgs-fmt'
formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
# Your custom packages and modifications, exported as overlays # Your custom packages and modifications, exported as overlays
overlays = import ./overlays { inherit inputs; }; overlays = import ./overlays {inherit inputs;};
# Reusable nixos modules you might want to export # Reusable nixos modules you might want to export
# These are usually stuff you would upstream into nixpkgs # These are usually stuff you would upstream into nixpkgs
nixosModules = import ./modules/nixos; nixosModules = import ./modules/nixos;
# Reusable home-manager modules you might want to export # Reusable home-manager modules you might want to export
# These are usually stuff you would upstream into home-manager # These are usually stuff you would upstream into home-manager
homeManagerModules = import ./modules/home-manager; homeManagerModules = import ./modules/home-manager;
# NixOS configuration entrypoint # NixOS configuration entrypoint
# Available through 'nixos-rebuild --flake .#your-hostname' # Available through 'nixos-rebuild --flake .#your-hostname'
nixosConfigurations = { nixosConfigurations = {
adalbert = nixpkgs.lib.nixosSystem { adalbert = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs outputs vars; }; specialArgs = {inherit inputs outputs vars;};
modules = [
./hosts/adalbert
];
};
ludwig = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs outputs vars; };
modules = [
./hosts/ludwig
];
};
leopold = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs outputs vars; };
modules = [
./hosts/leopold
];
};
franz = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs outputs vars; };
modules = [
./hosts/franz
];
};
# build with nix build .#nixosConfigurations.eustachius.config.system.build.sdImage
eustachius = nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
modules = [
"${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix"
./hosts/eustachius
# extra config for sdImage generator
{
sdImage.compressImage = false;
}
];
};
};
# Standalone home-manager configuration entrypoint
# Available through 'home-manager --flake .#your-username@your-hostname'
homeConfigurations = {
"${vars.user}@adalbert" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = { inherit inputs outputs vars; };
modules = [
./home/adalbert.nix
];
};
};
"${vars.user}@ludwig" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = { inherit inputs outputs vars; };
modules = [ modules = [
./home/ludwig.nix ./hosts/adalbert
]; ];
}; };
"${vars.user}@franz" = home-manager.lib.homeManagerConfiguration { ludwig = nixpkgs.lib.nixosSystem {
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance specialArgs = {inherit inputs outputs vars;};
extraSpecialArgs = { inherit inputs outputs vars; };
modules = [ modules = [
./home/franz.nix ./hosts/ludwig
];
};
leopold = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs vars;};
modules = [
./hosts/leopold
];
};
franz = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs vars;};
modules = [
./hosts/franz
];
};
# build with nix build .#nixosConfigurations.eustachius.config.system.build.sdImage
eustachius = nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
modules = [
"${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix"
./hosts/eustachius
# extra config for sdImage generator
{
sdImage.compressImage = false;
}
]; ];
}; };
# "${vars.user}@eustachius" = home-manager.lib.homeManagerConfiguration {
# pkgs = nixpkgs.legacyPackages.aarch64-linux; # Home-manager requires 'pkgs' instance
# extraSpecialArgs = {inherit inputs outputs vars;};
# modules = [
# ./home/eustachius.nix
# ];
# };
}; };
# Standalone home-manager configuration entrypoint
# Available through 'home-manager --flake .#your-username@your-hostname'
homeConfigurations = {
"${vars.user}@adalbert" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = {inherit inputs outputs vars;};
modules = [
./home/adalbert.nix
];
};
};
"${vars.user}@ludwig" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = {inherit inputs outputs vars;};
modules = [
./home/ludwig.nix
];
};
"${vars.user}@franz" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = {inherit inputs outputs vars;};
modules = [
./home/franz.nix
];
};
# "${vars.user}@eustachius" = home-manager.lib.homeManagerConfiguration {
# pkgs = nixpkgs.legacyPackages.aarch64-linux; # Home-manager requires 'pkgs' instance
# extraSpecialArgs = {inherit inputs outputs vars;};
# modules = [
# ./home/eustachius.nix
# ];
# };
};
} }

View file

@ -17,6 +17,7 @@
key = "<leader>ch"; key = "<leader>ch";
action = "<cmd>noh<CR>"; action = "<cmd>noh<CR>";
options = { options = {
silent = true;
desc = "Clear Highlighting"; desc = "Clear Highlighting";
}; };
} }
@ -41,6 +42,7 @@
key = "<C-n>"; key = "<C-n>";
action = "<Cmd>Neotree toggle<CR>"; action = "<Cmd>Neotree toggle<CR>";
options = { options = {
silent = true;
desc = "Toggle Neotree"; desc = "Toggle Neotree";
}; };
} }
@ -81,6 +83,7 @@
key = "<c-k>"; key = "<c-k>";
action = ":wincmd k<CR>"; action = ":wincmd k<CR>";
options = { options = {
silent = true;
desc = "Go Up"; desc = "Go Up";
}; };
} }
@ -89,6 +92,7 @@
key = "<c-j>"; key = "<c-j>";
action = ":wincmd j<CR>"; action = ":wincmd j<CR>";
options = { options = {
silent = true;
desc = "Go Down"; desc = "Go Down";
}; };
} }
@ -97,6 +101,7 @@
key = "<c-h>"; key = "<c-h>";
action = ":wincmd h<CR>"; action = ":wincmd h<CR>";
options = { options = {
silent = true;
desc = "Go Left"; desc = "Go Left";
}; };
} }
@ -105,6 +110,7 @@
key = "<c-l>"; key = "<c-l>";
action = ":wincmd l<CR>"; action = ":wincmd l<CR>";
options = { options = {
silent = true;
desc = "Go Right"; desc = "Go Right";
}; };
} }

View file

@ -1,24 +1,28 @@
{ {
programs.nixvim.plugins.lsp = { programs.nixvim.plugins = {
enable = true; rustaceanvim.enable = true;
inlayHints = true;
servers = { lsp = {
ts_ls.enable = true; # TS/JS enable = true;
cssls.enable = true; # CSS inlayHints = true;
html.enable = true; # HTML
pyright.enable = true; # Python
marksman.enable = true; # Markdown
nil_ls.enable = true; # Nix
dockerls.enable = true; # Docker
bashls.enable = true; # Bash
clangd.enable = true; # C/C++
yamlls.enable = true; # YAML
lua_ls = { servers = {
# Lua ts_ls.enable = true; # TS/JS
enable = true; cssls.enable = true; # CSS
settings.telemetry.enable = false; html.enable = true; # HTML
pyright.enable = true; # Python
marksman.enable = true; # Markdown
nil_ls.enable = true; # Nix
dockerls.enable = true; # Docker
bashls.enable = true; # Bash
clangd.enable = true; # C/C++
yamlls.enable = true; # YAML
lua_ls = {
# Lua
enable = true;
settings.telemetry.enable = false;
};
}; };
}; };
}; };

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { {pkgs, ...}: {
programs.nixvim.plugins = { programs.nixvim.plugins = {
lualine.enable = true; lualine.enable = true;
oil.enable = true; oil.enable = true;
@ -87,12 +87,12 @@
todo-comments = { todo-comments = {
enable = true; enable = true;
settings.colors = { settings.colors = {
error = [ "DiagnosticError" "ErrorMsg" "#DC2626" ]; error = ["DiagnosticError" "ErrorMsg" "#DC2626"];
warning = [ "DiagnosticWarn" "WarningMsg" "#FBBF24" ]; warning = ["DiagnosticWarn" "WarningMsg" "#FBBF24"];
info = [ "DiagnosticInfo" "#2563EB" ]; info = ["DiagnosticInfo" "#2563EB"];
hint = [ "DiagnosticHint" "#10B981" ]; hint = ["DiagnosticHint" "#10B981"];
default = [ "Identifier" "#7C3AED" ]; default = ["Identifier" "#7C3AED"];
test = [ "Identifier" "#FF00FF" ]; test = ["Identifier" "#FF00FF"];
}; };
}; };

View file

@ -1,9 +1,10 @@
{ inputs {
, pkgs inputs,
, vars pkgs,
, ... vars,
...
}: { }: {
imports = [ inputs.arkenfox.hmModules.default ]; imports = [inputs.arkenfox.hmModules.default];
home.file.".mozilla/native-messaging-hosts/org.kde.plasma.browser_integration.json".source = "${pkgs.plasma5Packages.plasma-browser-integration}/lib/mozilla/native-messaging-hosts/org.kde.plasma.browser_integration.json"; home.file.".mozilla/native-messaging-hosts/org.kde.plasma.browser_integration.json".source = "${pkgs.plasma5Packages.plasma-browser-integration}/lib/mozilla/native-messaging-hosts/org.kde.plasma.browser_integration.json";
programs.firefox = { programs.firefox = {
@ -47,7 +48,7 @@
]; ];
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@np" ]; definedAliases = ["@np"];
}; };
"Home Manager" = { "Home Manager" = {
@ -64,7 +65,7 @@
]; ];
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@hm" ]; definedAliases = ["@hm"];
}; };
"Searx" = { "Searx" = {
@ -81,7 +82,7 @@
]; ];
iconUpdateURL = "https://paulgo.io/favicon.ico"; iconUpdateURL = "https://paulgo.io/favicon.ico";
definedAliases = [ "@sx" ]; definedAliases = ["@sx"];
}; };
"Amazon" = { "Amazon" = {
@ -98,7 +99,7 @@
]; ];
iconUpdateURL = "https://amazon.de/favicon.ico"; iconUpdateURL = "https://amazon.de/favicon.ico";
definedAliases = [ "@a" ]; definedAliases = ["@a"];
}; };
"YouTube" = { "YouTube" = {
@ -115,7 +116,7 @@
]; ];
iconUpdateURL = "https://piped.video/favicon.ico"; iconUpdateURL = "https://piped.video/favicon.ico";
definedAliases = [ "yt" ]; definedAliases = ["yt"];
}; };
}; };
search.force = true; search.force = true;
@ -190,9 +191,9 @@
}; };
xdg.mimeApps.defaultApplications = { xdg.mimeApps.defaultApplications = {
"text/html" = [ "firefox.desktop" ]; "text/html" = ["firefox.desktop"];
"text/xml" = [ "firefox.desktop" ]; "text/xml" = ["firefox.desktop"];
"x-scheme-handler/http" = [ "firefox.desktop" ]; "x-scheme-handler/http" = ["firefox.desktop"];
"x-scheme-handler/https" = [ "firefox.desktop" ]; "x-scheme-handler/https" = ["firefox.desktop"];
}; };
} }

View file

@ -1,17 +1,21 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
]; pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.initrd.kernelModules = ["dm-snapshot"];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's