Alejandra for code formatting; Formatting

This commit is contained in:
xqtc161 2024-03-09 12:21:37 +01:00
parent 741846c7f2
commit 9a79731723
20 changed files with 851 additions and 729 deletions

View file

@ -1,7 +1,9 @@
{ config, lib, inputs, pkgs, ... }:
{ {
nixpkgs.config.permittedInsecurePackages = [ config,
"electron-25.9.0" lib,
"electron-24.8.6" inputs,
]; pkgs,
...
}: {
nixpkgs.config.permittedInsecurePackages = ["electron-25.9.0" "electron-24.8.6"];
} }

View file

@ -18,19 +18,31 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs @ {self, nixpkgs, nixpkgs-master, firefox-addons, home-manager, nixos-hardware, nixvim, ...}: let outputs = inputs @ {
self,
nixpkgs,
nixpkgs-master,
firefox-addons,
home-manager,
nixos-hardware,
nixvim,
...
}: let
lib = nixpkgs.lib; lib = nixpkgs.lib;
util = (import ./overlays/util.nix {} {}).util; util = (import ./overlays/util.nix {} {}).util;
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { inherit system; overlays = pkgs = import nixpkgs {
util.nixFilesIn ./overlays; };
in {
nixosConfigurations = pkgs.util.mapHostAttrs (host: host) (host: lib.nixosSystem {
inherit system; inherit system;
modules = [ overlays = util.nixFilesIn ./overlays;
./hosts/${host} };
]; in {
specialArgs = { inherit inputs; }; nixosConfigurations = pkgs.util.mapHostAttrs (host: host) (host:
lib.nixosSystem {
inherit system;
modules = [./hosts/${host}];
specialArgs = {inherit inputs;};
}); });
formatter.x86_64-linux =
inputs.nixpkgs.legacyPackages.x86_64-linux.alejandra;
}; };
} }

View file

@ -1,6 +1,10 @@
{ config, pkgs, lib, inputs, ... }:
{ {
config,
pkgs,
lib,
inputs,
...
}: {
imports = [ imports = [
./modules/nixvim.nix ./modules/nixvim.nix
./modules/firefox.nix ./modules/firefox.nix
@ -19,9 +23,7 @@
extraConfig = builtins.readFile ./config-files/wezterm.lua; extraConfig = builtins.readFile ./config-files/wezterm.lua;
}; };
programs.joshuto = { programs.joshuto = {enable = true;};
enable = true;
};
programs = { programs = {
zsh.enable = true; zsh.enable = true;
@ -32,11 +34,10 @@
eza.enable = true; eza.enable = true;
nushell = { nushell = {
enable = true; enable = true;
shellAliases = { shellAliases = {ls = "eza -l --icons --group-directories-first";};
ls = "eza -l --icons --group-directories-first";
};
extraConfig = "uwufetch --image"; extraConfig = "uwufetch --image";
configFile = { text = '' configFile = {
text = ''
$env.config = { $env.config = {
show_banner: false show_banner: false
} }
@ -45,16 +46,15 @@
}; };
carapace.enable = true; carapace.enable = true;
carapace.enableNushellIntegration = true; carapace.enableNushellIntegration = true;
starship = starship = let
let
flavour = "mocha"; flavour = "mocha";
in in {
{
enable = true; enable = true;
enableNushellIntegration = true; enableNushellIntegration = true;
enableBashIntegration = true; enableBashIntegration = true;
enableZshIntegration = true; enableZshIntegration = true;
settings = { settings =
{
# Other config here # Other config here
character = { character = {
success_symbol = "[λ::](bold green)"; success_symbol = "[λ::](bold green)";
@ -72,17 +72,18 @@
disabled = false; disabled = false;
}; };
right_format = "$all"; right_format = "$all";
format = ''$username$hostname in $directory format = ''
$character''; $username$hostname in $directory
$character'';
palette = "catppuccin_${flavour}"; palette = "catppuccin_${flavour}";
} // builtins.fromTOML (builtins.readFile }
(pkgs.fetchFromGitHub // builtins.fromTOML (builtins.readFile (pkgs.fetchFromGitHub {
{
owner = "catppuccin"; owner = "catppuccin";
repo = "starship"; repo = "starship";
rev = "5629d2356f62a9f2f8efad3ff37476c19969bd4f"; # Replace with the latest commit hash rev = "5629d2356f62a9f2f8efad3ff37476c19969bd4f"; # Replace with the latest commit hash
sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0="; sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=";
} + /palettes/${flavour}.toml)); }
+ /palettes/${flavour}.toml));
}; };
}; };
dconf.enable = true; dconf.enable = true;
@ -98,9 +99,9 @@ $character'';
theme = { theme = {
name = "Catppuccin-Mocha-Compact-Pink-Dark"; name = "Catppuccin-Mocha-Compact-Pink-Dark";
package = pkgs.catppuccin-gtk.override { package = pkgs.catppuccin-gtk.override {
accents = [ "pink" ]; accents = ["pink"];
size = "compact"; size = "compact";
tweaks = [ "rimless" ]; tweaks = ["rimless"];
variant = "mocha"; variant = "mocha";
}; };
}; };
@ -108,17 +109,9 @@ $character'';
home.sessionVariables.DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox"; home.sessionVariables.DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox";
home.file."~/.local/share/fonts/AppleColorEmoji.ttf".source = ./config-files/AppleColorEmoji.ttf; home.file."~/.local/share/fonts/AppleColorEmoji.ttf".source =
./config-files/AppleColorEmoji.ttf;
#programs.firefox = {
# enable = true;
# package = pkgs.firefox.override {
# cfg = {
# enableGnomeExtensions = true;
# };
# };
#};
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = pkgs.hyprland; package = pkgs.hyprland;
@ -136,14 +129,12 @@ $character'';
layer = "top"; layer = "top";
position = "top"; position = "top";
height = 30; height = 30;
modules-left = [ "hyprland/workspaces" ]; modules-left = ["hyprland/workspaces"];
#modules-center = [ "hyprland/window" ]; #modules-center = [ "hyprland/window" ];
modules-right = [ "tray" "network" "battery" "battery#bat2" "clock" ]; modules-right = ["tray" "network" "battery" "battery#bat2" "clock"];
"tray" = { "tray" = {"icon-size" = 21;};
"icon-size" = 21;
};
"network" = { "network" = {
"format-wifi"= "NET: {essid} ({signalStrength}%) "; "format-wifi" = "NET: {essid} ({signalStrength}%) ";
"format-ethernet" = "{ifname} "; "format-ethernet" = "{ifname} ";
"format-disconnected" = ""; "format-disconnected" = "";
"max-length" = 50; "max-length" = 50;
@ -182,9 +173,7 @@ $character'';
textColor = "#cdd6f4"; textColor = "#cdd6f4";
}; };
services.easyeffects = { services.easyeffects = {enable = true;};
enable = true;
};
home.packages = with pkgs; [ home.packages = with pkgs; [
neofetch neofetch

View file

@ -1,16 +1,17 @@
{ inputs, outputs, config, pkgs, ... }:
with inputs;
{ {
inputs,
outputs,
config,
pkgs,
...
}:
with inputs; {
home.sessionVariables.DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox"; home.sessionVariables.DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox";
programs.firefox = { programs.firefox = {
enable = true; enable = true;
package = pkgs.firefox.override { package =
cfg = { pkgs.firefox.override {cfg = {enableGnomeExtensions = true;};};
enableGnomeExtensions = true;
};
};
profiles.xqtc = { profiles.xqtc = {
isDefault = true; isDefault = true;
extensions = with inputs.firefox-addons.packages.${pkgs.system}; [ extensions = with inputs.firefox-addons.packages.${pkgs.system}; [
@ -27,43 +28,68 @@ with inputs;
force = true; force = true;
engines = { engines = {
"SearX" = { "SearX" = {
urls = [{ urls = [
{
template = "https://searx.org/search"; template = "https://searx.org/search";
params = [ params = [
{ name = "q"; value = "{searchTerms}"; } {
name = "q";
value = "{searchTerms}";
}
];
}
]; ];
}];
}; };
"Nix Packages" = { "Nix Packages" = {
urls = [{ urls = [
{
template = "https://search.nixos.org/packages"; template = "https://search.nixos.org/packages";
params = [ params = [
{ name = "type"; value = "packages"; } {
{ name = "query"; value = "{searchTerms}"; } name = "type";
value = "packages";
}
{
name = "query";
value = "{searchTerms}";
}
];
}
]; ];
}];
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"];
}; };
"Nix Options" = { "Nix Options" = {
urls = [{ urls = [
{
template = "https://search.nixos.org/options"; template = "https://search.nixos.org/options";
params = [ params = [
{ name = "type"; value = "options"; } {
{ name = "query"; value = "{searchTerms}"; } name = "type";
value = "options";
}
{
name = "query";
value = "{searchTerms}";
}
];
}
]; ];
}];
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 = [ "@no" ]; definedAliases = ["@no"];
}; };
"NixOS Wiki" = { "NixOS Wiki" = {
urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }]; urls = [
{
template = "https://nixos.wiki/index.php?search={searchTerms}";
}
];
iconUpdateURL = "https://nixos.wiki/favicon.png"; iconUpdateURL = "https://nixos.wiki/favicon.png";
updateInterval = 24 * 60 * 60 * 1000; # every day updateInterval = 24 * 60 * 60 * 1000; # every day
definedAliases = [ "@nw" ]; definedAliases = ["@nw"];
}; };
"Bing".metaData.hidden = true; "Bing".metaData.hidden = true;
@ -82,13 +108,16 @@ with inputs;
"browser.theme.toolbar-theme" = "0"; "browser.theme.toolbar-theme" = "0";
"browser.newtabpage.activity-stream.showSponsored" = false; "browser.newtabpage.activity-stream.showSponsored" = false;
"browser.newtabpage.activity-stream.showSponsoredTopSites" = false; "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
"services.sync.prefs.sync.browser.newtabpage.activity-stream.showSponsored" = false; "services.sync.prefs.sync.browser.newtabpage.activity-stream.showSponsored" =
"services.sync.prefs.sync.browser.newtabpage.activity-stream.showSponsoredTopSites" = false; false;
"services.sync.prefs.sync.browser.newtabpage.activity-stream.showSponsoredTopSites" =
false;
"browser.toolbars.bookmarks.visibility" = "never"; "browser.toolbars.bookmarks.visibility" = "never";
"general.useragent.locale" = "de-DE"; "general.useragent.locale" = "de-DE";
"distribution.searchplugins.defaultLocale" = "de-DE"; "distribution.searchplugins.defaultLocale" = "de-DE";
"signon.rememberSignons" = false; "signon.rememberSignons" = false;
"toolkit.legacyUserProfileCustomizations.stylesheets" = true; # Needed to allow userChrome.css "toolkit.legacyUserProfileCustomizations.stylesheets" =
true; # Needed to allow userChrome.css
}; };
userChrome = '' userChrome = ''
@import "firefox-gnome-theme/userChrome.css"; @import "firefox-gnome-theme/userChrome.css";

View file

@ -1,12 +1,16 @@
{ pkgs, lib, config, inputs, outputs, ... }:
{ {
pkgs,
lib,
config,
inputs,
outputs,
...
}: {
programs.nixvim = { programs.nixvim = {
enable = true; enable = true;
globals.mapleader = " "; globals.mapleader = " ";
extraConfigLua = builtins.readFile ../config-files/nvim/init.lua; extraConfigLua = builtins.readFile ../config-files/nvim/init.lua;
extraPlugins = with pkgs.vimPlugins; [ extraPlugins = with pkgs.vimPlugins; [headlines-nvim];
headlines-nvim
];
clipboard.providers.wl-copy.enable = true; clipboard.providers.wl-copy.enable = true;
@ -23,10 +27,9 @@
enable = true; enable = true;
dir = "~/Documents/Obsidian Vault/"; dir = "~/Documents/Obsidian Vault/";
}; };
indent-blankline.enable = true;
lualine.enable = true; lualine.enable = true;
lsp-format = { lsp-format = {enable = true;};
enable = true;
};
lsp = { lsp = {
enable = true; enable = true;
servers = { servers = {
@ -89,14 +92,12 @@
end end
end end
''; '';
modes = [ "i" "s" ]; modes = ["i" "s"];
}; };
}; };
}; };
telescope.enable = true; telescope.enable = true;
telescope.extensions = { telescope.extensions = {file_browser.enable = true;};
file_browser.enable = true;
};
which-key.enable = true; which-key.enable = true;
cmp-nvim-lsp.enable = true; cmp-nvim-lsp.enable = true;
cmp-nvim-lua.enable = true; cmp-nvim-lua.enable = true;
@ -159,17 +160,17 @@
{ {
mode = "n"; mode = "n";
key = "<leader>P"; key = "<leader>P";
action = "\"+p"; action = ''"+p'';
} }
{ {
mode = [ "n" "v" ]; mode = ["n" "v"];
key = "<leader>y"; key = "<leader>y";
action = "[[\"+y]]"; action = ''[["+y]]'';
} }
{ {
mode = [ "n" ]; mode = ["n"];
key = "<leader>Y"; key = "<leader>Y";
action = "[[\"+Y]]"; action = ''[["+Y]]'';
} }
]; ];
}; };

68
home/modules/shell.nix Normal file
View file

@ -0,0 +1,68 @@
{
config,
pkgs,
inputs,
...
}: {
programs = {
zsh.enable = true;
atuin = {
enable = true;
enableNushellIntegration = true;
};
eza.enable = true;
nushell = {
enable = true;
shellAliases = {ls = "eza -l --icons --group-directories-first";};
extraConfig = "uwufetch --image";
configFile = {
text = ''
$env.config = {
show_banner: false
}
'';
};
};
carapace.enable = true;
carapace.enableNushellIntegration = true;
starship = let
flavour = "mocha";
in {
enable = true;
enableNushellIntegration = true;
enableBashIntegration = true;
enableZshIntegration = true;
settings =
{
# Other config here
character = {
success_symbol = "[λ::](bold green)";
error_symbol = "[λ::](bold red)";
};
username = {
style_user = "bold pink";
format = "[$user]($style)";
show_always = true;
disabled = false;
};
hostname = {
ssh_only = false;
format = "[ 🏳 ](bold pink)[$hostname](bold flamingo)";
disabled = false;
};
right_format = "$all";
format = ''
$username$hostname in $directory
$character'';
palette = "catppuccin_${flavour}";
}
// builtins.fromTOML (builtins.readFile (pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "starship";
rev = "5629d2356f62a9f2f8efad3ff37476c19969bd4f"; # Replace with the latest commit hash
sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=";
}
+ /palettes/${flavour}.toml));
};
};
}

View file

@ -1,7 +1,11 @@
{ inputs, lib, config, pkgs, ...}:
{ {
age.identityPaths = [ "${config.home.homeDirectory}/.ssh/agenix" ]; # Use this key to decrypt inputs,
lib,
config,
pkgs,
...
}: {
age.identityPaths = ["${config.home.homeDirectory}/.ssh/agenix"]; # Use this key to decrypt
home.packages = [ home.packages = [
inputs.agenix.packages.x86_64-linux.default # Install CLI tool to encrypt inputs.agenix.packages.x86_64-linux.default # Install CLI tool to encrypt
]; ];

View file

@ -1,7 +1,6 @@
let let
xqtc = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFecbWOhXR4z1wrrI5onn4SFGtu/lfsOblreuRWcbLug"; xqtc = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFecbWOhXR4z1wrrI5onn4SFGtu/lfsOblreuRWcbLug";
in in {
{ "xqtc_id_ed25519.age".publicKeys = [xqtc];
"xqtc_id_ed25519.age".publicKeys = [ xqtc ]; "xqtc_id_ed25519_pub.age".publicKeys = [xqtc];
"xqtc_id_ed25519_pub.age".publicKeys = [ xqtc ];
} }

View file

@ -1,10 +1,12 @@
{config, lib, pkgs, ...}:
{ {
config,
lib,
pkgs,
...
}: {
services.clamav = { services.clamav = {
updater.enable = true; updater.enable = true;
updater.settings = { updater.settings = {LogVerbose = true;};
LogVerbose = true;
};
updater.interval = "hourly"; updater.interval = "hourly";
daemon.enable = true; daemon.enable = true;
}; };

View file

@ -15,12 +15,15 @@
*/ */
{ config, inputs, lib, pkgs, ... }:
{ {
imports = config,
[ # Include the results of the hardware scan. inputs,
lib,
pkgs,
...
}: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
../../common ../../common
#../antivirus.nix #../antivirus.nix
@ -58,7 +61,8 @@
networking.hostName = "asmodeus"; # Define your hostname. networking.hostName = "asmodeus"; # Define your hostname.
# Pick only one of the below networking options. # Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. networking.networkmanager.enable =
true; # Easiest to use and most distros use this by default.
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
@ -113,11 +117,8 @@
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
users.users.xqtc = { users.users.xqtc = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "sudo" "docker" ]; # Enable sudo for the user. extraGroups = ["wheel" "sudo" "docker"]; # Enable sudo for the user.
packages = with pkgs; [ packages = with pkgs; [wezterm nushell];
wezterm
nushell
];
shell = pkgs.nushell; shell = pkgs.nushell;
}; };
@ -143,7 +144,6 @@
jellyfin jellyfin
jellyfin-web jellyfin-web
jellyfin-ffmpeg jellyfin-ffmpeg
]; ];
#programs.nix-ld.enable = true; #programs.nix-ld.enable = true;
@ -203,7 +203,7 @@
services.tailscale.enable = true; services.tailscale.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 2234 8096 8080 8082 ]; networking.firewall.allowedTCPPorts = [2234 8096 8080 8082];
# networking.firewall.allowedUDPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether. # Or disable the firewall altogether.
# networking.firewall.enable = false; # networking.firewall.enable = false;
@ -231,7 +231,5 @@
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "23.11"; # Did you read the comment?
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = ["nix-command" "flakes"];
} }

View file

@ -1,37 +1,39 @@
# 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 = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/5e34fc38-c199-4b85-b756-1c65ed7471fc"; device = "/dev/disk/by-uuid/5e34fc38-c199-4b85-b756-1c65ed7471fc";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/C3D3-9E29"; device = "/dev/disk/by-uuid/C3D3-9E29";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/mnt/HDD1" = fileSystems."/mnt/HDD1" = {
{ device = "/dev/disk/by-uuid/bc68de4c-ad5c-4016-ac11-65de448949fe"; device = "/dev/disk/by-uuid/bc68de4c-ad5c-4016-ac11-65de448949fe";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/mnt/HDD2" = fileSystems."/mnt/HDD2" = {
{ device = "/dev/disk/by-uuid/c37bc41d-8d92-4b7e-ac45-3420804d086c"; device = "/dev/disk/by-uuid/c37bc41d-8d92-4b7e-ac45-3420804d086c";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = [ ]; swapDevices = [];
# 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
@ -42,5 +44,6 @@
# networking.interfaces.wlo1.useDHCP = lib.mkDefault true; # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

View file

@ -1,5 +1,4 @@
{ config, ... }: {config, ...}: {
{
nix.gc = { nix.gc = {
automatic = true; automatic = true;
dates = "daily"; dates = "daily";

View file

@ -13,12 +13,14 @@
*/ */
{ config, lib, pkgs, ... }:
{ {
imports = config,
[ # Include the results of the hardware scan. lib,
pkgs,
...
}: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
@ -48,11 +50,7 @@
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;
powerOnBoot = true; powerOnBoot = true;
settings = { settings = {General = {Enable = "Source,Sink,Media,Socket";};};
General = {
Enable = "Source,Sink,Media,Socket";
};
};
}; };
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
@ -64,7 +62,8 @@
networking.hostName = "lambda"; # Define your hostname. networking.hostName = "lambda"; # Define your hostname.
# Pick only one of the below networking options. # Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. networking.networkmanager.enable =
true; # Easiest to use and most distros use this by default.
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
@ -111,11 +110,8 @@
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
users.users.xqtc = { users.users.xqtc = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" ]; # Enable sudo for the user. extraGroups = ["wheel"]; # Enable sudo for the user.
packages = with pkgs; [ packages = with pkgs; [wezterm nushell];
wezterm
nushell
];
shell = pkgs.nushell; shell = pkgs.nushell;
}; };
@ -146,7 +142,7 @@
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
}; };
services.udev.packages = [ pkgs.yubikey-personalization ]; services.udev.packages = [pkgs.yubikey-personalization];
services.pcscd.enable = true; services.pcscd.enable = true;
# List services that you want to enable: # List services that you want to enable:
@ -169,7 +165,7 @@
services.tailscale.enable = true; services.tailscale.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 8080 5173 ]; networking.firewall.allowedTCPPorts = [8080 5173];
# networking.firewall.allowedUDPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether. # Or disable the firewall altogether.
# networking.firewall.enable = false; # networking.firewall.enable = false;
@ -197,7 +193,5 @@
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "23.11"; # Did you read the comment?
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = ["nix-command" "flakes"];
} }

View file

@ -1,31 +1,31 @@
# 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" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/0b6d9cc6-88a7-45b4-b79e-81496f480e7c"; device = "/dev/disk/by-uuid/0b6d9cc6-88a7-45b4-b79e-81496f480e7c";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/6F98-B5D8"; device = "/dev/disk/by-uuid/6F98-B5D8";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices = [{device = "/dev/disk/by-uuid/6cf4542a-9611-4a15-83df-12e3ec91b673";}];
[ { device = "/dev/disk/by-uuid/6cf4542a-9611-4a15-83df-12e3ec91b673"; }
];
# 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
@ -35,5 +35,6 @@
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

View file

@ -1,8 +1,12 @@
{ config, lib, inputs, pkgs, ... }:
{ {
imports = config,
[ # Include the results of the hardware scan. lib,
inputs,
pkgs,
...
}: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
../../common ../../common
#../antivirus.nix #../antivirus.nix
@ -24,11 +28,7 @@
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;
powerOnBoot = true; powerOnBoot = true;
settings = { settings = {General = {Enable = "Source,Sink,Media,Socket";};};
General = {
Enable = "Source,Sink,Media,Socket";
};
};
}; };
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
@ -56,7 +56,8 @@
networking.hostName = "lilith"; # Define your hostname. networking.hostName = "lilith"; # Define your hostname.
# Pick only one of the below networking options. # Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. networking.networkmanager.enable =
true; # Easiest to use and most distros use this by default.
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
@ -123,11 +124,8 @@
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
users.users.xqtc = { users.users.xqtc = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "libvirtd" ]; # Enable sudo for the user. extraGroups = ["wheel" "libvirtd"]; # Enable sudo for the user.
packages = with pkgs; [ packages = with pkgs; [nushell clamtk];
nushell
clamtk
];
shell = pkgs.nushell; shell = pkgs.nushell;
}; };
@ -163,7 +161,7 @@
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
}; };
services.udev.packages = [ pkgs.yubikey-personalization ]; services.udev.packages = [pkgs.yubikey-personalization];
services.pcscd.enable = true; services.pcscd.enable = true;
programs.dconf.enable = true; programs.dconf.enable = true;
@ -199,11 +197,10 @@
}; };
#networking.wireguard.enable = true; #networking.wireguard.enable = true;
services.tailscale.enable = true; services.tailscale.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 22 2234 8080 5173 ]; networking.firewall.allowedTCPPorts = [22 2234 8080 5173];
# networking.firewall.allowedUDPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether. # Or disable the firewall altogether.
# networking.firewall.enable = false; # networking.firewall.enable = false;
@ -231,7 +228,5 @@
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "23.11"; # Did you read the comment?
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = ["nix-command" "flakes"];
} }

View file

@ -1,29 +1,31 @@
# 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" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.initrd.kernelModules = ["dm-snapshot"];
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/a73b1d2a-cdeb-40e7-9200-b6243aad03e0"; device = "/dev/disk/by-uuid/a73b1d2a-cdeb-40e7-9200-b6243aad03e0";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/AA05-0A9A"; device = "/dev/disk/by-uuid/AA05-0A9A";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ ]; swapDevices = [];
# 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
@ -35,5 +37,6 @@
# networking.interfaces.wwp0s20f0u6.useDHCP = lib.mkDefault true; # networking.interfaces.wwp0s20f0u6.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

View file

@ -1,8 +1,12 @@
{ config, inputs, lib, pkgs, ... }:
{ {
imports = config,
[ # Include the results of the hardware scan. inputs,
lib,
pkgs,
...
}: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
../../modules/home-manager.nix ../../modules/home-manager.nix
../../common ../../common
@ -10,7 +14,7 @@
../gc.nix ../gc.nix
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = ["nix-command" "flakes"];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
@ -20,7 +24,8 @@
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
#networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. #networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; }; intel-vaapi-driver =
pkgs.intel-vaapi-driver.override {enableHybridCodec = true;};
}; };
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
@ -31,7 +36,9 @@
libvdpau-va-gl libvdpau-va-gl
]; ];
}; };
environment.sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; }; # Force intel-media-driver environment.sessionVariables = {
LIBVA_DRIVER_NAME = "iHD";
}; # Force intel-media-driver
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
@ -51,9 +58,6 @@
# Enable the X11 windowing system. # Enable the X11 windowing system.
#services.xserver.enable = true; #services.xserver.enable = true;
# Configure keymap in X11 # Configure keymap in X11
services.xserver.xkb.layout = "us"; services.xserver.xkb.layout = "us";
# services.xserver.xkb.options = "eurosign:e,caps:escape"; # services.xserver.xkb.options = "eurosign:e,caps:escape";
@ -71,10 +75,8 @@
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
users.users.xqtc = { users.users.xqtc = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" ]; # Enable sudo for the user. extraGroups = ["wheel"]; # Enable sudo for the user.
packages = with pkgs; [ packages = with pkgs; [tree];
tree
];
shell = pkgs.nushell; shell = pkgs.nushell;
}; };
@ -110,7 +112,6 @@
rpc-authentication-required = "true"; rpc-authentication-required = "true";
rpc-username = "xqtc"; rpc-username = "xqtc";
rpc-password = "Klavier2016"; rpc-password = "Klavier2016";
}; };
}; };
@ -149,7 +150,7 @@
services.openssh.enable = true; services.openssh.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 22 8096 9091 5001 ]; networking.firewall.allowedTCPPorts = [22 8096 9091 5001];
# networking.firewall.allowedUDPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether. # Or disable the firewall altogether.
# networking.firewall.enable = false; # networking.firewall.enable = false;
@ -176,6 +177,4 @@
# #
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "23.11"; # Did you read the comment?
} }

View file

@ -1,29 +1,40 @@
# 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"
"ehci_pci"
"ahci"
"firewire_ohci"
"usbhid"
"usb_storage"
"sd_mod"
"sdhci_pci"
]; ];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel" "wl"];
boot.extraModulePackages = [config.boot.kernelPackages.broadcom_sta];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "firewire_ohci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; fileSystems."/" = {
boot.initrd.kernelModules = [ ]; device = "/dev/disk/by-uuid/7317806c-aa54-460c-b094-18104496d245";
boot.kernelModules = [ "kvm-intel" "wl" ];
boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/7317806c-aa54-460c-b094-18104496d245";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/0AE9-6A7E"; device = "/dev/disk/by-uuid/0AE9-6A7E";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ ]; swapDevices = [];
# 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
@ -33,5 +44,6 @@
# networking.interfaces.enp1s0f0.useDHCP = lib.mkDefault true; # networking.interfaces.enp1s0f0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

View file

@ -1,14 +1,20 @@
{lib, inputs, ...}: { {
imports = [ inputs.home-manager.nixosModules.home-manager ]; lib,
inputs,
...
}: {
imports = [inputs.home-manager.nixosModules.home-manager];
config = { config = {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {inherit inputs;}; home-manager.extraSpecialArgs = {inherit inputs;};
home-manager.users.xqtc = {...}: {imports = [ home-manager.users.xqtc = {...}: {
imports = [
../home ../home
inputs.nixvim.homeManagerModules.nixvim inputs.nixvim.homeManagerModules.nixvim
#inputs.agenix.homeManagerModules.default #inputs.agenix.homeManagerModules.default
]; }; ];
};
}; };
} }

View file

@ -2,12 +2,18 @@ self: super: {
util = rec { util = rec {
dirEntries = path: builtins.attrNames (builtins.readDir path); dirEntries = path: builtins.attrNames (builtins.readDir path);
mapHosts = f: builtins.map f (dirEntries ../hosts); mapHosts = f: builtins.map f (dirEntries ../hosts);
mapHostAttrs = key_f: val_f: builtins.listToAttrs (mapHosts (host: {name = key_f host; value = val_f host;})); mapHostAttrs = key_f: val_f:
builtins.listToAttrs (mapHosts (host: {
name = key_f host;
value = val_f host;
}));
mapObjKeys = obj: f: builtins.map f (builtins.attrNames obj); mapObjKeys = obj: f: builtins.map f (builtins.attrNames obj);
mapKeys = obj: f: builtins.map f obj; mapKeys = obj: f: builtins.map f obj;
nixFilesIn = path: builtins.map nixFilesIn = path:
(e: import (path + /${e})) builtins.map (e: import (path + /${e}))
(builtins.filter (x: (builtins.match ".*\\.nix$" x) != null) (dirEntries path)); (builtins.filter (x: (builtins.match ".*\\.nix$" x) != null)
without = exclusions: list: builtins.filter (x: !builtins.elem x exclusions) list; (dirEntries path));
without = exclusions: list:
builtins.filter (x: !builtins.elem x exclusions) list;
}; };
} }