new formatting, nixvim is working

This commit is contained in:
Charlie Root 2024-05-22 14:29:45 +02:00
commit 0e22544a8a
88 changed files with 1994 additions and 1845 deletions

View file

@ -1,6 +1,10 @@
{
description = "My NixOS config flake";
outputs = inputs@{ self, nixpkgs, ... }: {
outputs = inputs @ {
self,
nixpkgs,
...
}: {
inherit (nixpkgs) lib;
nixosConfigurations = import ./hosts {inherit inputs;};
};
@ -63,6 +67,5 @@
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
};
}

View file

@ -1,5 +1,4 @@
{ inputs, ... }:
let
{inputs, ...}: let
inherit (inputs) self;
inherit (self) lib;
in {
@ -15,5 +14,4 @@ in {
inputs.nixvim.nixosModules.nixvim
];
};
}

View file

@ -1,10 +1,13 @@
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
@ -15,8 +18,7 @@
options = ["noatime" "nodiratime" "discard"];
};
boot.initrd.luks.devices."luks-c03fc486-bdd7-46bf-ac2f-1a55fe1abd6f".device =
"/dev/disk/by-uuid/c03fc486-bdd7-46bf-ac2f-1a55fe1abd6f";
boot.initrd.luks.devices."luks-c03fc486-bdd7-46bf-ac2f-1a55fe1abd6f".device = "/dev/disk/by-uuid/c03fc486-bdd7-46bf-ac2f-1a55fe1abd6f";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/D299-5174";

View file

@ -1,5 +1,8 @@
{ inputs, pkgs, ... }:
let
{
inputs,
pkgs,
...
}: let
fenix = inputs.fenix.packages.${pkgs.system};
nixpkgs-wayland = inputs.nixpkgs-wayland.packages.${pkgs.system};
in {

View file

@ -1,7 +1,6 @@
# Taken from: https://github.com/hlissner/dotfiles/blob/master/lib/options.nix
{ lib, ... }:
let inherit (lib) mkOption types;
{lib, ...}: let
inherit (lib) mkOption types;
in {
mkOpt = type: default: mkOption {inherit type default;};

View file

@ -1,6 +1,10 @@
{ config, lib, pkgs, ... }:
with lib;
let
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.modules.programs.fish;
username = config.modules.other.system.username;
# not needed because I'm using nh os switch
@ -55,7 +59,8 @@ in {
src = pkgs.fishPlugins.tide.src;
}
];
shellAbbrs = {
shellAbbrs =
{
c = "clear";
cc = "cd ~ && clear";
mv = "mv -iv";
@ -72,7 +77,8 @@ in {
e = "emacs";
update = ''nh os switch "${gitPath}"'';
flake = "cd '${gitPath}'";
} // cfg.extraAliases;
}
// cfg.extraAliases;
};
};
};

View file

@ -1,6 +1,9 @@
{ config, lib, pkgs, ... }:
let
{
config,
lib,
pkgs,
...
}: let
lazyvim-config = pkgs.fetchFromGitHub {
owner = "Dragyx";
repo = "lazyvim-config";
@ -28,6 +31,5 @@ in {
recursive = true;
};
};
};
}

View file

@ -1,6 +1,10 @@
{ lib, config, ... }:
with lib;
let cfg = config.modules.programs.nh;
{
lib,
config,
...
}:
with lib; let
cfg = config.modules.programs.nh;
in {
options.modules.programs.nh.enable = mkEnableOption "nh";

View file

@ -1,8 +1,12 @@
# Taken from: https://github.com/hlissner/dotfiles/blob/master/modules/editors/emacs.nix
{ config, lib, pkgs, inputs, ... }:
with lib;
let
{
config,
lib,
pkgs,
inputs,
...
}:
with lib; let
cfg = config.modules.editors.emacs;
username = config.modules.other.system.username;
repoUrl = inputs.doomemacs;
@ -52,8 +56,7 @@ in {
beancount
];
home-manager.users.${username}.home.sessionPath =
[ "/home/vali/.config/emacs/bin" ];
home-manager.users.${username}.home.sessionPath = ["/home/vali/.config/emacs/bin"];
# modules.shell.zsh.rcFiles = [ "${configDir}/emacs/aliases.zsh" ];

View file

@ -1,5 +1,9 @@
{ config, lib, pkgs, ... }:
let
{
config,
lib,
pkgs,
...
}: let
cfg = config.modules.editors.helix;
username = config.modules.other.system.username;
in {
@ -17,13 +21,10 @@ in {
soft-wrap.enable = true;
lsp.display-messages = true;
cursor-shape = {insert = "bar";};
statusline.left =
[ "mode" "spinner" "version-control" "file-name" ];
statusline.left = ["mode" "spinner" "version-control" "file-name"];
};
keys.normal = {
C-g =
[ ":new" ":insert-output lazygit" ":buffer-close!" ":redraw" ];
C-g = [":new" ":insert-output lazygit" ":buffer-close!" ":redraw"];
C-t = [":new" ":insert-output fish" ":buffer-close!" ":redraw"];
esc = ["collapse_selection" "keep_primary_selection"];
A-H = "goto_previous_buffer";
@ -31,11 +32,13 @@ in {
A-w = ":buffer-close";
};
};
languages.language = [{
languages.language = [
{
name = "nix";
auto-format = true;
formatter.command = "${pkgs.nixfmt-classic}/bin/nixfmt";
}];
}
];
};
};
};

View file

@ -1,6 +1,10 @@
{ config, lib, pkgs, ... }:
with lib;
let
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.modules.editors.kakoune;
username = config.modules.other.system.username;
# inherit (inputs.kakoune.packages.${pkgs.system}) kakoun;
@ -41,8 +45,7 @@ in {
mode = "normal";
key = "<esc>";
effect = ";,";
docstring =
"Press escape to clear highlighted text and collapse cursors";
docstring = "Press escape to clear highlighted text and collapse cursors";
}
{
mode = "normal";
@ -119,6 +122,5 @@ in {
'';
};
};
};
}

View file

@ -1,6 +1,11 @@
{ config, lib, pkgs, buildGoModule, ... }:
with lib;
let
{
config,
lib,
pkgs,
buildGoModule,
...
}:
with lib; let
cfg = config.modules.programs.kakoune;
username = config.modules.other.system.username;
kakship = pkgs.rustPlatform.buildRustPackage rec {
@ -16,8 +21,7 @@ let
lockFile = "${src}/Cargo.lock";
outputHashes = {
"kak-0.1.2" = "sha256-RhtHQkC9yCSJtr/kbC5c9MavbL79acrsiEGXyoAST8U=";
"yew-ansi-0.1.0" =
"sha256-dSaEzqiOon+OqCZKQudzLRNP+Iv97kC+XZcTElKNrzs=";
"yew-ansi-0.1.0" = "sha256-dSaEzqiOon+OqCZKQudzLRNP+Iv97kC+XZcTElKNrzs=";
};
};

View file

@ -244,7 +244,8 @@
{
mode = "n";
key = "<C-d>";
action = "<C-d>zz";
action = "<C-d>";
#action = "<C-d>zz";
options = {
desc = "Allow C-d and C-u to keep the cursor in the middle";
};
@ -253,7 +254,8 @@
{
mode = "n";
key = "<C-u>";
action = "<C-u>zz";
#action = "<C-u>zz";
action = "<C-u>";
options = {
desc = "Allow C-d and C-u to keep the cursor in the middle";
};

View file

@ -31,10 +31,8 @@
name = "mode";
fmt = "string.lower";
color = {
fg =
"none";
bg =
"none";
fg = "none";
bg = "none";
};
}
];
@ -43,10 +41,8 @@
name = "branch";
icon = "";
color = {
fg =
"none";
bg =
"none";
fg = "none";
bg = "none";
};
}
"diff"
@ -63,10 +59,8 @@
};
};
color = {
fg =
"none";
bg =
"none";
fg = "none";
bg = "none";
};
}
];
@ -89,10 +83,8 @@
};
};
color = {
fg =
"none";
bg =
"none";
fg = "none";
bg = "none";
};
separator.left = "";
}
@ -101,10 +93,8 @@
{
name = "location";
color = {
fg =
"none";
bg =
"none";
fg = "none";
bg = "none";
};
}
];

View file

@ -81,11 +81,11 @@ programs.nixvim = {
}
{
opts = {
hl = "GruvboxBlue";
hl = "Gruvbox";
position = "center";
};
type = "text";
val = "https://github.com/elythh/nixvim";
val = "https://github.com/bloxx12/nichts";
}
];
};

View file

@ -82,7 +82,6 @@
# We don't need to see things like INSERT anymore
showmode = false;
};
};
}

View file

@ -1,7 +1,11 @@
{ config, pkgs, lib, inputs, ... }:
with lib;
let
{
config,
pkgs,
lib,
inputs,
...
}:
with lib; let
username = config.modules.other.system.username;
cfg = config.modules.programs.anyrun;
in {
@ -45,4 +49,3 @@ in {
};
};
}

View file

@ -1,5 +1,10 @@
{ config, inputs, lib, pkgs, ... }:
let
{
config,
inputs,
lib,
pkgs,
...
}: let
cfg = config.modules.programs.foot;
inherit (config.modules.other.system) username;
@ -36,8 +41,7 @@ in {
pad = "5x5 center";
resize-delay-ms = 100;
notify =
"${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}";
notify = "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}";
bold-text-in-bright = "no";
word-delimiters = '',`|:"'()[]{}<>'';
@ -59,8 +63,7 @@ in {
launch = "${pkgs.xdg-utils}/bin/xdg-open \${url}";
label-letters = "sadfjklewcmpgh";
osc8-underline = "always";
protocols =
"http, https, ftp, ftps, file, gemini, gopher, irc, ircs";
protocols = "http, https, ftp, ftps, file, gemini, gopher, irc, ircs";
uri-characters = ''
abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]'';
};

View file

@ -1,6 +1,10 @@
{ config, lib, pkgs, ... }:
with lib;
let
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.modules.themes.gtk;
username = config.modules.other.system.username;
in {
@ -47,7 +51,6 @@ in {
home.sessionVariables = {
#GTK_THEME = "Gruvbox-Dark-BL";
# GTK_USE_PORTAL = "1";
};
};
};

View file

@ -1,6 +1,10 @@
{ config, lib, pkgs, ... }:
with lib;
let
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.modules.programs.kitty;
username = config.modules.other.system.username;
in {
@ -19,9 +23,7 @@ in {
#background_opacity = "0.9";
confirm_os_window_close = "0";
};
};
};
};
}

View file

@ -1,6 +1,11 @@
{ config, lib, inputs, pkgs, ... }:
with lib;
let
{
config,
lib,
inputs,
pkgs,
...
}:
with lib; let
username = config.modules.other.system.username;
cfg = config.modules.programs.minecraft;
in {

View file

@ -1,6 +1,10 @@
{ config, lib, pkgs, ... }:
with lib;
let
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.modules.programs.mpv;
username = config.modules.other.system.username;
in {

View file

@ -1,6 +1,10 @@
{ config, lib, pkgs, ... }:
with lib;
let
{
config,
lib,
pkgs,
...
}:
with lib; let
theme = {
package = pkgs.gruvbox-gtk-theme;
name = "Gruvbox-Dark-BL";

View file

@ -1,7 +1,10 @@
{ config, pkgs, lib, ... }:
with lib;
let
{
config,
pkgs,
lib,
...
}:
with lib; let
username = config.modules.other.system.username;
cfg = config.modules.programs.rofi;
in {
@ -9,4 +12,3 @@ in {
config =
mkIf cfg.enable {environment.systemPackages = with pkgs; [rofi];};
}

View file

@ -1,5 +1,9 @@
{ config, inputs, lib, ... }:
let
{
config,
inputs,
lib,
...
}: let
cfg = config.modules.programs.schizofox;
inherit (config.modules.other.system) username;
@ -34,24 +38,21 @@ in {
};
search = {
defaultSearchEngine = "DuckDuckGo";
removeEngines =
[ "Google" "Bing" "Amazon.com" "eBay" "Twitter" "Wikipedia" ];
removeEngines = ["Google" "Bing" "Amazon.com" "eBay" "Twitter" "Wikipedia"];
addEngines = [
{
Name = "NixOS Packages";
Description = "NixOS Unstable package search";
Alias = "!np";
Method = "GET";
URLTemplate =
"https://search.nixos.org/packages?channel=unstable&query={searchTerms}";
URLTemplate = "https://search.nixos.org/packages?channel=unstable&query={searchTerms}";
}
{
Name = "NixOS Options";
Description = "NixOS Unstable option search";
Alias = "!no";
Method = "GET";
URLTemplate =
"https://search.nixos.org/options?channel=unstable&query={searchTerms}";
URLTemplate = "https://search.nixos.org/options?channel=unstable&query={searchTerms}";
}
{
Name = "NixOS Wiki";
@ -65,32 +66,28 @@ in {
Description = "Home Manager option search";
Alias = "!hm";
Method = "GET";
URLTemplate =
"https://mipmip.github.io/home-manager-option-search?query={searchTerms}";
URLTemplate = "https://mipmip.github.io/home-manager-option-search?query={searchTerms}";
}
{
Name = "Arch Wiki";
Description = "Arch Wiki search";
Alias = "!aw";
Method = "GET";
URLTemplate =
"https://wiki.archlinux.org/index.php?search={searchTerms}";
URLTemplate = "https://wiki.archlinux.org/index.php?search={searchTerms}";
}
{
Name = "Gentoo Wiki";
Description = "Gentoo Wiki search";
Alias = "!gw";
Method = "GET";
URLTemplate =
"https://wiki.gentoo.org/index.php?search={searchTerms}";
URLTemplate = "https://wiki.gentoo.org/index.php?search={searchTerms}";
}
{
Name = "Debian Wiki";
Description = "Debian Wiki search";
Alias = "!dw";
Method = "GET";
URLTemplate =
"https://wiki.debian.org/FrontPage?action=fullsearch&value={searchTerms}";
URLTemplate = "https://wiki.debian.org/FrontPage?action=fullsearch&value={searchTerms}";
}
{
Name = "noogle";
@ -106,15 +103,13 @@ in {
darkreader.enable = true;
# vimium.enable = true;
extraExtensions = {
"webextension@vimium".install_url =
"https://addons.mozilla.org/firefox/downloads/file/4259790/vimium_ff-2.1.2.xpi";
"webextension@vimium".install_url = "https://addons.mozilla.org/firefox/downloads/file/4259790/vimium_ff-2.1.2.xpi";
};
};
security = {
sanitizeOnShutdown = false;
sandbox = true;
userAgent =
"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:106.0) Gecko/20100101 Firefox/106.0";
userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:106.0) Gecko/20100101 Firefox/106.0";
};
misc = {

View file

@ -1,5 +1,10 @@
{ config, pkgs, lib, inputs, ... }:
let
{
config,
pkgs,
lib,
inputs,
...
}: let
cfg = config.modules.programs.spicetify;
username = config.modules.other.system.username;
spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;

View file

@ -1,6 +1,11 @@
{ config, lib, inputs, pkgs, ... }:
with lib;
let
{
config,
lib,
inputs,
pkgs,
...
}:
with lib; let
username = config.modules.other.system.username;
cfg = config.modules.programs.steam;
in {

View file

@ -1,6 +1,10 @@
{ config, pkgs, lib, ... }:
with lib;
let
{
config,
pkgs,
lib,
...
}:
with lib; let
cfg = config.modules.programs.stylix;
username = config.modules.other.system.username;
in {
@ -47,11 +51,10 @@ in {
sizes = {
terminal = 14;
popups = 14;
};
monospace = {
package =
(pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; });
pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
name = "JetBrainsMono";
};
serif = {

View file

@ -1,6 +1,10 @@
{ config, lib, pkgs, ... }:
with lib;
let
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.modules.programs.vesktop;
username = config.modules.other.system.username;
in {
@ -261,8 +265,7 @@ in {
ServerProfile.enabled = true;
ShikiCodeblocks = {
enabled = true;
theme =
"https://raw.githubusercontent.com/shikijs/shiki/0b28ad8ccfbf2615f2d9d38ea8255416b8ac3043/packages/shiki/themes/dark-plus.json";
theme = "https://raw.githubusercontent.com/shikijs/shiki/0b28ad8ccfbf2615f2d9d38ea8255416b8ac3043/packages/shiki/themes/dark-plus.json";
tryHljs = "SECONDARY";
uesDevIcon = "GREYSCALE";
};

View file

@ -1,13 +1,10 @@
{ pkgs, ... }:
let
{pkgs, ...}: let
vivado-desktop-symbol = pkgs.makeDesktopItem {
name = "vivado-2019-2";
desktopName = "Vivado";
exec = "${pkgs.nur.repos.Nick1296.vivado-2019-2}/bin/vivado";
};
in {
environment.systemPackages = with pkgs; [
# this propietary software is huge, but I need it for
# university

View file

@ -1,5 +1,10 @@
{ config, lib, inputs, pkgs, ... }:
let
{
config,
lib,
inputs,
pkgs,
...
}: let
cfg = config.modules.programs.waybar;
inherit (config.modules.other.system) username;
in {
@ -14,7 +19,8 @@ in {
layer = "top";
modules-left = ["custom/launcher" "tray" "hyprland/window"];
modules-center = ["hyprland/workspaces"];
modules-right = [ # "custom/dnd"
modules-right = [
# "custom/dnd"
"mpd"
"cpu"
"memory"
@ -28,8 +34,7 @@ in {
format = " {icon} {volume}%";
format-muted = " 󰸈 {volume}%";
format-icons = {default = ["󰕿" "󰖀" "󰕾"];};
on-click =
"${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
on-click = "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
};
"hyprland/workspaces" = {
sort-by-name = true;
@ -141,8 +146,7 @@ in {
actions = {on-click-right = "mode";};
};
mpd = {
format =
"󰝚 {artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})";
format = "󰝚 {artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})";
format-disconnected = "󰝚 Disconnected";
format-stopped = "󰝚 Stopped";
interval = 1;
@ -458,4 +462,3 @@ in {
};
};
}

View file

@ -1,6 +1,10 @@
{ config, lib, pkgs, ... }:
with lib;
let
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.modules.programs.zathura;
username = config.modules.other.system.username;
catppuccin = pkgs.fetchFromGitHub {
@ -9,14 +13,12 @@ let
rev = "4eb02fd206de63b2423f6deb58242d352545b52f";
hash = "sha256-/vD/hOi6KcaGyAp6Az7jL5/tQSGRzIrf0oHjAJf4QbI=";
};
in {
options.modules.programs.zathura.enable = mkEnableOption "zathura";
config = mkIf cfg.enable {
home-manager.users.${username} = {
xdg.configFile."zathura/catppuccin-mocha".source =
"${catppuccin}/src/catppuccin-mocha";
xdg.configFile."zathura/catppuccin-mocha".source = "${catppuccin}/src/catppuccin-mocha";
programs.zathura = {
enable = true;
extraConfig = ''

View file

@ -1,2 +1 @@
_: {imports = [./home-manager.nix ./system.nix ./xdg.nix];}

View file

@ -1,6 +1,11 @@
{ config, inputs, lib, self, ... }:
with lib;
let
{
config,
inputs,
lib,
self,
...
}:
with lib; let
cfg = config.modules.other.home-manager;
username = config.modules.other.system.username;
in {

View file

@ -1,6 +1,10 @@
{ config, lib, ... }:
with lib;
let cfg = config.modules.other.system;
{
config,
lib,
...
}:
with lib; let
cfg = config.modules.other.system;
in {
options.modules.other.system = {
hostname = mkOption {

View file

@ -1,5 +1,4 @@
{ config, ... }:
let
{config, ...}: let
username = config.modules.other.system.username;
hmCfg = config.home-manager.users.${username};
@ -11,7 +10,6 @@ let
text_editor = "helix.desktop";
terminal = "foot.desktop";
in {
environment.sessionVariables = {TERMINAL = "${terminal}";};
home-manager.users.${username} = {

View file

@ -1,5 +1,10 @@
{ config, inputs, lib, pkgs, ... }:
let
{
config,
inputs,
lib,
pkgs,
...
}: let
cfg = config.modules.services.dunst;
inherit (config.modules.other.system) username;

View file

@ -1,6 +1,11 @@
{ config, inputs, lib, pkgs, ... }:
with lib;
let
{
config,
inputs,
lib,
pkgs,
...
}:
with lib; let
cfg = config.modules.services.greetd;
inherit (config.modules.other.system) username;

View file

@ -1,6 +1,10 @@
{ config, lib, ... }:
with lib;
let cfg = config.modules.services.pipewire;
{
config,
lib,
...
}:
with lib; let
cfg = config.modules.services.pipewire;
in {
options.modules.services.pipewire.enable = mkEnableOption "pipewire";

View file

@ -1,11 +1,14 @@
{ config, lib, pkgs, ... }:
with lib;
let
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.modules.programs.ssh;
username = config.modules.other.system.username;
in {
options.modules.programs.ssh.enable = mkEnableOption "ssh";
config = mkIf cfg.enable {programs.ssh = {startAgent = true;};};
}

View file

@ -1,6 +1,9 @@
{ config, lib, ... }:
with lib;
let
{
config,
lib,
...
}:
with lib; let
cfg = config.modules.programs.btop;
username = config.modules.other.system.username;
in {

View file

@ -1,6 +1,10 @@
{ config, lib, pkgs, ... }:
with lib;
let
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.modules.programs.ncmpcpp;
username = config.modules.other.system.username;
in {
@ -11,20 +15,16 @@ in {
xdg.configFile."ncmpcpp/config".source = ./config;
programs.ncmpcpp = {
enable = true;
package = (pkgs.ncmpcpp.override { visualizerSupport = true; });
package = pkgs.ncmpcpp.override {visualizerSupport = true;};
mpdMusicDir = "/home/vali/Nextcloud/Media/Music";
settings = {
mpd_host = "127.0.0.1";
mpd_port = "6600";
alternative_header_first_line_format = "$5{$b%t$/b}$9";
alternative_header_second_line_format =
"$3by $7{$b%a$/b}$9 $3from $7{$b%b$/b}$9 $5{(%y)}";
song_list_format =
" $2%n$(end) $9 $3%a$(end) $(245)-$9 $(246)%t$9 $R{ $5%y$9}$(end) $(246)%lq$(end)";
song_columns_list_format =
"(3f)[red]{n} (3f)[246]{} (35)[white]{t} (18)[blue]{a} (30)[green]{b} (5f)[yellow]{d} (5f)[red]{y} (7f)[magenta]{l}";
song_status_format =
"$b $8%A $8$3 $3%t $3$5 $5%b $5$2 $2%y $2$8 %g";
alternative_header_second_line_format = "$3by $7{$b%a$/b}$9 $3from $7{$b%b$/b}$9 $5{(%y)}";
song_list_format = " $2%n$(end) $9 $3%a$(end) $(245)-$9 $(246)%t$9 $R{ $5%y$9}$(end) $(246)%lq$(end)";
song_columns_list_format = "(3f)[red]{n} (3f)[246]{} (35)[white]{t} (18)[blue]{a} (30)[green]{b} (5f)[yellow]{d} (5f)[red]{y} (7f)[magenta]{l}";
song_status_format = "$b $8%A $8$3 $3%t $3$5 $5%b $5$2 $2%y $2$8 %g";
playlist_display_mode = "columns";
browser_display_mode = "columns";
search_engine_display_mode = "columns";

View file

@ -1,6 +1,11 @@
{ config, inputs, lib, pkgs, ... }:
with lib;
let
{
config,
inputs,
lib,
pkgs,
...
}:
with lib; let
cfg = config.modules.programs.neovim;
username = config.modules.other.system.username;
in {
@ -157,7 +162,6 @@ in {
enable = true;
settings.theme = "dark";
};
};
extraPlugins = with pkgs.vimPlugins; [zen-mode-nvim lazygit-nvim];

View file

@ -1,6 +1,9 @@
{ config, lib, ... }:
with lib;
let
{
config,
lib,
...
}:
with lib; let
cfg = config.modules.programs.newsboat;
username = config.modules.other.system.username;
in {
@ -51,13 +54,11 @@ in {
}
{
title = "Veronica Explains";
url =
"https://www.youtube.com/feeds/videos.xml?channel_id=UCMiyV_Ib77XLpzHPQH_q0qQ";
url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCMiyV_Ib77XLpzHPQH_q0qQ";
}
{
title = "Mental Outlaw";
url =
"https://www.youtube.com/feeds/videos.xml?channel_id=UC7YOGHUfC1Tb6E4pudI9STA";
url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC7YOGHUfC1Tb6E4pudI9STA";
}
{
title = "Hacker News";

View file

@ -1,6 +1,9 @@
{ config, lib, ... }:
with lib;
let
{
config,
lib,
...
}:
with lib; let
cfg = config.modules.programs.yazi;
username = config.modules.other.system.username;
in {

View file

@ -1,10 +1,14 @@
{ config, pkgs, inputs, ... }: {
{
config,
pkgs,
inputs,
...
}: {
imports = [
# inputs.niri.nixosModules.niri
./hypr
./variables.nix
];
# programs.niri.enable = true;
}

View file

@ -1,18 +1,28 @@
{ config, pkgs, lib, inputs, ... }:
let
{
config,
pkgs,
lib,
inputs,
...
}: let
cfg = config.modules.wms.wayland.hyprland;
username = config.modules.other.system.username;
inherit (inputs.hyprland.packages.${pkgs.system}) hyprland;
inherit (inputs.anyrun.packages.${pkgs.system}) anyrun;
inherit (inputs.nixpkgs-wayland.packages.${pkgs.system})
foot swww wlsunset;
inherit
(inputs.nixpkgs-wayland.packages.${pkgs.system})
foot
swww
wlsunset
;
inherit (inputs.waybar.packages.${pkgs.system}) waybar;
inherit (inputs.split-monitor-workspaces.packages.${pkgs.system})
split-monitor-workspaces;
inherit
(inputs.split-monitor-workspaces.packages.${pkgs.system})
split-monitor-workspaces
;
in {
options.modules.wms.wayland.hyprland.enable = lib.mkEnableOption "hyprland";
config = lib.mkIf cfg.enable {
# xdg Portal
xdg.portal = {
enable = true;
@ -220,7 +230,6 @@ in {
"$mainMod, J, movefocus, d"
"$mainMod, K, movefocus, u"
"$mainMod, L, movefocus, r"
];
# Media controls
bindl = let
@ -294,4 +303,3 @@ in {
environment.systemPackages = with pkgs; [libnotify];
};
}

View file

@ -1,4 +1,9 @@
{ pkgs, theme, config, ... }:
{
pkgs,
theme,
config,
...
}:
with theme.colors; {
programs.niri.settings = {
outputs."eDP-1".position = {
@ -76,8 +81,10 @@ with theme.colors; {
window-close = smooth;
};
window-rules = [{
geometry-corner-radius = let radius = 8.0;
window-rules = [
{
geometry-corner-radius = let
radius = 8.0;
in {
bottom-left = radius;
bottom-right = radius;
@ -85,17 +92,19 @@ with theme.colors; {
top-right = radius;
};
clip-to-geometry = true;
}];
}
];
binds = with config.lib.niri.actions;
let sh = spawn "sh" "-c";
binds = with config.lib.niri.actions; let
sh = spawn "sh" "-c";
in {
"Mod+Return" = {
action = spawn "${pkgs.foot}/bin/foot";
cooldown-ms = 500;
};
"Mod+Space".action = spawn "${pkgs.fuzzel}/bin/fuzzel";
"Mod+V".action = sh
"Mod+V".action =
sh
"${pkgs.cliphist}/bin/cliphist list | fuzzel --dmenu | cliphist decode | wl-copy";
"Mod+Shift+Period".action = spawn "emoji";

View file

@ -1,5 +1,9 @@
{ pkgs, lib, theme, ... }:
let
{
pkgs,
lib,
theme,
...
}: let
mkService = lib.recursiveUpdate {
Unit.PartOf = ["graphical-session.target"];
Unit.After = ["graphical-session.target"];

View file

@ -1,5 +1,9 @@
{ pkgs, inputs, config, ... }: {
{
pkgs,
inputs,
config,
...
}: {
programs.niri = {
enable = true;
package = inputs.niri.packages.${pkgs.system}.niri-unstable;

View file

@ -1,5 +1,8 @@
{ config, lib, ... }:
let
{
config,
lib,
...
}: let
cfg = config.modules.wms.wayland;
hyprland = config.modules.wms.wayland.hyprland;
in {

View file

@ -1,6 +1,11 @@
{ pkgs, lib, config, callPackage, ... }:
with lib;
let
{
pkgs,
lib,
config,
callPackage,
...
}:
with lib; let
username = config.modules.other.system.username;
cfg = config.modules.programs.awesome;
in {
@ -17,8 +22,7 @@ in {
options = "grp:alt_space_toggle";
};
windowManager.awesome.enable = true;
displayManager.setupCommands =
"${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-1 --rotate normal --output DP-2 --rotate normal --left-of HDMI-1 --output HDMI-0 --right-of HDMI-1";
displayManager.setupCommands = "${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-1 --rotate normal --output DP-2 --rotate normal --left-of HDMI-1 --output HDMI-0 --right-of HDMI-1";
};
};
};

View file

@ -9,8 +9,7 @@
};
boot.plymouth = {
enable = false;
font =
"${pkgs.jetbrains-mono}/share/fonts/truetype/JetBrainsMono-Regular.ttf";
font = "${pkgs.jetbrains-mono}/share/fonts/truetype/JetBrainsMono-Regular.ttf";
themePackages = [pkgs.catppuccin-plymouth];
theme = "catppuccin-macchiato";
};

View file

@ -1,5 +1,10 @@
{ config, lib, pkgs, ... }:
let username = config.modules.other.system.username;
{
config,
lib,
pkgs,
...
}: let
username = config.modules.other.system.username;
in {
hardware.bluetooth = {
enable = true;

View file

@ -1,4 +1,9 @@
{ pkgs, config, inputs, ... }: {
{
pkgs,
config,
inputs,
...
}: {
services.xserver.videoDrivers = ["nvidia"];
hardware.opengl = {
enable = true;
@ -22,4 +27,3 @@
};
};
}

View file

@ -1,5 +1,9 @@
{ config, lib, ... }:
let username = config.modules.other.system.username;
{
config,
lib,
...
}: let
username = config.modules.other.system.username;
in {
networking = {
networkmanager = {

View file

@ -1,3 +1,7 @@
{ inputs, lib, ... }: {
{
inputs,
lib,
...
}: {
nix.registry = lib.mapAttrs (_: v: {flake = v;}) inputs;
}

View file

@ -1,5 +1,8 @@
{ config, lib, ... }:
{
config,
lib,
...
}:
with lib; {
options.modules.other.system.monitors = mkOption {
description = "\n List of monitors to use\n ";
@ -69,5 +72,4 @@ with lib; {
};
});
};
}

View file

@ -1,6 +1,8 @@
{ inputs, outputs, ... }:
let
{
inputs,
outputs,
...
}: let
add_nur = self: super: {
# nur-no-pkgs = import inputs.nur-no-pkgs { pkgs = inputs.nixpkgs.legacyPackages.${profile-config.system}; nurpkgs = inputs.nixpkgs.legacyPackages.${profile-config.system}; };
nur = import inputs.nur {