new formatting, nixvim is working
This commit is contained in:
parent
6513d61fa3
commit
0e22544a8a
88 changed files with 1994 additions and 1845 deletions
11
flake.nix
11
flake.nix
|
|
@ -1,8 +1,12 @@
|
|||
{
|
||||
description = "My NixOS config flake";
|
||||
outputs = inputs@{ self, nixpkgs, ... }: {
|
||||
outputs = inputs @ {
|
||||
self,
|
||||
nixpkgs,
|
||||
...
|
||||
}: {
|
||||
inherit (nixpkgs) lib;
|
||||
nixosConfigurations = import ./hosts { inherit inputs; };
|
||||
nixosConfigurations = import ./hosts {inherit inputs;};
|
||||
};
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
|
|
@ -49,7 +53,7 @@
|
|||
};
|
||||
};
|
||||
spicetify-nix.url = "github:the-argus/spicetify-nix";
|
||||
nur = { url = "github:nix-community/NUR"; };
|
||||
nur = {url = "github:nix-community/NUR";};
|
||||
nixvim = {
|
||||
url = "github:nix-community/nixvim";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -63,6 +67,5 @@
|
|||
url = "github:nix-community/fenix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
{ inputs, ... }:
|
||||
let
|
||||
{inputs, ...}: let
|
||||
inherit (inputs) self;
|
||||
inherit (self) lib;
|
||||
in {
|
||||
mars = lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit lib inputs self; };
|
||||
specialArgs = {inherit lib inputs self;};
|
||||
modules = [
|
||||
inputs.stylix.nixosModules.stylix
|
||||
./vali/mars
|
||||
|
|
@ -15,5 +14,4 @@ in {
|
|||
inputs.nixvim.nixosModules.nixvim
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }: {
|
||||
{pkgs, ...}: {
|
||||
# allow unfree packages
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
# Time Zone
|
||||
|
|
@ -8,17 +8,17 @@
|
|||
console.keyMap = "de";
|
||||
nix = {
|
||||
settings = {
|
||||
substituters = [ "https://hyprland.cachix.org" ];
|
||||
substituters = ["https://hyprland.cachix.org"];
|
||||
trusted-public-keys = [
|
||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||
];
|
||||
# enable flakes
|
||||
experimental-features = [ "nix-command" "flakes" ];
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
# reduce file size used & automatic garbage collector
|
||||
auto-optimise-store = true;
|
||||
};
|
||||
};
|
||||
security.sudo.package = pkgs.sudo.override { withInsults = true; };
|
||||
security.sudo.package = pkgs.sudo.override {withInsults = true;};
|
||||
security.polkit.enable = true;
|
||||
programs.kdeconnect.enable = true;
|
||||
programs.dconf.enable = true;
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
dunst.enable = true;
|
||||
};
|
||||
themes = {
|
||||
gtk = { enable = true; };
|
||||
gtk = {enable = true;};
|
||||
qt = {
|
||||
enable = false;
|
||||
package = pkgs.kde-gruvbox;
|
||||
|
|
|
|||
|
|
@ -1,22 +1,24 @@
|
|||
{ 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" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/0423508a-6906-4872-baeb-2b1e6bd017a4";
|
||||
fsType = "ext4";
|
||||
options = [ "noatime" "nodiratime" "discard" ];
|
||||
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";
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
# 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; };
|
||||
mkOpt = type: default: mkOption {inherit type default;};
|
||||
|
||||
mkOpt' = type: default: description:
|
||||
mkOption { inherit type default description; };
|
||||
mkOption {inherit type default description;};
|
||||
|
||||
mkBoolOpt = default:
|
||||
mkOption {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
_: { imports = [ ./neovim.nix ./fish.nix ./nh.nix ]; }
|
||||
_: {imports = [./neovim.nix ./fish.nix ./nh.nix];}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -12,7 +16,7 @@ in {
|
|||
extraAliases = mkOption {
|
||||
type = types.attrs;
|
||||
description = "extra shell aliases";
|
||||
default = { };
|
||||
default = {};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -22,12 +26,12 @@ in {
|
|||
users.users.${username}.shell = pkgs.fish;
|
||||
|
||||
environment = {
|
||||
shells = [ pkgs.fish ];
|
||||
pathsToLink = [ "/share/fish" ];
|
||||
shells = [pkgs.fish];
|
||||
pathsToLink = ["/share/fish"];
|
||||
};
|
||||
|
||||
home-manager.users.${username} = {
|
||||
home.packages = with pkgs; [ nix-output-monitor ];
|
||||
home.packages = with pkgs; [nix-output-monitor];
|
||||
programs.zoxide.enable = true;
|
||||
programs.zoxide.enableFishIntegration = true;
|
||||
programs.fish = {
|
||||
|
|
@ -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;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
lazyvim-config = pkgs.fetchFromGitHub {
|
||||
owner = "Dragyx";
|
||||
repo = "lazyvim-config";
|
||||
|
|
@ -14,7 +17,7 @@ in {
|
|||
|
||||
config = lib.mkIf cfg.enable {
|
||||
home-manager.users.${username} = {
|
||||
home.packages = with pkgs; [ lazygit ripgrep fd gcc xclip rust-analyzer ];
|
||||
home.packages = with pkgs; [lazygit ripgrep fd gcc xclip rust-analyzer];
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
viAlias = true;
|
||||
|
|
@ -28,6 +31,5 @@ in {
|
|||
recursive = true;
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
_: { imports = [ ./cli ./gui ./tui ./other ./services ./editors ./wms ]; }
|
||||
_: {imports = [./cli ./gui ./tui ./other ./services ./editors ./wms];}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
_: { imports = [ ./emacs.nix ./helix.nix ./kakoune.nix ./nixvim ]; }
|
||||
_: {imports = [./emacs.nix ./helix.nix ./kakoune.nix ./nixvim];}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -20,18 +24,18 @@ in {
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
## Emacs itself as an overlay
|
||||
nixpkgs.overlays = [ inputs.emacs-overlay.overlay ];
|
||||
nixpkgs.overlays = [inputs.emacs-overlay.overlay];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
binutils # native-comp needs 'as', provided by this
|
||||
# 28.2 + native-comp
|
||||
((emacsPackagesFor emacsNativeComp).emacsWithPackages
|
||||
(epkgs: [ epkgs.vterm ]))
|
||||
(epkgs: [epkgs.vterm]))
|
||||
|
||||
emacs-desktop-symbol
|
||||
## Doom dependencies
|
||||
git
|
||||
(ripgrep.override { withPCRE2 = true; })
|
||||
(ripgrep.override {withPCRE2 = true;})
|
||||
gnutls # for TLS connectivity
|
||||
|
||||
## Optional dependencies
|
||||
|
|
@ -41,7 +45,7 @@ in {
|
|||
|
||||
## Module dependencies
|
||||
# :checkers spell
|
||||
(aspellWithDicts (ds: with ds; [ en en-computers en-science ]))
|
||||
(aspellWithDicts (ds: with ds; [en en-computers en-science]))
|
||||
# :tools editorconfig
|
||||
editorconfig-core-c # per-project style config
|
||||
# :tools lookup & :lang org +roam
|
||||
|
|
@ -52,12 +56,11 @@ 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" ];
|
||||
|
||||
fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ];
|
||||
fonts.fonts = [pkgs.emacs-all-the-icons-fonts];
|
||||
|
||||
system.userActivationScripts = mkIf cfg.doom.enable {
|
||||
installDoomEmacs = ''
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.modules.editors.helix;
|
||||
username = config.modules.other.system.username;
|
||||
in {
|
||||
|
|
@ -16,26 +20,25 @@ in {
|
|||
bufferline = "multiple";
|
||||
soft-wrap.enable = true;
|
||||
lsp.display-messages = true;
|
||||
cursor-shape = { insert = "bar"; };
|
||||
statusline.left =
|
||||
|
||||
[ "mode" "spinner" "version-control" "file-name" ];
|
||||
cursor-shape = {insert = "bar";};
|
||||
statusline.left = ["mode" "spinner" "version-control" "file-name"];
|
||||
};
|
||||
keys.normal = {
|
||||
C-g =
|
||||
[ ":new" ":insert-output lazygit" ":buffer-close!" ":redraw" ];
|
||||
C-t = [ ":new" ":insert-output fish" ":buffer-close!" ":redraw" ];
|
||||
esc = [ "collapse_selection" "keep_primary_selection" ];
|
||||
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";
|
||||
A-L = "goto_next_buffer";
|
||||
A-w = ":buffer-close";
|
||||
};
|
||||
};
|
||||
languages.language = [{
|
||||
languages.language = [
|
||||
{
|
||||
name = "nix";
|
||||
auto-format = true;
|
||||
formatter.command = "${pkgs.nixfmt-classic}/bin/nixfmt";
|
||||
}];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 {
|
|||
'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
_: { imports = [ ./kakoune.nix ]; }
|
||||
_: {imports = [./kakoune.nix];}
|
||||
|
|
|
|||
|
|
@ -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=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -70,7 +74,7 @@ let
|
|||
description = "Handy Kakoune companion.";
|
||||
homepage = "https://github.com/kkga/kks";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ kalbasit ];
|
||||
maintainers = with maintainers; [kalbasit];
|
||||
};
|
||||
};
|
||||
kak-alacritty = pkgs.kakouneUtils.buildKakounePluginFrom2Nix rec {
|
||||
|
|
@ -97,7 +101,7 @@ let
|
|||
in {
|
||||
options.modules.programs.kakoune.enable = mkEnableOption "kakoune";
|
||||
config = mkIf cfg.enable {
|
||||
home-manager.users.${username} = { programs.kakoune.enable = true; };
|
||||
home-manager.users.${username} = {programs.kakoune.enable = true;};
|
||||
environment.systemPackages = with pkgs; [
|
||||
rust-analyzer
|
||||
rustfmt # Rust LSP
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -74,5 +74,5 @@
|
|||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@
|
|||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -97,5 +97,5 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,5 +94,5 @@
|
|||
border = _border
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -184,5 +184,5 @@
|
|||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,5 +48,5 @@
|
|||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,36 +5,34 @@
|
|||
disabledFiletypes = {
|
||||
statusline = ["dashboard" "alpha" "starter"];
|
||||
};
|
||||
# theme = {
|
||||
# normal = {
|
||||
# a = {
|
||||
# bg = "#b4befe";
|
||||
# fg = "#1c1d21";
|
||||
# };
|
||||
# b = {
|
||||
# bg = "nil";
|
||||
# };
|
||||
# c = {
|
||||
# bg = "nil";
|
||||
# };
|
||||
# z = {
|
||||
# bg = "nil";
|
||||
# };
|
||||
# y = {
|
||||
# bg = "nil";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# theme = {
|
||||
# normal = {
|
||||
# a = {
|
||||
# bg = "#b4befe";
|
||||
# fg = "#1c1d21";
|
||||
# };
|
||||
# b = {
|
||||
# bg = "nil";
|
||||
# };
|
||||
# c = {
|
||||
# bg = "nil";
|
||||
# };
|
||||
# z = {
|
||||
# bg = "nil";
|
||||
# };
|
||||
# y = {
|
||||
# bg = "nil";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
sections = {
|
||||
lualine_a = [
|
||||
{
|
||||
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";
|
||||
};
|
||||
}
|
||||
];
|
||||
|
|
|
|||
|
|
@ -42,5 +42,5 @@ in {
|
|||
filetype = "nu",
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
programs.nixvim = {
|
||||
programs.nixvim = {
|
||||
plugins.alpha = let
|
||||
nixFlake = [
|
||||
"⠄⠄⠄⢰⣧⣼⣯⠄⣸⣠⣶⣶⣦⣾⠄⠄⠄⠄⡀⠄⢀⣿⣿⠄⠄⠄⢸⡇⠄⠄"
|
||||
|
|
@ -81,13 +81,13 @@ programs.nixvim = {
|
|||
}
|
||||
{
|
||||
opts = {
|
||||
hl = "GruvboxBlue";
|
||||
hl = "Gruvbox";
|
||||
position = "center";
|
||||
};
|
||||
type = "text";
|
||||
val = "https://github.com/elythh/nixvim";
|
||||
val = "https://github.com/bloxx12/nichts";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@
|
|||
text = "I use Neovim (and NixOS, BTW)",
|
||||
})
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -173,5 +173,5 @@ in {
|
|||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,5 +43,5 @@
|
|||
return notify(message, level, merged_opts)
|
||||
end
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -208,5 +208,5 @@
|
|||
}
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,5 +54,5 @@ in {
|
|||
action = "<cmd>CopilotChatCommit<cr>";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,5 +54,5 @@
|
|||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,5 +48,5 @@
|
|||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@
|
|||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,7 +82,6 @@
|
|||
|
||||
# We don't need to see things like INSERT anymore
|
||||
showmode = false;
|
||||
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,18 @@
|
|||
{ 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 {
|
||||
options.modules.programs.anyrun.enable = mkEnableOption "anyrun";
|
||||
config = mkIf cfg.enable {
|
||||
home-manager.users.${username} = {
|
||||
imports = [ inputs.anyrun.homeManagerModules.default ];
|
||||
imports = [inputs.anyrun.homeManagerModules.default];
|
||||
|
||||
programs.anyrun = {
|
||||
enable = true;
|
||||
|
|
@ -45,4 +49,3 @@ in {
|
|||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
_: { imports = [ ./anyrun.nix ]; }
|
||||
_: {imports = [./anyrun.nix];}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
@ -11,7 +16,7 @@ in {
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.sessionVariables = { TERM = "foot"; };
|
||||
environment.sessionVariables = {TERM = "foot";};
|
||||
home-manager.users.${username} = {
|
||||
programs.foot = {
|
||||
enable = true;
|
||||
|
|
@ -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-_.,~:;/?#@!$&%*+="'()[]'';
|
||||
};
|
||||
|
|
@ -93,7 +96,7 @@ in {
|
|||
# bright6 = "94e2d5"; # teal
|
||||
# bright7 = "a6adc8"; # Subtext 0
|
||||
# };
|
||||
csd = { preferred = "server"; };
|
||||
csd = {preferred = "server";};
|
||||
key-bindings = {
|
||||
show-urls-launch = "Control+Shift+u";
|
||||
unicode-input = "Control+Shift+i";
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
@ -12,7 +17,7 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
# Set wayland environment flag
|
||||
environment.variables =
|
||||
mkIf cfg.wayland { __GL_THREADED_OPTIMIZATIONS = 0; };
|
||||
mkIf cfg.wayland {__GL_THREADED_OPTIMIZATIONS = 0;};
|
||||
# Install glfw-wayland-minecraft
|
||||
environment.systemPackages = with pkgs;
|
||||
mkIf cfg.wayland [
|
||||
|
|
@ -21,7 +26,7 @@ in {
|
|||
|
||||
home-manager.users.${username} = {
|
||||
# Install minecraft
|
||||
home.packages = with pkgs; [ prismlauncher ];
|
||||
home.packages = with pkgs; [prismlauncher];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
@ -17,7 +21,7 @@ in {
|
|||
osd-bar = "no";
|
||||
border = "no";
|
||||
};
|
||||
scripts = with pkgs.mpvScripts; [ mpris thumbfast sponsorblock uosc ];
|
||||
scripts = with pkgs.mpvScripts; [mpris thumbfast sponsorblock uosc];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
@ -29,7 +33,7 @@ in {
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.sessionVariables = { QT_QPA_PLATFORMTHEME = "qt5ct"; };
|
||||
environment.sessionVariables = {QT_QPA_PLATFORMTHEME = "qt5ct";};
|
||||
environment.variables = {
|
||||
QT_STYLE_OVERRIDE = lib.mkForce "kvantum";
|
||||
GTK_THEME = theme.name;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
username = config.modules.other.system.username;
|
||||
cfg = config.modules.programs.rofi;
|
||||
in {
|
||||
options.modules.programs.rofi.enable = mkEnableOption "rofi";
|
||||
config =
|
||||
mkIf cfg.enable { environment.systemPackages = with pkgs; [ rofi ]; };
|
||||
mkIf cfg.enable {environment.systemPackages = with pkgs; [rofi];};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,19 @@
|
|||
{ config, inputs, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.modules.programs.schizofox;
|
||||
inherit (config.modules.other.system) username;
|
||||
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
in {
|
||||
options.modules.programs.schizofox = { enable = mkEnableOption "schizofox"; };
|
||||
options.modules.programs.schizofox = {enable = mkEnableOption "schizofox";};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home-manager.users.${username} = {
|
||||
imports = [ inputs.schizofox.homeManagerModule ];
|
||||
imports = [inputs.schizofox.homeManagerModule];
|
||||
|
||||
programs.schizofox = {
|
||||
enable = true;
|
||||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -8,7 +13,7 @@ in {
|
|||
options.modules.programs.spicetify.enable = lib.mkEnableOption "spicetify";
|
||||
config = lib.mkIf cfg.enable {
|
||||
home-manager.users.${username} = {
|
||||
imports = [ inputs.spicetify-nix.homeManagerModule ];
|
||||
imports = [inputs.spicetify-nix.homeManagerModule];
|
||||
programs.spicetify = {
|
||||
enable = true;
|
||||
spotifyPackage = pkgs.spotify;
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
@ -16,6 +21,6 @@ in {
|
|||
dedicatedServer.openFirewall = true;
|
||||
gamescopeSession.enable = mkIf cfg.gamescope true;
|
||||
};
|
||||
home-manager.users.${username} = { };
|
||||
home-manager.users.${username} = {};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,18 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
with lib;
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.modules.programs.vesktop;
|
||||
username = config.modules.other.system.username;
|
||||
in {
|
||||
options.modules.programs.vesktop = { enable = mkEnableOption "vesktop"; };
|
||||
options.modules.programs.vesktop = {enable = mkEnableOption "vesktop";};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home-manager.users.${username} = {
|
||||
home.packages = with pkgs; [ vesktop ];
|
||||
home.packages = with pkgs; [vesktop];
|
||||
xdg.configFile."vesktop/settings.json".text = builtins.toJSON {
|
||||
discordBranch = "ptb";
|
||||
firstLaunch = false;
|
||||
|
|
@ -31,7 +35,7 @@ in {
|
|||
themeLinks = [
|
||||
"https://github.com/Costeer/Gruvbox-Material-Themes/blob/main/Discord%20Theme/gruvboxmaterial.theme.css"
|
||||
];
|
||||
enabledThemes = [ "gruvboxmaterial.theme.css" ];
|
||||
enabledThemes = ["gruvboxmaterial.theme.css"];
|
||||
enableReactDevtools = true;
|
||||
frameless = false;
|
||||
transparent = false;
|
||||
|
|
@ -129,7 +133,7 @@ in {
|
|||
iLoveSpam.enabled = true;
|
||||
IgnoreActivities = {
|
||||
enabled = true;
|
||||
ignoredActivities = [ ];
|
||||
ignoredActivities = [];
|
||||
};
|
||||
ImageZoom = {
|
||||
enabled = true;
|
||||
|
|
@ -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";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
@ -12,9 +17,10 @@ in {
|
|||
settings.mainBar = {
|
||||
gtk-layer-shell = true;
|
||||
layer = "top";
|
||||
modules-left = [ "custom/launcher" "tray" "hyprland/window" ];
|
||||
modules-center = [ "hyprland/workspaces" ];
|
||||
modules-right = [ # "custom/dnd"
|
||||
modules-left = ["custom/launcher" "tray" "hyprland/window"];
|
||||
modules-center = ["hyprland/workspaces"];
|
||||
modules-right = [
|
||||
# "custom/dnd"
|
||||
"mpd"
|
||||
"cpu"
|
||||
"memory"
|
||||
|
|
@ -27,9 +33,8 @@ in {
|
|||
scroll-step = "1";
|
||||
format = " {icon} {volume}%";
|
||||
format-muted = " {volume}%";
|
||||
format-icons = { default = [ "" "" "" ]; };
|
||||
on-click =
|
||||
"${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
|
||||
format-icons = {default = ["" "" ""];};
|
||||
on-click = "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
|
||||
};
|
||||
"hyprland/workspaces" = {
|
||||
sort-by-name = true;
|
||||
|
|
@ -137,12 +142,11 @@ in {
|
|||
waves = false;
|
||||
noise_reduction = 0.77;
|
||||
input_delay = 0;
|
||||
format-icons = [ "▁" "▂" "▃" "▄" "▅" "▆" "▇" "█" ];
|
||||
actions = { on-click-right = "mode"; };
|
||||
format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
|
||||
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 {
|
|||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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,20 +13,18 @@ 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 = ''
|
||||
include catppuccin-mocha
|
||||
'';
|
||||
options = { selection-clipboard = "clipboard"; };
|
||||
options = {selection-clipboard = "clipboard";};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
_: { imports = [ ./home-manager.nix ./system.nix ./xdg.nix ]; }
|
||||
|
||||
_: {imports = [./home-manager.nix ./system.nix ./xdg.nix];}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
@ -13,7 +18,7 @@ in {
|
|||
home-manager = {
|
||||
useUserPackages = true;
|
||||
useGlobalPkgs = true;
|
||||
extraSpecialArgs = { inherit inputs self; };
|
||||
extraSpecialArgs = {inherit inputs self;};
|
||||
users.${username} = {
|
||||
programs = {
|
||||
home-manager.enable = true;
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
@ -24,7 +28,7 @@ in {
|
|||
|
||||
users.users.${cfg.username} = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ];
|
||||
extraGroups = ["wheel"];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ config, ... }:
|
||||
let
|
||||
{config, ...}: let
|
||||
username = config.modules.other.system.username;
|
||||
hmCfg = config.home-manager.users.${username};
|
||||
|
||||
|
|
@ -11,8 +10,7 @@ let
|
|||
text_editor = "helix.desktop";
|
||||
terminal = "foot.desktop";
|
||||
in {
|
||||
|
||||
environment.sessionVariables = { TERMINAL = "${terminal}"; };
|
||||
environment.sessionVariables = {TERMINAL = "${terminal}";};
|
||||
|
||||
home-manager.users.${username} = {
|
||||
xdg = {
|
||||
|
|
@ -23,42 +21,42 @@ in {
|
|||
mimeApps = {
|
||||
enable = true;
|
||||
defaultApplications = {
|
||||
"text/html" = [ primary_browser ];
|
||||
"x-scheme-handler/http" = [ primary_browser ];
|
||||
"x-scheme-handler/https" = [ primary_browser ];
|
||||
"x-scheme-handler/about" = [ primary_browser ];
|
||||
"x-scheme-handler/unknown" = [ primary_browser ];
|
||||
"x-scheme-handler/mailto" = [ mail_client ];
|
||||
"message/rfc822" = [ mail_client ];
|
||||
"x-scheme-handler/mid" = [ mail_client ];
|
||||
"inode/directory" = [ file_manager ];
|
||||
"audio/mp3" = [ media_player ];
|
||||
"audio/ogg" = [ media_player ];
|
||||
"audio/mpeg" = [ media_player ];
|
||||
"audio/aac" = [ media_player ];
|
||||
"audio/opus" = [ media_player ];
|
||||
"audio/wav" = [ media_player ];
|
||||
"audio/webm" = [ media_player ];
|
||||
"audio/3gpp" = [ media_player ];
|
||||
"audio/3gpp2" = [ media_player ];
|
||||
"video/mp4" = [ media_player ];
|
||||
"video/x-msvideo" = [ media_player ];
|
||||
"video/mpeg" = [ media_player ];
|
||||
"video/ogg" = [ media_player ];
|
||||
"video/mp2t" = [ media_player ];
|
||||
"video/webm" = [ media_player ];
|
||||
"video/3gpp" = [ media_player ];
|
||||
"video/3gpp2" = [ media_player ];
|
||||
"image/png" = [ image_viewer ];
|
||||
"image/jpeg" = [ image_viewer ];
|
||||
"image/gif" = [ image_viewer ];
|
||||
"image/avif" = [ image_viewer ];
|
||||
"image/bmp" = [ image_viewer ];
|
||||
"image/vnd.microsoft.icon" = [ image_viewer ];
|
||||
"image/svg+xml" = [ image_viewer ];
|
||||
"image/tiff" = [ image_viewer ];
|
||||
"image/webp" = [ image_viewer ];
|
||||
"text/plain" = [ text_editor ];
|
||||
"text/html" = [primary_browser];
|
||||
"x-scheme-handler/http" = [primary_browser];
|
||||
"x-scheme-handler/https" = [primary_browser];
|
||||
"x-scheme-handler/about" = [primary_browser];
|
||||
"x-scheme-handler/unknown" = [primary_browser];
|
||||
"x-scheme-handler/mailto" = [mail_client];
|
||||
"message/rfc822" = [mail_client];
|
||||
"x-scheme-handler/mid" = [mail_client];
|
||||
"inode/directory" = [file_manager];
|
||||
"audio/mp3" = [media_player];
|
||||
"audio/ogg" = [media_player];
|
||||
"audio/mpeg" = [media_player];
|
||||
"audio/aac" = [media_player];
|
||||
"audio/opus" = [media_player];
|
||||
"audio/wav" = [media_player];
|
||||
"audio/webm" = [media_player];
|
||||
"audio/3gpp" = [media_player];
|
||||
"audio/3gpp2" = [media_player];
|
||||
"video/mp4" = [media_player];
|
||||
"video/x-msvideo" = [media_player];
|
||||
"video/mpeg" = [media_player];
|
||||
"video/ogg" = [media_player];
|
||||
"video/mp2t" = [media_player];
|
||||
"video/webm" = [media_player];
|
||||
"video/3gpp" = [media_player];
|
||||
"video/3gpp2" = [media_player];
|
||||
"image/png" = [image_viewer];
|
||||
"image/jpeg" = [image_viewer];
|
||||
"image/gif" = [image_viewer];
|
||||
"image/avif" = [image_viewer];
|
||||
"image/bmp" = [image_viewer];
|
||||
"image/vnd.microsoft.icon" = [image_viewer];
|
||||
"image/svg+xml" = [image_viewer];
|
||||
"image/tiff" = [image_viewer];
|
||||
"image/webp" = [image_viewer];
|
||||
"text/plain" = [text_editor];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
_: { imports = [ ./pipewire.nix ./ssh.nix ./greetd.nix ./dunst.nix ]; }
|
||||
_: {imports = [./pipewire.nix ./ssh.nix ./greetd.nix ./dunst.nix];}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
@ -67,7 +72,7 @@ in {
|
|||
mouse_middle_click = "context";
|
||||
mouse_right_click = "close_all";
|
||||
};
|
||||
experimental = { per_monitor_dpi = false; };
|
||||
experimental = {per_monitor_dpi = false;};
|
||||
urgency_low = {
|
||||
background = "#1E1E2E";
|
||||
foreground = "#CDD6F4";
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
||||
|
|
|
|||
|
|
@ -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; }; };
|
||||
|
||||
config = mkIf cfg.enable {programs.ssh = {startAgent = true;};};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
_: {
|
||||
imports = [ ./btop.nix ./neovim.nix ./newsboat.nix ./ncmpcpp.nix ./yazi.nix ];
|
||||
imports = [./btop.nix ./neovim.nix ./newsboat.nix ./ncmpcpp.nix ./yazi.nix];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
@ -8,7 +13,7 @@ in {
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
home-manager.users.${username} = {
|
||||
imports = [ inputs.nixvim.homeManagerModules.nixvim ];
|
||||
imports = [inputs.nixvim.homeManagerModules.nixvim];
|
||||
programs.nixvim = {
|
||||
enable = true;
|
||||
enableMan = true;
|
||||
|
|
@ -51,7 +56,7 @@ in {
|
|||
nixvimInjections = true;
|
||||
incrementalSelection.enable = true;
|
||||
};
|
||||
treesitter-context = { enable = true; };
|
||||
treesitter-context = {enable = true;};
|
||||
coq-nvim = {
|
||||
enable = true;
|
||||
installArtifacts = true;
|
||||
|
|
@ -61,7 +66,7 @@ in {
|
|||
completion.always = false;
|
||||
};
|
||||
};
|
||||
neo-tree = { enable = true; };
|
||||
neo-tree = {enable = true;};
|
||||
# TODO laytan/cloak.nvim
|
||||
lsp = {
|
||||
enable = true;
|
||||
|
|
@ -118,7 +123,7 @@ in {
|
|||
rust-tools = {
|
||||
enable = true;
|
||||
crateGraph = {
|
||||
enabledGraphvizBackends = [ "png" "svg" ];
|
||||
enabledGraphvizBackends = ["png" "svg"];
|
||||
backend = "x11";
|
||||
};
|
||||
inlayHints = {
|
||||
|
|
@ -157,10 +162,9 @@ in {
|
|||
enable = true;
|
||||
settings.theme = "dark";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
extraPlugins = with pkgs.vimPlugins; [ zen-mode-nvim lazygit-nvim ];
|
||||
extraPlugins = with pkgs.vimPlugins; [zen-mode-nvim lazygit-nvim];
|
||||
|
||||
keymaps = [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,13 @@
|
|||
{ config, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.modules.programs.yazi;
|
||||
username = config.modules.other.system.username;
|
||||
in {
|
||||
options.modules.programs.yazi = { enable = mkEnableOption "yazi"; };
|
||||
options.modules.programs.yazi = {enable = mkEnableOption "yazi";};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home-manager.users.${username} = {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
_: { imports = [ ./wayland ]; }
|
||||
_: {imports = [./wayland];}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
{ config, pkgs, inputs, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
# inputs.niri.nixosModules.niri
|
||||
|
||||
./hypr
|
||||
./variables.nix
|
||||
|
||||
];
|
||||
# programs.niri.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
_: { imports = [ ./land.nix ]; }
|
||||
_: {imports = [./land.nix];}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -27,13 +37,13 @@ in {
|
|||
enable = true;
|
||||
package = hyprland;
|
||||
# Split-monitor-workspaces provides awesome-like workspace behaviour
|
||||
plugins = [ split-monitor-workspaces ];
|
||||
plugins = [split-monitor-workspaces];
|
||||
# Xwayland for X applications
|
||||
xwayland.enable = true;
|
||||
# No idea why I set this
|
||||
systemd = {
|
||||
enable = true;
|
||||
variables = [ "--all" ];
|
||||
variables = ["--all"];
|
||||
};
|
||||
|
||||
# Hyprland settings
|
||||
|
|
@ -100,7 +110,7 @@ in {
|
|||
follow_mouse = true;
|
||||
repeat_rate = 50;
|
||||
repeat_delay = 250;
|
||||
tablet = { output = "HDMI-A-2"; };
|
||||
tablet = {output = "HDMI-A-2";};
|
||||
};
|
||||
general = {
|
||||
sensitivity = 1.0;
|
||||
|
|
@ -141,7 +151,7 @@ in {
|
|||
"workspaces, 1, 5, dupa, slidevert"
|
||||
];
|
||||
};
|
||||
dwindle = { no_gaps_when_only = true; };
|
||||
dwindle = {no_gaps_when_only = true;};
|
||||
|
||||
debug.disable_logs = false;
|
||||
|
||||
|
|
@ -220,7 +230,6 @@ in {
|
|||
"$mainMod, J, movefocus, d"
|
||||
"$mainMod, K, movefocus, u"
|
||||
"$mainMod, L, movefocus, r"
|
||||
|
||||
];
|
||||
# Media controls
|
||||
bindl = let
|
||||
|
|
@ -291,7 +300,6 @@ in {
|
|||
};
|
||||
};
|
||||
};
|
||||
environment.systemPackages = with pkgs; [ libnotify ];
|
||||
environment.systemPackages = with pkgs; [libnotify];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ pkgs, theme, config, ... }:
|
||||
{
|
||||
pkgs,
|
||||
theme,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with theme.colors; {
|
||||
programs.niri.settings = {
|
||||
outputs."eDP-1".position = {
|
||||
|
|
@ -38,11 +43,11 @@ with theme.colors; {
|
|||
gaps = 16;
|
||||
center-focused-column = "never";
|
||||
preset-column-widths = [
|
||||
{ proportion = 0.333; }
|
||||
{ proportion = 0.5; }
|
||||
{ proportion = 0.666; }
|
||||
{proportion = 0.333;}
|
||||
{proportion = 0.5;}
|
||||
{proportion = 0.666;}
|
||||
];
|
||||
default-column-width = { proportion = 0.5; };
|
||||
default-column-width = {proportion = 0.5;};
|
||||
|
||||
focus-ring = {
|
||||
enable = true;
|
||||
|
|
@ -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";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,17 @@
|
|||
{ pkgs, lib, theme, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
theme,
|
||||
...
|
||||
}: let
|
||||
mkService = lib.recursiveUpdate {
|
||||
Unit.PartOf = [ "graphical-session.target" ];
|
||||
Unit.After = [ "graphical-session.target" ];
|
||||
Install.WantedBy = [ "graphical-session.target" ];
|
||||
Unit.PartOf = ["graphical-session.target"];
|
||||
Unit.After = ["graphical-session.target"];
|
||||
Install.WantedBy = ["graphical-session.target"];
|
||||
};
|
||||
in {
|
||||
imports = [ ./config.nix ];
|
||||
home.packages = with pkgs; [ pamixer ];
|
||||
imports = [./config.nix];
|
||||
home.packages = with pkgs; [pamixer];
|
||||
services = {
|
||||
wlsunset = {
|
||||
# TODO: fix opaque red screen issue
|
||||
|
|
@ -28,7 +32,7 @@ in {
|
|||
tray = {
|
||||
Unit = {
|
||||
Description = "Home Manager System Tray";
|
||||
Requires = [ "graphical-session-pre.target" ];
|
||||
Requires = ["graphical-session-pre.target"];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
{ pkgs, inputs, config, ... }: {
|
||||
|
||||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
programs.niri = {
|
||||
enable = true;
|
||||
package = inputs.niri.packages.${pkgs.system}.niri-unstable;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
{ config, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.modules.wms.wayland;
|
||||
hyprland = config.modules.wms.wayland.hyprland;
|
||||
in {
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }: {
|
||||
{pkgs, ...}: {
|
||||
boot.loader = {
|
||||
efi.canTouchEfiVariables = true;
|
||||
grub = {
|
||||
|
|
@ -9,9 +9,8 @@
|
|||
};
|
||||
boot.plymouth = {
|
||||
enable = false;
|
||||
font =
|
||||
"${pkgs.jetbrains-mono}/share/fonts/truetype/JetBrainsMono-Regular.ttf";
|
||||
themePackages = [ pkgs.catppuccin-plymouth ];
|
||||
font = "${pkgs.jetbrains-mono}/share/fonts/truetype/JetBrainsMono-Regular.ttf";
|
||||
themePackages = [pkgs.catppuccin-plymouth];
|
||||
theme = "catppuccin-macchiato";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -11,8 +16,8 @@ in {
|
|||
# Bluetooth headset media control buttons
|
||||
systemd.user.services.mpris-proxy = {
|
||||
description = "Mpris proxy";
|
||||
after = [ "network.target" "sound.target" ];
|
||||
wantedBy = [ "default.target" ];
|
||||
after = ["network.target" "sound.target"];
|
||||
wantedBy = ["default.target"];
|
||||
serviceConfig.ExecStart = "${pkgs.bluez}/bin/mpris-proxy";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{ pkgs, config, inputs, ... }: {
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
services.xserver.videoDrivers = ["nvidia"];
|
||||
hardware.opengl = {
|
||||
enable = true;
|
||||
# package = pkgs-unstable.mesa.drivers;
|
||||
|
|
@ -22,4 +27,3 @@
|
|||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
@ -9,7 +13,7 @@ in {
|
|||
};
|
||||
services.resolved = {
|
||||
enable = true;
|
||||
fallbackDns = [ "9.9.9.9" "2620::fe::fe" ];
|
||||
fallbackDns = ["9.9.9.9" "2620::fe::fe"];
|
||||
};
|
||||
users.users.${username}.extraGroups = [ "networkmanager" ];
|
||||
users.users.${username}.extraGroups = ["networkmanager"];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
{ inputs, lib, ... }: {
|
||||
nix.registry = lib.mapAttrs (_: v: { flake = v; }) inputs;
|
||||
{
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
nix.registry = lib.mapAttrs (_: v: {flake = v;}) inputs;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{ self, ... }: { environment.etc."current-flake".source = self; }
|
||||
{self, ...}: {environment.etc."current-flake".source = self;}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ pkgs, ... }: {
|
||||
{pkgs, ...}: {
|
||||
fonts = {
|
||||
packages = with pkgs; [
|
||||
material-icons
|
||||
material-design-icons
|
||||
(nerdfonts.override { fonts = [ "Iosevka" "JetBrainsMono" ]; })
|
||||
(nerdfonts.override {fonts = ["Iosevka" "JetBrainsMono"];})
|
||||
noto-fonts
|
||||
noto-fonts-cjk
|
||||
noto-fonts-cjk
|
||||
|
|
@ -17,10 +17,10 @@
|
|||
# this fixes emoji stuff
|
||||
fontconfig = {
|
||||
defaultFonts = {
|
||||
monospace = [ "JetBrainsMono Nerd Font" "Noto Color Emoji" ];
|
||||
sansSerif = [ "Lexend" "Noto Color Emoji" ];
|
||||
serif = [ "Noto Serif" "Noto Color Emoji" ];
|
||||
emoji = [ "Noto Color Emoji" ];
|
||||
monospace = ["JetBrainsMono Nerd Font" "Noto Color Emoji"];
|
||||
sansSerif = ["Lexend" "Noto Color Emoji"];
|
||||
serif = ["Noto Serif" "Noto Color Emoji"];
|
||||
emoji = ["Noto Color Emoji"];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; {
|
||||
options.modules.other.system.monitors = mkOption {
|
||||
description = "\n List of monitors to use\n ";
|
||||
default = [ ];
|
||||
default = [];
|
||||
type = with types;
|
||||
types.listOf (submodule {
|
||||
options = {
|
||||
|
|
@ -69,5 +72,4 @@ with lib; {
|
|||
};
|
||||
});
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
10
overlay.nix
10
overlay.nix
|
|
@ -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 {
|
||||
|
|
@ -14,4 +16,4 @@ let
|
|||
}; # .legacyPackages.${profile-config.system};
|
||||
};
|
||||
};
|
||||
in { nixpkgs.overlays = [ add_nur ]; }
|
||||
in {nixpkgs.overlays = [add_nur];}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue