mirror of
https://git.gay/xqtc/nixos-config
synced 2024-11-22 02:20:32 +01:00
Alejandra for code formatting; Formatting
This commit is contained in:
parent
741846c7f2
commit
9a79731723
|
|
@ -1,7 +1,9 @@
|
|||
{ config, lib, inputs, pkgs, ... }:
|
||||
{
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"electron-25.9.0"
|
||||
"electron-24.8.6"
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
nixpkgs.config.permittedInsecurePackages = ["electron-25.9.0" "electron-24.8.6"];
|
||||
}
|
||||
|
|
|
|||
28
flake.nix
28
flake.nix
|
|
@ -18,19 +18,31 @@
|
|||
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;
|
||||
util = (import ./overlays/util.nix {} {}).util;
|
||||
system = "x86_64-linux";
|
||||
pkgs = import nixpkgs { inherit system; overlays =
|
||||
util.nixFilesIn ./overlays; };
|
||||
in {
|
||||
nixosConfigurations = pkgs.util.mapHostAttrs (host: host) (host: lib.nixosSystem {
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
modules = [
|
||||
./hosts/${host}
|
||||
];
|
||||
overlays = util.nixFilesIn ./overlays;
|
||||
};
|
||||
in {
|
||||
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;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
{ config, pkgs, lib, inputs, ... }:
|
||||
{
|
||||
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./modules/nixvim.nix
|
||||
./modules/firefox.nix
|
||||
|
|
@ -19,9 +23,7 @@
|
|||
extraConfig = builtins.readFile ./config-files/wezterm.lua;
|
||||
};
|
||||
|
||||
programs.joshuto = {
|
||||
enable = true;
|
||||
};
|
||||
programs.joshuto = {enable = true;};
|
||||
|
||||
programs = {
|
||||
zsh.enable = true;
|
||||
|
|
@ -32,11 +34,10 @@
|
|||
eza.enable = true;
|
||||
nushell = {
|
||||
enable = true;
|
||||
shellAliases = {
|
||||
ls = "eza -l --icons --group-directories-first";
|
||||
};
|
||||
shellAliases = {ls = "eza -l --icons --group-directories-first";};
|
||||
extraConfig = "uwufetch --image";
|
||||
configFile = { text = ''
|
||||
configFile = {
|
||||
text = ''
|
||||
$env.config = {
|
||||
show_banner: false
|
||||
}
|
||||
|
|
@ -45,16 +46,15 @@
|
|||
};
|
||||
carapace.enable = true;
|
||||
carapace.enableNushellIntegration = true;
|
||||
starship =
|
||||
let
|
||||
starship = let
|
||||
flavour = "mocha";
|
||||
in
|
||||
{
|
||||
in {
|
||||
enable = true;
|
||||
enableNushellIntegration = true;
|
||||
enableBashIntegration = true;
|
||||
enableZshIntegration = true;
|
||||
settings = {
|
||||
settings =
|
||||
{
|
||||
# Other config here
|
||||
character = {
|
||||
success_symbol = "[λ::](bold green)";
|
||||
|
|
@ -72,17 +72,18 @@
|
|||
disabled = false;
|
||||
};
|
||||
right_format = "$all";
|
||||
format = ''$username$hostname in $directory
|
||||
format = ''
|
||||
$username$hostname in $directory
|
||||
$character'';
|
||||
palette = "catppuccin_${flavour}";
|
||||
} // builtins.fromTOML (builtins.readFile
|
||||
(pkgs.fetchFromGitHub
|
||||
{
|
||||
}
|
||||
// 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));
|
||||
}
|
||||
+ /palettes/${flavour}.toml));
|
||||
};
|
||||
};
|
||||
dconf.enable = true;
|
||||
|
|
@ -108,17 +109,9 @@ $character'';
|
|||
|
||||
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 = {
|
||||
enable = true;
|
||||
package = pkgs.hyprland;
|
||||
|
|
@ -139,9 +132,7 @@ $character'';
|
|||
modules-left = ["hyprland/workspaces"];
|
||||
#modules-center = [ "hyprland/window" ];
|
||||
modules-right = ["tray" "network" "battery" "battery#bat2" "clock"];
|
||||
"tray" = {
|
||||
"icon-size" = 21;
|
||||
};
|
||||
"tray" = {"icon-size" = 21;};
|
||||
"network" = {
|
||||
"format-wifi" = "NET: {essid} ({signalStrength}%) ";
|
||||
"format-ethernet" = "{ifname} ";
|
||||
|
|
@ -182,9 +173,7 @@ $character'';
|
|||
textColor = "#cdd6f4";
|
||||
};
|
||||
|
||||
services.easyeffects = {
|
||||
enable = true;
|
||||
};
|
||||
services.easyeffects = {enable = true;};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
neofetch
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
{ inputs, outputs, config, pkgs, ... }:
|
||||
with inputs;
|
||||
{
|
||||
|
||||
inputs,
|
||||
outputs,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with inputs; {
|
||||
home.sessionVariables.DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox";
|
||||
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
package = pkgs.firefox.override {
|
||||
cfg = {
|
||||
enableGnomeExtensions = true;
|
||||
};
|
||||
};
|
||||
package =
|
||||
pkgs.firefox.override {cfg = {enableGnomeExtensions = true;};};
|
||||
profiles.xqtc = {
|
||||
isDefault = true;
|
||||
extensions = with inputs.firefox-addons.packages.${pkgs.system}; [
|
||||
|
|
@ -27,40 +28,65 @@ with inputs;
|
|||
force = true;
|
||||
engines = {
|
||||
"SearX" = {
|
||||
urls = [{
|
||||
urls = [
|
||||
{
|
||||
template = "https://searx.org/search";
|
||||
params = [
|
||||
{ name = "q"; value = "{searchTerms}"; }
|
||||
{
|
||||
name = "q";
|
||||
value = "{searchTerms}";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
}];
|
||||
};
|
||||
"Nix Packages" = {
|
||||
urls = [{
|
||||
urls = [
|
||||
{
|
||||
template = "https://search.nixos.org/packages";
|
||||
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";
|
||||
definedAliases = ["@np"];
|
||||
};
|
||||
"Nix Options" = {
|
||||
urls = [{
|
||||
urls = [
|
||||
{
|
||||
template = "https://search.nixos.org/options";
|
||||
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";
|
||||
definedAliases = ["@no"];
|
||||
};
|
||||
|
||||
"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";
|
||||
updateInterval = 24 * 60 * 60 * 1000; # every day
|
||||
definedAliases = ["@nw"];
|
||||
|
|
@ -82,13 +108,16 @@ with inputs;
|
|||
"browser.theme.toolbar-theme" = "0";
|
||||
"browser.newtabpage.activity-stream.showSponsored" = 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.showSponsoredTopSites" = false;
|
||||
"services.sync.prefs.sync.browser.newtabpage.activity-stream.showSponsored" =
|
||||
false;
|
||||
"services.sync.prefs.sync.browser.newtabpage.activity-stream.showSponsoredTopSites" =
|
||||
false;
|
||||
"browser.toolbars.bookmarks.visibility" = "never";
|
||||
"general.useragent.locale" = "de-DE";
|
||||
"distribution.searchplugins.defaultLocale" = "de-DE";
|
||||
"signon.rememberSignons" = false;
|
||||
"toolkit.legacyUserProfileCustomizations.stylesheets" = true; # Needed to allow userChrome.css
|
||||
"toolkit.legacyUserProfileCustomizations.stylesheets" =
|
||||
true; # Needed to allow userChrome.css
|
||||
};
|
||||
userChrome = ''
|
||||
@import "firefox-gnome-theme/userChrome.css";
|
||||
|
|
|
|||
|
|
@ -1,12 +1,16 @@
|
|||
{ pkgs, lib, config, inputs, outputs, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
inputs,
|
||||
outputs,
|
||||
...
|
||||
}: {
|
||||
programs.nixvim = {
|
||||
enable = true;
|
||||
globals.mapleader = " ";
|
||||
extraConfigLua = builtins.readFile ../config-files/nvim/init.lua;
|
||||
extraPlugins = with pkgs.vimPlugins; [
|
||||
headlines-nvim
|
||||
];
|
||||
extraPlugins = with pkgs.vimPlugins; [headlines-nvim];
|
||||
|
||||
clipboard.providers.wl-copy.enable = true;
|
||||
|
||||
|
|
@ -23,10 +27,9 @@
|
|||
enable = true;
|
||||
dir = "~/Documents/Obsidian Vault/";
|
||||
};
|
||||
indent-blankline.enable = true;
|
||||
lualine.enable = true;
|
||||
lsp-format = {
|
||||
enable = true;
|
||||
};
|
||||
lsp-format = {enable = true;};
|
||||
lsp = {
|
||||
enable = true;
|
||||
servers = {
|
||||
|
|
@ -94,9 +97,7 @@
|
|||
};
|
||||
};
|
||||
telescope.enable = true;
|
||||
telescope.extensions = {
|
||||
file_browser.enable = true;
|
||||
};
|
||||
telescope.extensions = {file_browser.enable = true;};
|
||||
which-key.enable = true;
|
||||
cmp-nvim-lsp.enable = true;
|
||||
cmp-nvim-lua.enable = true;
|
||||
|
|
@ -159,17 +160,17 @@
|
|||
{
|
||||
mode = "n";
|
||||
key = "<leader>P";
|
||||
action = "\"+p";
|
||||
action = ''"+p'';
|
||||
}
|
||||
{
|
||||
mode = ["n" "v"];
|
||||
key = "<leader>y";
|
||||
action = "[[\"+y]]";
|
||||
action = ''[["+y]]'';
|
||||
}
|
||||
{
|
||||
mode = ["n"];
|
||||
key = "<leader>Y";
|
||||
action = "[[\"+Y]]";
|
||||
action = ''[["+Y]]'';
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
|
|||
68
home/modules/shell.nix
Normal file
68
home/modules/shell.nix
Normal 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));
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,10 @@
|
|||
{ inputs, lib, config, pkgs, ...}:
|
||||
|
||||
{
|
||||
inputs,
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
age.identityPaths = ["${config.home.homeDirectory}/.ssh/agenix"]; # Use this key to decrypt
|
||||
home.packages = [
|
||||
inputs.agenix.packages.x86_64-linux.default # Install CLI tool to encrypt
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
let
|
||||
xqtc = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFecbWOhXR4z1wrrI5onn4SFGtu/lfsOblreuRWcbLug";
|
||||
in
|
||||
{
|
||||
in {
|
||||
"xqtc_id_ed25519.age".publicKeys = [xqtc];
|
||||
"xqtc_id_ed25519_pub.age".publicKeys = [xqtc];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
{config, lib, pkgs, ...}:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
services.clamav = {
|
||||
updater.enable = true;
|
||||
updater.settings = {
|
||||
LogVerbose = true;
|
||||
};
|
||||
updater.settings = {LogVerbose = true;};
|
||||
updater.interval = "hourly";
|
||||
daemon.enable = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,12 +15,15 @@
|
|||
⠀⠀⠀⠀⠀⠀⠈⠛⠿⣿⣿⣿⣿⣿⣶⣶⣿⣿⣿⣿⣿⠿⠋⠁⠀⠀⠀⠀⠀⠀
|
||||
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠛⠛⠛⠛⠛⠛⠉⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
|
||||
*/
|
||||
|
||||
{ config, inputs, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
../../common
|
||||
#../antivirus.nix
|
||||
|
|
@ -58,7 +61,8 @@
|
|||
networking.hostName = "asmodeus"; # Define your hostname.
|
||||
# Pick only one of the below networking options.
|
||||
# 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.
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
|
@ -114,10 +118,7 @@
|
|||
users.users.xqtc = {
|
||||
isNormalUser = true;
|
||||
extraGroups = ["wheel" "sudo" "docker"]; # Enable ‘sudo’ for the user.
|
||||
packages = with pkgs; [
|
||||
wezterm
|
||||
nushell
|
||||
];
|
||||
packages = with pkgs; [wezterm nushell];
|
||||
shell = pkgs.nushell;
|
||||
};
|
||||
|
||||
|
|
@ -143,7 +144,6 @@
|
|||
jellyfin
|
||||
jellyfin-web
|
||||
jellyfin-ffmpeg
|
||||
|
||||
];
|
||||
|
||||
#programs.nix-ld.enable = true;
|
||||
|
|
@ -232,6 +232,4 @@
|
|||
system.stateVersion = "23.11"; # Did you read the comment?
|
||||
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,34 +1,36 @@
|
|||
# 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 = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/5e34fc38-c199-4b85-b756-1c65ed7471fc";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/5e34fc38-c199-4b85-b756-1c65ed7471fc";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/C3D3-9E29";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/C3D3-9E29";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
fileSystems."/mnt/HDD1" =
|
||||
{ device = "/dev/disk/by-uuid/bc68de4c-ad5c-4016-ac11-65de448949fe";
|
||||
fileSystems."/mnt/HDD1" = {
|
||||
device = "/dev/disk/by-uuid/bc68de4c-ad5c-4016-ac11-65de448949fe";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/mnt/HDD2" =
|
||||
{ device = "/dev/disk/by-uuid/c37bc41d-8d92-4b7e-ac45-3420804d086c";
|
||||
fileSystems."/mnt/HDD2" = {
|
||||
device = "/dev/disk/by-uuid/c37bc41d-8d92-4b7e-ac45-3420804d086c";
|
||||
fsType = "ext4";
|
||||
};
|
||||
swapDevices = [];
|
||||
|
|
@ -42,5 +44,6 @@
|
|||
# networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
|
||||
|
||||
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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ config, ... }:
|
||||
{
|
||||
{config, ...}: {
|
||||
nix.gc = {
|
||||
automatic = true;
|
||||
dates = "daily";
|
||||
|
|
|
|||
|
|
@ -13,12 +13,14 @@
|
|||
⠀⠀⠀⠀⠀⠀⠈⠛⠿⣿⣿⣿⣿⣿⣶⣶⣿⣿⣿⣿⣿⠿⠋⠁⠀⠀⠀⠀⠀⠀
|
||||
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠛⠛⠛⠛⠛⠛⠉⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
|
||||
*/
|
||||
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
|
|
@ -48,11 +50,7 @@
|
|||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
powerOnBoot = true;
|
||||
settings = {
|
||||
General = {
|
||||
Enable = "Source,Sink,Media,Socket";
|
||||
};
|
||||
};
|
||||
settings = {General = {Enable = "Source,Sink,Media,Socket";};};
|
||||
};
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
|
|
@ -64,7 +62,8 @@
|
|||
networking.hostName = "lambda"; # Define your hostname.
|
||||
# Pick only one of the below networking options.
|
||||
# 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.
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
|
@ -112,10 +111,7 @@
|
|||
users.users.xqtc = {
|
||||
isNormalUser = true;
|
||||
extraGroups = ["wheel"]; # Enable ‘sudo’ for the user.
|
||||
packages = with pkgs; [
|
||||
wezterm
|
||||
nushell
|
||||
];
|
||||
packages = with pkgs; [wezterm nushell];
|
||||
shell = pkgs.nushell;
|
||||
};
|
||||
|
||||
|
|
@ -198,6 +194,4 @@
|
|||
system.stateVersion = "23.11"; # Did you read the comment?
|
||||
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,31 +1,31 @@
|
|||
# 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" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = [];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/0b6d9cc6-88a7-45b4-b79e-81496f480e7c";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/0b6d9cc6-88a7-45b4-b79e-81496f480e7c";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/6F98-B5D8";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/6F98-B5D8";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/6cf4542a-9611-4a15-83df-12e3ec91b673"; }
|
||||
];
|
||||
swapDevices = [{device = "/dev/disk/by-uuid/6cf4542a-9611-4a15-83df-12e3ec91b673";}];
|
||||
|
||||
# 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
|
||||
|
|
@ -35,5 +35,6 @@
|
|||
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
|
||||
|
||||
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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,12 @@
|
|||
{ config, lib, inputs, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
../../common
|
||||
#../antivirus.nix
|
||||
|
|
@ -24,11 +28,7 @@
|
|||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
powerOnBoot = true;
|
||||
settings = {
|
||||
General = {
|
||||
Enable = "Source,Sink,Media,Socket";
|
||||
};
|
||||
};
|
||||
settings = {General = {Enable = "Source,Sink,Media,Socket";};};
|
||||
};
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
|
|
@ -56,7 +56,8 @@
|
|||
networking.hostName = "lilith"; # Define your hostname.
|
||||
# Pick only one of the below networking options.
|
||||
# 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.
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
|
@ -124,10 +125,7 @@
|
|||
users.users.xqtc = {
|
||||
isNormalUser = true;
|
||||
extraGroups = ["wheel" "libvirtd"]; # Enable ‘sudo’ for the user.
|
||||
packages = with pkgs; [
|
||||
nushell
|
||||
clamtk
|
||||
];
|
||||
packages = with pkgs; [nushell clamtk];
|
||||
shell = pkgs.nushell;
|
||||
};
|
||||
|
||||
|
|
@ -199,7 +197,6 @@
|
|||
};
|
||||
#networking.wireguard.enable = true;
|
||||
|
||||
|
||||
services.tailscale.enable = true;
|
||||
|
||||
# Open ports in the firewall.
|
||||
|
|
@ -232,6 +229,4 @@
|
|||
system.stateVersion = "23.11"; # Did you read the comment?
|
||||
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1,27 @@
|
|||
# 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" "nvme" "usb_storage" "sd_mod"];
|
||||
boot.initrd.kernelModules = ["dm-snapshot"];
|
||||
boot.kernelModules = [];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/a73b1d2a-cdeb-40e7-9200-b6243aad03e0";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/a73b1d2a-cdeb-40e7-9200-b6243aad03e0";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/AA05-0A9A";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/AA05-0A9A";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
|
|
@ -35,5 +37,6 @@
|
|||
# networking.interfaces.wwp0s20f0u6.useDHCP = lib.mkDefault true;
|
||||
|
||||
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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,12 @@
|
|||
{ config, inputs, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
../../modules/home-manager.nix
|
||||
../../common
|
||||
|
|
@ -20,7 +24,8 @@
|
|||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
#networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||
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 = {
|
||||
enable = true;
|
||||
|
|
@ -31,7 +36,9 @@
|
|||
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.
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
|
@ -51,9 +58,6 @@
|
|||
# Enable the X11 windowing system.
|
||||
#services.xserver.enable = true;
|
||||
|
||||
|
||||
|
||||
|
||||
# Configure keymap in X11
|
||||
services.xserver.xkb.layout = "us";
|
||||
# services.xserver.xkb.options = "eurosign:e,caps:escape";
|
||||
|
|
@ -72,9 +76,7 @@
|
|||
users.users.xqtc = {
|
||||
isNormalUser = true;
|
||||
extraGroups = ["wheel"]; # Enable ‘sudo’ for the user.
|
||||
packages = with pkgs; [
|
||||
tree
|
||||
];
|
||||
packages = with pkgs; [tree];
|
||||
shell = pkgs.nushell;
|
||||
};
|
||||
|
||||
|
|
@ -110,7 +112,6 @@
|
|||
rpc-authentication-required = "true";
|
||||
rpc-username = "xqtc";
|
||||
rpc-password = "Klavier2016";
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -176,6 +177,4 @@
|
|||
#
|
||||
# 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?
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1,36 @@
|
|||
# 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" "ehci_pci" "ahci" "firewire_ohci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||
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];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/7317806c-aa54-460c-b094-18104496d245";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/7317806c-aa54-460c-b094-18104496d245";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/0AE9-6A7E";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/0AE9-6A7E";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
|
|
@ -33,5 +44,6 @@
|
|||
# networking.interfaces.enp1s0f0.useDHCP = lib.mkDefault true;
|
||||
|
||||
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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,20 @@
|
|||
{lib, inputs, ...}: {
|
||||
{
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [inputs.home-manager.nixosModules.home-manager];
|
||||
config = {
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
|
||||
home-manager.extraSpecialArgs = {inherit inputs;};
|
||||
home-manager.users.xqtc = {...}: {imports = [
|
||||
home-manager.users.xqtc = {...}: {
|
||||
imports = [
|
||||
../home
|
||||
inputs.nixvim.homeManagerModules.nixvim
|
||||
#inputs.agenix.homeManagerModules.default
|
||||
]; };
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,12 +2,18 @@ self: super: {
|
|||
util = rec {
|
||||
dirEntries = path: builtins.attrNames (builtins.readDir path);
|
||||
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);
|
||||
mapKeys = obj: f: builtins.map f obj;
|
||||
nixFilesIn = path: builtins.map
|
||||
(e: import (path + /${e}))
|
||||
(builtins.filter (x: (builtins.match ".*\\.nix$" x) != null) (dirEntries path));
|
||||
without = exclusions: list: builtins.filter (x: !builtins.elem x exclusions) list;
|
||||
nixFilesIn = path:
|
||||
builtins.map (e: import (path + /${e}))
|
||||
(builtins.filter (x: (builtins.match ".*\\.nix$" x) != null)
|
||||
(dirEntries path));
|
||||
without = exclusions: list:
|
||||
builtins.filter (x: !builtins.elem x exclusions) list;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue