Compare commits

...

2 Commits

Author SHA1 Message Date
af827c485b refactor: apply nixfmt 2025-06-04 00:39:56 +03:00
93debfb780 feat(flake): add nixfmt-tree formatter 2025-06-03 23:47:58 +03:00
10 changed files with 354 additions and 259 deletions

View File

@@ -2,28 +2,29 @@
description = "My homebrew NixOS configurations"; description = "My homebrew NixOS configurations";
inputs = { inputs = {
nixpkgs.url = github:nixos/nixpkgs/nixos-unstable; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = { home-manager = {
url = github:nix-community/home-manager; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixvim = { nixvim = {
url = github:nix-community/nixvim; url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
plasma-manager = { plasma-manager = {
url = github:nix-community/plasma-manager; url = "github:nix-community/plasma-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nur.url = github:nix-community/NUR; nur.url = "github:nix-community/NUR";
nethack.url = git+https://git.psf.lt/xezo360hye/nethack?shallow=1; nethack.url = "git+https://git.psf.lt/xezo360hye/nethack?shallow=1";
}; };
outputs = { outputs =
{
self, self,
nixpkgs, nixpkgs,
home-manager, home-manager,
@@ -32,12 +33,17 @@
plasma-manager, plasma-manager,
nur, nur,
... ...
} @ inputs: }@inputs:
let let
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
username = "andrey"; username = "andrey";
hostnames = [ "tokishiko" "maidena" "noma" "tuxedo" ]; hostnames = [
"tokishiko"
"maidena"
"noma"
"tuxedo"
];
stateVersion = "24.05"; stateVersion = "24.05";
makeSystem = hostname: { makeSystem = hostname: {
@@ -59,14 +65,25 @@
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.${username} = { home-manager.users.${username} = {
imports = [ imports =
[
./home/${hostname}.nix ./home/${hostname}.nix
./home/common.nix ./home/common.nix
] ++ (map ]
(module: ++ (map
let hm = module.homeManagerModules; (
in hm.${lib.head (lib.attrNames hm)}) module:
[ nixvim nethack plasma-manager ]); let
hm = module.homeManagerModules;
in
hm.${lib.head (lib.attrNames hm)}
)
[
nixvim
nethack
plasma-manager
]
);
home = { home = {
username = username; username = username;
@@ -82,7 +99,10 @@
}; };
forEachHost = fn: lib.mergeAttrsList (map fn hostnames); forEachHost = fn: lib.mergeAttrsList (map fn hostnames);
in { in
{
nixosConfigurations = forEachHost makeSystem; nixosConfigurations = forEachHost makeSystem;
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-tree;
}; };
} }

View File

@@ -11,13 +11,11 @@
fastfetch.enable = true; fastfetch.enable = true;
btop.enable = true; btop.enable = true;
bash = { bash = {
enable = true; enable = true;
historyControl = [ "ignoreboth" ]; historyControl = [ "ignoreboth" ];
}; };
git = { git = {
enable = true; enable = true;
userName = "xezo360hye"; userName = "xezo360hye";
@@ -26,8 +24,14 @@
extraConfig = { extraConfig = {
credential.helper = "store"; credential.helper = "store";
init.defaultBranch = "master"; init.defaultBranch = "master";
url."https://github.com/".insteadOf = [ "gh:" "github:" ]; url."https://github.com/".insteadOf = [
url."https://git.psf.lt/".insteadOf = [ "psf:" "gitea:" ]; "gh:"
"github:"
];
url."https://git.psf.lt/".insteadOf = [
"psf:"
"gitea:"
];
}; };
}; };
@@ -49,14 +53,17 @@
}; };
home = { home = {
packages = with pkgs; let packages =
with pkgs;
let
sent' = sent.overrideAttrs (oldAttrs: { sent' = sent.overrideAttrs (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ cairo ]; buildInputs = oldAttrs.buildInputs ++ [ cairo ];
patches = [ patches = [
./resources/patches/sent-pdf.diff ./resources/patches/sent-pdf.diff
]; ];
}); });
in [ in
[
texlive.combined.scheme-full texlive.combined.scheme-full
telegram-desktop telegram-desktop
libreoffice-qt6 libreoffice-qt6

View File

@@ -3,7 +3,8 @@
programs.emacs = { programs.emacs = {
enable = true; enable = true;
package = pkgs.emacs-gtk; package = pkgs.emacs-gtk;
extraPackages = epkgs: with epkgs; [ extraPackages =
epkgs: with epkgs; [
doom doom
magit magit

View File

@@ -56,57 +56,95 @@
force = true; force = true;
default = "ddg"; default = "ddg";
engines = let engines =
makeShortcuts = let let
makeShortcuts =
let
prefix = "@"; prefix = "@";
in map (shortcut: prefix + shortcut); in
map (shortcut: prefix + shortcut);
hideEngines = let hideEngines =
let
hideEngine = engine: { hideEngine = engine: {
name = engine; name = engine;
value = { value = {
metaData.hidden = true; metaData.hidden = true;
}; };
}; };
in engines: lib.listToAttrs (map hideEngine engines); in
in (hideEngines [ "google" "bing" "amazondotcom-us" "ebay" ]) // engines: lib.listToAttrs (map hideEngine engines);
{ in
(hideEngines [
"google"
"bing"
"amazondotcom-us"
"ebay"
])
// {
"Arch Wiki" = { "Arch Wiki" = {
urls = [{ template = "https://wiki.archlinux.org/index.php?search={searchTerms}"; }]; urls = [ { template = "https://wiki.archlinux.org/index.php?search={searchTerms}"; } ];
icon = "https://wiki.archlinux.org/favicon.ico"; icon = "https://wiki.archlinux.org/favicon.ico";
definedAliases = makeShortcuts [ "archlinux" "aw" ]; definedAliases = makeShortcuts [
"archlinux"
"aw"
];
}; };
"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 = "channel"; value = "unstable"; } name = "type";
{ name = "query"; value = "{searchTerms}"; } value = "packages";
}
{
name = "channel";
value = "unstable";
}
{
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 = makeShortcuts [ "nixpkgs" "packages" "np" ]; definedAliases = makeShortcuts [
"nixpkgs"
"packages"
"np"
];
}; };
"NixOS Wiki" = { "NixOS Wiki" = {
urls = [{ template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; }]; urls = [ { template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; } ];
icon = "https://wiki.nixos.org/favicon.png"; icon = "https://wiki.nixos.org/favicon.png";
definedAliases = makeShortcuts [ "nixos" "nw" ]; definedAliases = makeShortcuts [
"nixos"
"nw"
];
}; };
"MyNixOS" = { "MyNixOS" = {
urls = [{ template = "https://mynixos.com/search?q={searchTerms}"; }]; urls = [ { template = "https://mynixos.com/search?q={searchTerms}"; } ];
icon = "https://mynixos.com/favicon-light.svg"; icon = "https://mynixos.com/favicon-light.svg";
definedAliases = makeShortcuts [ "mynixos" "mw" ]; definedAliases = makeShortcuts [
"mynixos"
"mw"
];
}; };
"RuTracker" = { "RuTracker" = {
urls = [{ template = "https://rutracker.org/forum/tracker.php?nm={searchTerms}"; }]; urls = [ { template = "https://rutracker.org/forum/tracker.php?nm={searchTerms}"; } ];
icon = "https://rutracker.org/favicon.ico"; icon = "https://rutracker.org/favicon.ico";
definedAliases = makeShortcuts [ "rutracker" "rt" ]; definedAliases = makeShortcuts [
"rutracker"
"rt"
];
}; };
}; };
}; };
@@ -126,7 +164,7 @@
EmailTracking = true; EmailTracking = true;
Fingerprinting = true; Fingerprinting = true;
Exceptions = []; Exceptions = [ ];
}; };
FirefoxHome = { FirefoxHome = {

View File

@@ -5,7 +5,8 @@
lib, lib,
... ...
}: }:
let genFlatList = f: n: builtins.concatLists (builtins.genList f n); let
genFlatList = f: n: builtins.concatLists (builtins.genList f n);
in in
{ {
programs.kitty = { programs.kitty = {
@@ -50,7 +51,8 @@ in
}; };
}; };
bind = [ bind =
[
"SUPER, Return, exec, kitty" "SUPER, Return, exec, kitty"
"SUPER SHIFT, Q, exit" "SUPER SHIFT, Q, exit"
@@ -60,16 +62,17 @@ in
"ALT CTRL, left, workspace, -1" "ALT CTRL, left, workspace, -1"
"ALT CTRL, right, workspace, +1" "ALT CTRL, right, workspace, +1"
] ++ ( ]
genFlatList ++ (genFlatList (
( x: let n = toString (x + 1); x:
let
n = toString (x + 1);
in in
[ "SUPER, ${n}, workspace, ${n}" [
"SUPER, ${n}, workspace, ${n}"
"SUPER SHIFT, ${n}, movetoworkspace, ${n}" "SUPER SHIFT, ${n}, movetoworkspace, ${n}"
] ]
) ) 9);
9
);
}; };
}; };
} }

View File

@@ -199,17 +199,21 @@
"(mud|buckled|riding|snow|hiking|combat|jungle) boots" = "magenta"; "(mud|buckled|riding|snow|hiking|combat|jungle) boots" = "magenta";
" (Dragonbane|Fire Brand|Frost Brand|Ogresmasher|Trollsbane|Werebane)" = "lightgreen"; " (Dragonbane|Fire Brand|Frost Brand|Ogresmasher|Trollsbane|Werebane)" = "lightgreen";
" (Demonbane|Excalibur|Grayswandir|Snickersnee|Sunsword)" = "lightgreen"; " (Demonbane|Excalibur|Grayswandir|Snickersnee|Sunsword)" = "lightgreen";
" (Orb of Detection|Sceptre of Might|Magic Mirror of Merlin|Mitre of Holiness|Tsurugi of Muramasa)" = "lightgreen"; " (Orb of Detection|Sceptre of Might|Magic Mirror of Merlin|Mitre of Holiness|Tsurugi of Muramasa)" =
"lightgreen";
" (Cleaver|Giantslayer|Magicbane|Mjollnir|Vorpal Blade)" = "lightgreen"; " (Cleaver|Giantslayer|Magicbane|Mjollnir|Vorpal Blade)" = "lightgreen";
" (Heart of Ahriman|Staff of Aesculapius|Eyes of the Overworld|Platinum Yendorian Express Card|Orb of Fate|Eye of the Aethiopica)" = "lightgreen"; " (Heart of Ahriman|Staff of Aesculapius|Eyes of the Overworld|Platinum Yendorian Express Card|Orb of Fate|Eye of the Aethiopica)" =
"lightgreen";
" (Grimtooth|Orcrist|Sting|Stormbringer)" = "lightgreen"; " (Grimtooth|Orcrist|Sting|Stormbringer)" = "lightgreen";
" (Longbow of Diana|Master Key of Thievery)" = "lightgreen"; " (Longbow of Diana|Master Key of Thievery)" = "lightgreen";
" (Bell of Opening|silver bell|Candelabrum of Invocation|candelabrum|Book of the Dead|papyrus spellbook)" = "magenta&bold"; " (Bell of Opening|silver bell|Candelabrum of Invocation|candelabrum|Book of the Dead|papyrus spellbook)" =
"magenta&bold";
" Amulet of Yendor named" = "magenta&bold"; " Amulet of Yendor named" = "magenta&bold";
" cursed.* bag .* holding" = "red&bold"; " cursed.* bag .* holding" = "red&bold";
" cursed.* luck(stone)?($| )" = "red&bold"; " cursed.* luck(stone)?($| )" = "red&bold";
" cursed.* unicorn horn" = "red&bold"; " cursed.* unicorn horn" = "red&bold";
" cursed.* (Bell of Opening|silver bell|Candelabrum of Invocation|candelabrum|Book of the Dead|papyrus spellbook)" = "red&bold"; " cursed.* (Bell of Opening|silver bell|Candelabrum of Invocation|candelabrum|Book of the Dead|papyrus spellbook)" =
"red&bold";
"cursed tins? .* spinach|tins? .* spinach .* (cursed|C($| ))" = "red"; "cursed tins? .* spinach|tins? .* spinach .* (cursed|C($| ))" = "red";
" load(stone)?($| )" = "red&underline"; " load(stone)?($| )" = "red&underline";
" bag .* tricks" = "blue&underline"; " bag .* tricks" = "blue&underline";
@@ -218,8 +222,10 @@
" gold piece" = "yellow"; " gold piece" = "yellow";
" valuable" = "brown"; " valuable" = "brown";
" gems? .* hard" = "yellow"; " gems? .* hard" = "yellow";
" ([0-9]+|an?|gems? .*) (uncursed |cursed |blessed )?(dilithium|opal|garnet|jasper|agate|jet|obsidian|jade|citrine|chrysoberyl|amber|amethyst|fluorite|turquoise)(e?s)?( stones?| gems?| crystals?)?( named .*)?$" = "brown"; " ([0-9]+|an?|gems? .*) (uncursed |cursed |blessed )?(dilithium|opal|garnet|jasper|agate|jet|obsidian|jade|citrine|chrysoberyl|amber|amethyst|fluorite|turquoise)(e?s)?( stones?| gems?| crystals?)?( named .*)?$" =
" ([0-9]+|an?|gems?.*) (uncursed |cursed |blessed )?(diamond|rub(y|ies)|jacinth|sapphire|black opal|emerald|topaz|aquamarine)(e?s)?( stones?| gems?)?( named .*)?$" = "yellow"; "brown";
" ([0-9]+|an?|gems?.*) (uncursed |cursed |blessed )?(diamond|rub(y|ies)|jacinth|sapphire|black opal|emerald|topaz|aquamarine)(e?s)?( stones?| gems?)?( named .*)?$" =
"yellow";
" 0%" = "white"; " 0%" = "white";
" [1-9]%" = "cyan"; " [1-9]%" = "cyan";
" [12][0-9]%" = "cyan"; " [12][0-9]%" = "cyan";

View File

@@ -16,14 +16,16 @@
programs.plasma = { programs.plasma = {
enable = true; enable = true;
input.touchpads = [{ input.touchpads = [
{
enable = true; enable = true;
name = "SynPS/2 Synaptics TouchPad"; name = "SynPS/2 Synaptics TouchPad";
vendorId = "0002"; vendorId = "0002";
productId = "0007"; productId = "0007";
disableWhileTyping = false; disableWhileTyping = false;
naturalScroll = true; naturalScroll = true;
}]; }
];
kwin.edgeBarrier = 0; kwin.edgeBarrier = 0;
workspace = { workspace = {
@@ -40,7 +42,8 @@
floating = false; floating = false;
height = 44; height = 44;
widgets = let widgets =
let
kickoff = { kickoff = {
kickoff.icon = "nix-snowflake-white"; kickoff.icon = "nix-snowflake-white";
}; };
@@ -87,7 +90,6 @@
} }
]; ];
window-rules = [ window-rules = [
{ {
description = "Konsole"; description = "Konsole";

View File

@@ -1,23 +1,27 @@
{ inputs, config, pkgs, lib, ... }: {
let flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs; inputs,
config,
pkgs,
lib,
...
}:
let
flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
in in
{ {
# Bootloader # Bootloader
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.device = lib.mkDefault "/dev/sda"; boot.loader.grub.device = lib.mkDefault "/dev/sda";
# Networking # Networking
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
services.openssh.enable = true; services.openssh.enable = true;
services.tailscale.enable = true; services.tailscale.enable = true;
# l10n and i8n # l10n and i8n
time.timeZone = "Europe/Riga"; time.timeZone = "Europe/Riga";
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
# Editor # Editor
programs.neovim = { programs.neovim = {
enable = true; enable = true;
@@ -26,13 +30,15 @@ in
defaultEditor = true; defaultEditor = true;
}; };
# Nix # Nix
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix = { nix = {
settings = { settings = {
trusted-users = [ "andrey" ]; trusted-users = [ "andrey" ];
experimental-features = [ "nix-command" "flakes" ]; experimental-features = [
"nix-command"
"flakes"
];
flake-registry = ""; flake-registry = "";
nix-path = config.nix.nixPath; nix-path = config.nix.nixPath;
}; };
@@ -42,19 +48,26 @@ in
nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs; nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
}; };
# Users # Users
users.mutableUsers = false; users.mutableUsers = false;
users.users.andrey = { users.users.andrey = {
isNormalUser = true; isNormalUser = true;
initialHashedPassword = "$y$j9T$mGZT4otEkrc94e.Ile.P20$BoxfgxCiacs.tYoEp7S5AjcP.aMUBrsaCJYJkBot635"; initialHashedPassword = "$y$j9T$mGZT4otEkrc94e.Ile.P20$BoxfgxCiacs.tYoEp7S5AjcP.aMUBrsaCJYJkBot635";
extraGroups = [ "wheel" "cdrom" "networkmanager" "audio" "dialout" "scanner" "lp" "adbusers" ]; extraGroups = [
"wheel"
"cdrom"
"networkmanager"
"audio"
"dialout"
"scanner"
"lp"
"adbusers"
];
}; };
security.sudo.execWheelOnly = true; security.sudo.execWheelOnly = true;
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
# Printers and scanners # Printers and scanners
hardware.sane.enable = true; hardware.sane.enable = true;
services.printing.enable = true; services.printing.enable = true;
@@ -73,20 +86,24 @@ in
stats.enable = true; stats.enable = true;
}; };
# Programs # Programs
programs = { programs = {
git = { git = {
enable = true; enable = true;
config = { config = {
init.defaultBranch = "master"; init.defaultBranch = "master";
url."https://github.com/".insteadOf = [ "gh:" "github:" ]; url."https://github.com/".insteadOf = [
url."https://git.psf.lt/".insteadOf = [ "psf:" "gitea:" ]; "gh:"
"github:"
];
url."https://git.psf.lt/".insteadOf = [
"psf:"
"gitea:"
];
}; };
}; };
}; };
# Packages # Packages
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
alsa-utils alsa-utils
@@ -97,13 +114,11 @@ in
unzip unzip
]; ];
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;
settings.General.Enable = "Source,Sink,Media,Socket"; settings.General.Enable = "Source,Sink,Media,Socket";
}; };
# Xorg # Xorg
security.rtkit.enable = true; security.rtkit.enable = true;
services = { services = {

View File

@@ -28,8 +28,11 @@
}; };
}; };
fonts.packages = lib.mkAfter (with pkgs; [ fonts.packages = lib.mkAfter (
with pkgs;
[
vistafonts vistafonts
corefonts corefonts
]); ]
);
} }