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

View file

@ -12,10 +12,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
hardware = {
url = "github:nixos/nixos-hardware";
inputs.nixpkgs.follows = "nixpkgs";
};
hardware.url = "github:nixos/nixos-hardware";
disko = {
url = "github:nix-community/disko";
@ -73,13 +70,12 @@
};
};
outputs =
{ self
, nixpkgs
, home-manager
, ...
} @ inputs:
let
outputs = {
self,
nixpkgs,
home-manager,
...
} @ inputs: let
inherit (self) outputs;
# Supported systems for your flake packages, shell, etc.
systems = [
@ -93,8 +89,7 @@
# pass to it, with each system as an argument
forAllSystems = nixpkgs.lib.genAttrs systems;
vars = import ./vars.nix;
in
{
in {
# Your custom packages
# Accessible through 'nix build', 'nix shell', etc
packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
@ -103,7 +98,7 @@
formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
# 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
# These are usually stuff you would upstream into nixpkgs
nixosModules = import ./modules/nixos;
@ -115,25 +110,25 @@
# Available through 'nixos-rebuild --flake .#your-hostname'
nixosConfigurations = {
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; };
specialArgs = {inherit inputs outputs vars;};
modules = [
./hosts/ludwig
];
};
leopold = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs outputs vars; };
specialArgs = {inherit inputs outputs vars;};
modules = [
./hosts/leopold
];
};
franz = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs outputs vars; };
specialArgs = {inherit inputs outputs vars;};
modules = [
./hosts/franz
];
@ -158,7 +153,7 @@
homeConfigurations = {
"${vars.user}@adalbert" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = { inherit inputs outputs vars; };
extraSpecialArgs = {inherit inputs outputs vars;};
modules = [
./home/adalbert.nix
];
@ -166,14 +161,14 @@
};
"${vars.user}@ludwig" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = { inherit inputs outputs vars; };
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; };
extraSpecialArgs = {inherit inputs outputs vars;};
modules = [
./home/franz.nix
];

View file

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

View file

@ -1,5 +1,8 @@
{
programs.nixvim.plugins.lsp = {
programs.nixvim.plugins = {
rustaceanvim.enable = true;
lsp = {
enable = true;
inlayHints = true;
@ -22,4 +25,5 @@
};
};
};
};
}

View file

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

View file

@ -1,9 +1,10 @@
{ inputs
, pkgs
, vars
, ...
{
inputs,
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";
programs.firefox = {
@ -47,7 +48,7 @@
];
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@np" ];
definedAliases = ["@np"];
};
"Home Manager" = {
@ -64,7 +65,7 @@
];
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@hm" ];
definedAliases = ["@hm"];
};
"Searx" = {
@ -81,7 +82,7 @@
];
iconUpdateURL = "https://paulgo.io/favicon.ico";
definedAliases = [ "@sx" ];
definedAliases = ["@sx"];
};
"Amazon" = {
@ -98,7 +99,7 @@
];
iconUpdateURL = "https://amazon.de/favicon.ico";
definedAliases = [ "@a" ];
definedAliases = ["@a"];
};
"YouTube" = {
@ -115,7 +116,7 @@
];
iconUpdateURL = "https://piped.video/favicon.ico";
definedAliases = [ "yt" ];
definedAliases = ["yt"];
};
};
search.force = true;
@ -190,9 +191,9 @@
};
xdg.mimeApps.defaultApplications = {
"text/html" = [ "firefox.desktop" ];
"text/xml" = [ "firefox.desktop" ];
"x-scheme-handler/http" = [ "firefox.desktop" ];
"x-scheme-handler/https" = [ "firefox.desktop" ];
"text/html" = ["firefox.desktop"];
"text/xml" = ["firefox.desktop"];
"x-scheme-handler/http" = ["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
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = ["dm-snapshot"];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
# 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