xqtc/nixos-config
1
0
Fork 0
mirror of https://git.gay/xqtc/nixos-config synced 2024-11-25 20:03:54 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
xqtc161 2024-03-11 14:15:28 +01:00
parent c4be0e7530 761e7b4863
commit 744a00fe39
26 changed files with 874 additions and 788 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/default.nix
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"];
} }

55
flake.lock
View file

@ -29,11 +29,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1709352230, "lastModified": 1709784245,
"narHash": "sha256-7NfxOTEz15jHLxIRYS9WU4+PO0fypxJ/kkHC682Lhr0=", "narHash": "sha256-t1sobS2zj7hD/dZj9aVPipYnskrk+Q7FqAViSqEMLQU=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "c13d9ef669a370fd70e6732e295513cd7342b20d", "rev": "673c3faea3a5239f4efe545c4649c2b68501dbe1",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -81,11 +81,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706830856, "lastModified": 1709336216,
"narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,11 +192,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709204054, "lastModified": 1709764752,
"narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f3367769a93b226c467551315e9e270c3f78b15", "rev": "cf111d1a849ddfc38e9155be029519b0e2329615",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -214,11 +214,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708988456, "lastModified": 1709578243,
"narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=", "narHash": "sha256-hF96D+c2PBmAFhymMw3z8hou++lqKtZ7IzpFbYeL1/Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1d085ea4444d26aa52297758b333b449b2aa6fca", "rev": "23ff9821bcaec12981e32049e8687f25f11e5ef3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -235,11 +235,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709001452, "lastModified": 1709554374,
"narHash": "sha256-FnZ54wkil54hKvr1irdKic1TE27lHQI9dKQmOJRrtlU=", "narHash": "sha256-1yYgwxBzia+QrOaQaZ6YKqGFfiQcSBwYLzd9XRsRLQY=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "6c06334f0843c7300d1678726bb607ce526f6b36", "rev": "daa03606dfb5296a22e842acb02b46c1c4e9f5e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -250,11 +250,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1709147990, "lastModified": 1709410583,
"narHash": "sha256-vpXMWoaCtMYJ7lisJedCRhQG9BSsInEyZnnG5GfY9tQ=", "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "33a97b5814d36ddd65ad678ad07ce43b1a67f159", "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -282,11 +282,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1709403298, "lastModified": 1709840082,
"narHash": "sha256-1Y2ywhgZ73PeeAQB3ndhfbDbAhBSFtxln30QjP8tr4c=", "narHash": "sha256-IE6KVI305U3Oy2J7Wz+hnllqy1SqUapUUT2BaSEJ2F4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "80b928afb1055901afdfd4ebb0ede839ab1686bb", "rev": "76716d32209e34054ca9dfb0dd69270713d3a7e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -298,11 +298,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1709237383, "lastModified": 1709703039,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -325,16 +325,17 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1709387460, "lastModified": 1709760463,
"narHash": "sha256-NTfi6gAsR5EReuvFGihuDUkBqb9DuQQqFviQcXVwX0c=", "narHash": "sha256-gKP997+xtyWvJXBjnAaiT/Dmk22wo1T/DzkNMDk9GHU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "274293fd691250ab96985aa4a04c653ab462876e", "rev": "22b587f3dc5c040eb1916aa2a67868f1918d9d17",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "22b587f3dc5c040eb1916aa2a67868f1918d9d17",
"type": "github" "type": "github"
} }
}, },

37
flake.nix
View file

@ -13,31 +13,36 @@
inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master"; inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
inputs.nixvim = { inputs.nixvim = {
# If you are not running an unstable channel of nixpkgs, select the corresponding branch of nixvim. # If you are not running an unstable channel of nixpkgs, select the corresponding branch of nixvim.
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim/22b587f3dc5c040eb1916aa2a67868f1918d9d17";
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} };
#home-manager.nixosModules.home-manager { in {
# home-manager.useGlobalPkgs = true; nixosConfigurations = pkgs.util.mapHostAttrs (host: host) (host:
# home-manager.useUserPackages = true; lib.nixosSystem {
inherit system;
# home-manager.extraSpecialArgs = inputs; modules = [./hosts/${host}];
# home-manager.users.xqtc = {...}: {imports = [ ./home nixvim.homeManagerModules.nixvim ]; };
#}
];
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
}); });
formatter.x86_64-linux =
inputs.nixpkgs.legacyPackages.x86_64-linux.alejandra;
}; };
} }

14
home/config-files/hyprland.conf
View file

@ -1,9 +1,3 @@
########################################################################################
AUTOGENERATED HYPR CONFIG.
PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT,
OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
########################################################################################
# #
# Please note not all available settings / options are set here. # Please note not all available settings / options are set here.
# For a full list, see the wiki # For a full list, see the wiki
@ -40,6 +34,11 @@ input {
sensitivity = 0 # -1.0 - 1.0, 0 means no modification. sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
} }
device {
name = at-translated-set-2-keyboard
enabled = false
}
general { general {
# See https://wiki.hyprland.org/Configuring/Variables/ for more # See https://wiki.hyprland.org/Configuring/Variables/ for more
@ -118,7 +117,8 @@ $mainMod = SUPER
bind = $mainMod SHIFT, return, exec, wezterm bind = $mainMod SHIFT, return, exec, wezterm
bind = $mainMod SHIFT, Q, killactive, bind = $mainMod SHIFT, Q, killactive,
bind = $mainMod SHIFT, X, exit, bind = $mainMod SHIFT, X, exit,
bind = $mainMod, L, exec, swaylock --indicator --clock --effect-blur 7x5 -e -f -i ~/dotfiles_new/walls/walls/wallpapersdencom_house-in-purple-flower-hyacinth-field_2048x1365.jpg bind = $mainMod, L, exec, swaylock --indicator --clock --effect-blur 7x5 -e -f -i "~/dotfiles_new/walls/walls/Bangqiao Yan - Letter.jpg"
bind = $mainMod SHIFT, SPACE, togglefloating, bind = $mainMod SHIFT, SPACE, togglefloating,
bind = $mainMod, P, exec, tofi-drun --drun-launch=true bind = $mainMod, P, exec, tofi-drun --drun-launch=true
bind = $mainMod SHIFT, P, exec, tofi-run --drun-launch=true bind = $mainMod SHIFT, P, exec, tofi-run --drun-launch=true

238
home/default.nix
View file

@ -1,246 +1,34 @@
{ config, pkgs, lib, inputs, ... }:
{ {
config,
pkgs,
lib,
inputs,
...
}: {
imports = [ imports = [
./modules/nixvim.nix ./modules/nixvim.nix
./modules/shell.nix
./modules/firefox.nix ./modules/firefox.nix
./modules/wm.nix
./modules/gtk.nix
./modules/home-pkgs.nix
./modules/git.nix
#./modules/ssh.nix #./modules/ssh.nix
]; ];
home.username = "xqtc"; home.username = "xqtc";
home.homeDirectory = "/home/xqtc"; home.homeDirectory = "/home/xqtc";
programs.git = {
enable = true;
userName = "xqtc161";
userEmail = "xqtc@tutanota.com";
};
programs.wezterm = { programs.wezterm = {
enable = true; enable = true;
extraConfig = builtins.readFile ./config-files/wezterm.lua; extraConfig = builtins.readFile ./config-files/wezterm.lua;
}; };
programs.joshuto = { programs.joshuto = {enable = true;};
enable = true;
};
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));
};
};
dconf.enable = true; dconf.enable = true;
dconf.settings = {
"org/gnome/desktop/interface" = {
color-scheme = "prefer-dark";
cursor-theme = "Adwaita";
};
};
gtk = { services.easyeffects = {enable = true;};
enable = true;
theme = {
name = "Catppuccin-Mocha-Compact-Pink-Dark";
package = pkgs.catppuccin-gtk.override {
accents = [ "pink" ];
size = "compact";
tweaks = [ "rimless" ];
variant = "mocha";
};
};
};
home.sessionVariables.DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox";
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;
#xwayland.enable = true;
#enableNvidiaPatches = true;
extraConfig = builtins.readFile ./config-files/hyprland.conf;
};
programs.waybar = {
enable = true;
settings = {
mainBar = {
layer = "top";
position = "top";
height = 30;
modules-left = [ "hyprland/workspaces" ];
#modules-center = [ "hyprland/window" ];
modules-right = [ "tray" "network" "battery" "battery#bat2" "clock" ];
"tray" = {
"icon-size" = 21;
};
"network" = {
"format-wifi"= "NET: {essid} ({signalStrength}%) ";
"format-ethernet" = "{ifname} ";
"format-disconnected" = "";
"max-length" = 50;
};
"battery" = {
"bat" = "BAT0";
"interval" = 10;
"states" = {
"warning" = 30;
"critical" = 15;
};
"format" = " BAT IN: {capacity}%";
#"format-icons" = ''["", "", "", "", ""]'';
"max-length" = 25;
};
"battery#bat2" = {
"bat" = "BAT1";
"interval" = 10;
"states" = {
"warning" = 30;
"critical" = 15;
};
"format" = " BAT EX: {capacity}%";
#"format-icons" = ''["", "", "", "", ""]'';
"max-length" = 25;
};
};
};
style = builtins.readFile ./config-files/waybar-mocha.css;
};
services.mako = {
enable = true;
font = "Hack Nerd Font 15";
backgroundColor = "#1e1e2e";
textColor = "#cdd6f4";
};
services.easyeffects = {
enable = true;
};
home.packages = with pkgs; [
neofetch
uwufetch
btop
iftop
ranger
obsidian
moodle-dl
brightnessctl
pavucontrol
bitwarden
bitwarden-cli
sway-contrib.grimshot
libnotify
strace
ltrace
nodejs
nerdfonts
vivaldi
vivaldi-ffmpeg-codecs
signal-desktop
vesktop
discord
telegram-desktop
webex
element-desktop
qbittorrent
nicotine-plus
neovide
yubioath-flutter
steam
protonup-qt
spotify
sayonara
mpv
jellyfin-media-player
nixos-icons
swww
];
home.stateVersion = "23.11"; home.stateVersion = "23.11";
programs.home-manager.enable = true; programs.home-manager.enable = true;

75
home/modules/firefox.nix
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}; [
@ -28,40 +29,65 @@ 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"];
@ -83,13 +109,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";

12
home/modules/git.nix Normal file
View file

@ -0,0 +1,12 @@
{
inputs,
config,
pkgs,
...
}: {
programs.git = {
enable = true;
userName = "xqtc161";
userEmail = "xqtc@tutanota.com";
};
}

26
home/modules/gtk.nix Normal file
View file

@ -0,0 +1,26 @@
{
config,
pkgs,
inputs,
...
}: {
dconf.settings = {
"org/gnome/desktop/interface" = {
color-scheme = "prefer-dark";
cursor-theme = "Adwaita";
};
};
gtk = {
enable = true;
theme = {
name = "Catppuccin-Mocha-Compact-Pink-Dark";
package = pkgs.catppuccin-gtk.override {
accents = ["pink"];
size = "compact";
tweaks = ["rimless"];
variant = "mocha";
};
};
};
}

66
home/modules/home-pkgs.nix Normal file
View file

@ -0,0 +1,66 @@
{
config,
inputs,
pkgs,
...
}: {
home.packages = with pkgs; [
neofetch
uwufetch
btop
iftop
ranger
obsidian
moodle-dl
brightnessctl
pavucontrol
bitwarden
bitwarden-cli
sway-contrib.grimshot
libnotify
strace
ltrace
nodejs
nerdfonts
vivaldi
vivaldi-ffmpeg-codecs
signal-desktop
vesktop
discord
telegram-desktop
webex
element-desktop
qbittorrent
nicotine-plus
via
qmk
qmk-udev-rules
neovide
yubioath-flutter
steam
protonup-qt
spotify
sayonara
mpv
feishin
nixos-icons
swww
];
}

27
home/modules/nixvim.nix
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 = {
@ -94,9 +97,7 @@
}; };
}; };
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));
};
};
}

8
home/modules/ssh.nix
View file

@ -1,6 +1,10 @@
{ inputs, lib, config, pkgs, ...}:
{ {
inputs,
lib,
config,
pkgs,
...
}: {
age.identityPaths = ["${config.home.homeDirectory}/.ssh/agenix"]; # Use this key to decrypt 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

67
home/modules/wm.nix Normal file
View file

@ -0,0 +1,67 @@
{
config,
pkgs,
inputs,
...
}: {
wayland.windowManager.hyprland = {
enable = true;
package = pkgs.hyprland;
#xwayland.enable = true;
#enableNvidiaPatches = true;
extraConfig = builtins.readFile ../config-files/hyprland.conf;
};
programs.waybar = {
enable = true;
settings = {
mainBar = {
layer = "top";
position = "top";
height = 30;
modules-left = ["hyprland/workspaces"];
#modules-center = [ "hyprland/window" ];
modules-right = ["tray" "network" "battery" "battery#bat2" "clock"];
"tray" = {"icon-size" = 21;};
"network" = {
"format-wifi" = "NET: {essid} ({signalStrength}%) ";
"format-ethernet" = "{ifname} ";
"format-disconnected" = "";
"max-length" = 50;
};
"battery" = {
"bat" = "BAT0";
"interval" = 10;
"states" = {
"warning" = 30;
"critical" = 15;
};
"format" = " BAT IN: {capacity}%";
#"format-icons" = ''["", "", "", "", ""]'';
"max-length" = 25;
};
"battery#bat2" = {
"bat" = "BAT1";
"interval" = 10;
"states" = {
"warning" = 30;
"critical" = 15;
};
"format" = " BAT EX: {capacity}%";
#"format-icons" = ''["", "", "", "", ""]'';
"max-length" = 25;
};
};
};
style = builtins.readFile ../config-files/waybar-mocha.css;
};
services.mako = {
enable = true;
font = "Hack Nerd Font 15";
backgroundColor = "#1e1e2e";
textColor = "#cdd6f4";
};
}

3
home/secrets/secrets.nix
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];
} }

10
hosts/antivirus.nix
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;
}; };

24
hosts/asmodeus/default.nix
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";
@ -114,10 +118,7 @@
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;
@ -232,6 +232,4 @@
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"];
} }

31
hosts/asmodeus/hardware-configuration.nix
View file

@ -1,34 +1,36 @@
# 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 = [];
@ -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;
} }

3
hosts/gc.nix
View file

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

28
hosts/lambda/default.nix
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";
@ -112,10 +111,7 @@
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;
}; };
@ -198,6 +194,4 @@
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"];
} }

27
hosts/lambda/hardware-configuration.nix
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;
} }

29
hosts/lilith/default.nix
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";
@ -124,10 +125,7 @@
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;
}; };
@ -199,7 +197,6 @@
}; };
#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.
@ -232,6 +229,4 @@
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"];
} }

23
hosts/lilith/hardware-configuration.nix
View file

@ -1,25 +1,27 @@
# 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";
}; };
@ -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;
} }

29
hosts/seraphim/default.nix
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
@ -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";
@ -72,9 +76,7 @@
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";
}; };
}; };
@ -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?
} }

34
hosts/seraphim/hardware-configuration.nix
View file

@ -1,25 +1,36 @@
# 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.availableKernelModules = [
"xhci_pci"
"ehci_pci"
"ahci"
"firewire_ohci"
"usbhid"
"usb_storage"
"sd_mod"
"sdhci_pci"
];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel" "wl"]; boot.kernelModules = ["kvm-intel" "wl"];
boot.extraModulePackages = [config.boot.kernelPackages.broadcom_sta]; boot.extraModulePackages = [config.boot.kernelPackages.broadcom_sta];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/7317806c-aa54-460c-b094-18104496d245"; 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";
}; };
@ -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;
} }

12
modules/home-manager.nix
View file

@ -1,14 +1,20 @@
{lib, inputs, ...}: { {
lib,
inputs,
...
}: {
imports = [inputs.home-manager.nixosModules.home-manager]; 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
]; }; ];
};
}; };
} }

16
overlays/util.nix
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;
}; };
} }