[fix] fmt: change formatter to nixfmt-rfc-style
Alejandra has ads and splits files into too many new lines.
This commit is contained in:
parent
711c1aa81d
commit
91284a73ca
GPG key ID:
F016B9E770737A0B
28 changed files with 800 additions and 742 deletions
|
|
@ -1,41 +1,38 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
}: let
|
||||
{ pkgs, lib }:
|
||||
let
|
||||
# can be removed once https://github.com/rust-lang/mdBook/pull/2262 lands
|
||||
highlight = pkgs.fetchurl {
|
||||
url = "https://raw.githubusercontent.com/rust-lang/mdBook/7b9bd5049ce15ae5f301d5a40c50ce8359d9e9a8/src/theme/highlight.js";
|
||||
hash = "sha256-pLP73zlmGkbC/zV6bwnB6ijRf9gVkj5/VYMGLhiQ1/Q=";
|
||||
};
|
||||
filterVisible = toplevelOption: option:
|
||||
option // {visible = option.visible && builtins.elemAt option.loc 0 == toplevelOption;};
|
||||
filterVisible =
|
||||
toplevelOption: option:
|
||||
option // { visible = option.visible && builtins.elemAt option.loc 0 == toplevelOption; };
|
||||
home-eval = lib.evalModules {
|
||||
modules = [../home/options.nix];
|
||||
modules = [ ../home/options.nix ];
|
||||
specialArgs = {
|
||||
inherit pkgs;
|
||||
};
|
||||
};
|
||||
nvim-eval = lib.evalModules {modules = [../nvim/options.nix];};
|
||||
nixos-eval = lib.evalModules {modules = [../system/options.nix];};
|
||||
nvim-eval = lib.evalModules { modules = [ ../nvim/options.nix ]; };
|
||||
nixos-eval = lib.evalModules { modules = [ ../system/options.nix ]; };
|
||||
home-markdown =
|
||||
(pkgs.nixosOptionsDoc {
|
||||
inherit (home-eval) options;
|
||||
transformOptions = filterVisible "jhome";
|
||||
})
|
||||
.optionsCommonMark;
|
||||
}).optionsCommonMark;
|
||||
nvim-markdown =
|
||||
(pkgs.nixosOptionsDoc {
|
||||
inherit (nvim-eval) options;
|
||||
transformOptions = filterVisible "jhome";
|
||||
})
|
||||
.optionsCommonMark;
|
||||
}).optionsCommonMark;
|
||||
nixos-markdown =
|
||||
(pkgs.nixosOptionsDoc {
|
||||
inherit (nixos-eval) options;
|
||||
transformOptions = filterVisible "jconfig";
|
||||
})
|
||||
.optionsCommonMark;
|
||||
in {
|
||||
}).optionsCommonMark;
|
||||
in
|
||||
{
|
||||
inherit nixos-markdown nvim-markdown home-markdown;
|
||||
docs = pkgs.stdenvNoCC.mkDerivation {
|
||||
name = "nixos-configuration-book";
|
||||
|
|
@ -57,7 +54,7 @@ in {
|
|||
sed -f sed-cmds <${nixos-markdown} >> ./src/nixos-options.md
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [pkgs.mdbook-toc];
|
||||
nativeBuildInputs = [ pkgs.mdbook-toc ];
|
||||
buildPhase = "${pkgs.mdbook}/bin/mdbook build --dest-dir $out";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
81
flake.nix
81
flake.nix
|
|
@ -63,7 +63,8 @@
|
|||
};
|
||||
|
||||
# Flake outputs that other flakes can use
|
||||
outputs = {
|
||||
outputs =
|
||||
{
|
||||
self,
|
||||
nixpkgs,
|
||||
unstable,
|
||||
|
|
@ -75,14 +76,16 @@
|
|||
nixvim,
|
||||
lix-module,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (nixpkgs) lib;
|
||||
# Helpers for producing system-specific outputs
|
||||
supportedSystems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
forEachSupportedSystem = f:
|
||||
forEachSupportedSystem =
|
||||
f:
|
||||
nixpkgs.lib.genAttrs supportedSystems (
|
||||
system:
|
||||
f {
|
||||
|
|
@ -91,25 +94,26 @@
|
|||
}
|
||||
);
|
||||
overlays = builtins.attrValues self.overlays;
|
||||
in {
|
||||
checks = forEachSupportedSystem (
|
||||
in
|
||||
{
|
||||
pkgs,
|
||||
system,
|
||||
}: let
|
||||
checks = forEachSupportedSystem (
|
||||
{ pkgs, system }:
|
||||
let
|
||||
src = builtins.path {
|
||||
path = ./.;
|
||||
name = "configuration.nix";
|
||||
};
|
||||
runCmdInSrc = name: cmd:
|
||||
pkgs.runCommandNoCC name {} ''
|
||||
runCmdInSrc =
|
||||
name: cmd:
|
||||
pkgs.runCommandNoCC name { } ''
|
||||
cd ${src}
|
||||
${cmd}
|
||||
mkdir $out
|
||||
'';
|
||||
in {
|
||||
in
|
||||
{
|
||||
nvim = nixvim.lib.${system}.check.mkTestDerivationFromNixvimModule {
|
||||
pkgs = import nixpkgs {inherit system overlays;};
|
||||
pkgs = import nixpkgs { inherit system overlays; };
|
||||
module = ./nvim/standalone.nix;
|
||||
};
|
||||
fmt = runCmdInSrc "fmt-src" "${lib.getExe self.formatter.${system}} --check .";
|
||||
|
|
@ -119,12 +123,9 @@
|
|||
);
|
||||
|
||||
packages = forEachSupportedSystem (
|
||||
{ pkgs, system }:
|
||||
{
|
||||
pkgs,
|
||||
system,
|
||||
}: {
|
||||
inherit
|
||||
(import ./docs {inherit pkgs lib;})
|
||||
inherit (import ./docs { inherit pkgs lib; })
|
||||
docs
|
||||
nixos-markdown
|
||||
nvim-markdown
|
||||
|
|
@ -132,7 +133,7 @@
|
|||
;
|
||||
# Nvim standalone module
|
||||
nvim = nixvim.legacyPackages.${system}.makeNixvimWithModule {
|
||||
pkgs = import nixpkgs {inherit system overlays;};
|
||||
pkgs = import nixpkgs { inherit system overlays; };
|
||||
module = ./nvim/standalone.nix;
|
||||
};
|
||||
}
|
||||
|
|
@ -143,16 +144,18 @@
|
|||
nixvim = nixvim.overlays.default;
|
||||
jpassmenu = jpassmenu.overlays.default;
|
||||
audiomenu = audiomenu.overlays.default;
|
||||
unstable = final: prev: let
|
||||
unstable =
|
||||
final: prev:
|
||||
let
|
||||
unstablePkgs = unstable.legacyPackages.${prev.system};
|
||||
in {
|
||||
in
|
||||
{
|
||||
# Get unstable packages
|
||||
unstable = unstablePkgs;
|
||||
# Update vim plugins with the versions from unstable
|
||||
vimPlugins = prev.vimPlugins // unstablePkgs.vimPlugins;
|
||||
# Get specific packages from unstable
|
||||
inherit
|
||||
(unstablePkgs)
|
||||
inherit (unstablePkgs)
|
||||
gitoxide
|
||||
jujutsu
|
||||
wezterm
|
||||
|
|
@ -162,13 +165,14 @@
|
|||
};
|
||||
|
||||
# Nix files formatter (run `nix fmt`)
|
||||
formatter = forEachSupportedSystem ({pkgs, ...}: pkgs.alejandra);
|
||||
formatter = forEachSupportedSystem ({ pkgs, ... }: pkgs.nixfmt-rfc-style);
|
||||
|
||||
# Example vm configuration
|
||||
nixosConfigurations.vm = let
|
||||
nixosConfigurations.vm =
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) ["steam-original"];
|
||||
pkgs = import nixpkgs {inherit system overlays config;};
|
||||
config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "steam-original" ];
|
||||
pkgs = import nixpkgs { inherit system overlays config; };
|
||||
in
|
||||
lib.nixosSystem {
|
||||
inherit system pkgs;
|
||||
|
|
@ -206,24 +210,23 @@
|
|||
];
|
||||
};
|
||||
|
||||
nixosModules = let
|
||||
nixosModules =
|
||||
let
|
||||
nvim-config.imports = [
|
||||
nixvim.homeManagerModules.nixvim
|
||||
./nvim
|
||||
];
|
||||
homeManagerModuleSandalone = import ./home {inherit nvim-config stylix;};
|
||||
homeManagerModuleNixOS = import ./home {inherit nvim-config;};
|
||||
homeManagerModuleSandalone = import ./home { inherit nvim-config stylix; };
|
||||
homeManagerModuleNixOS = import ./home { inherit nvim-config; };
|
||||
nixosModule = {
|
||||
imports =
|
||||
[
|
||||
(import ./system {inherit stylix;})
|
||||
imports = [
|
||||
(import ./system { inherit stylix; })
|
||||
home-manager.nixosModules.home-manager
|
||||
]
|
||||
++ nixpkgs.lib.optional (lix-module != null) lix-module.nixosModules.default;
|
||||
] ++ nixpkgs.lib.optional (lix-module != null) lix-module.nixosModules.default;
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
sharedModules = [homeManagerModuleNixOS];
|
||||
sharedModules = [ homeManagerModuleNixOS ];
|
||||
};
|
||||
# Pin nixpkgs
|
||||
nix.registry.nixpkgs.flake = nixpkgs;
|
||||
|
|
@ -238,9 +241,9 @@
|
|||
mkMachine = hostname: {
|
||||
imports = [
|
||||
nixosModule
|
||||
(import (./machines + "/${hostname}") {inherit nixos-hardware;})
|
||||
(import (./machines + "/${hostname}") { inherit nixos-hardware; })
|
||||
];
|
||||
home-manager.sharedModules = [{jhome.hostName = hostname;}];
|
||||
home-manager.sharedModules = [ { jhome.hostName = hostname; } ];
|
||||
};
|
||||
machineModules = lib.genAttrs machines mkMachine;
|
||||
in
|
||||
|
|
@ -251,10 +254,8 @@
|
|||
// machineModules;
|
||||
|
||||
devShells = forEachSupportedSystem (
|
||||
{ pkgs, system }:
|
||||
{
|
||||
pkgs,
|
||||
system,
|
||||
}: {
|
||||
default = pkgs.mkShell {
|
||||
buildInputs = [
|
||||
pkgs.just
|
||||
|
|
|
|||
|
|
@ -1,15 +1,18 @@
|
|||
{
|
||||
nvim-config,
|
||||
stylix ? null,
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
cfg = config.jhome;
|
||||
devcfg = cfg.dev;
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports =
|
||||
[
|
||||
nvim-config
|
||||
|
|
@ -19,11 +22,11 @@ in {
|
|||
]
|
||||
++ lib.optionals (stylix != null) [
|
||||
stylix.homeManagerModules.stylix
|
||||
{stylix.image = cfg.sway.background;}
|
||||
{ stylix.image = cfg.sway.background; }
|
||||
];
|
||||
|
||||
config = lib.mkMerge [
|
||||
(lib.mkIf (cfg.enable && cfg.styling.enable) {stylix.enable = true;})
|
||||
(lib.mkIf (cfg.enable && cfg.styling.enable) { stylix.enable = true; })
|
||||
(lib.mkIf cfg.enable {
|
||||
programs = {
|
||||
# Better cat (bat)
|
||||
|
|
@ -81,10 +84,7 @@ in {
|
|||
gpg-agent = {
|
||||
enable = true;
|
||||
maxCacheTtl = 86400;
|
||||
pinentryPackage =
|
||||
if config.jhome.gui.enable
|
||||
then pkgs.pinentry-qt
|
||||
else pkgs.pinentry-curses;
|
||||
pinentryPackage = if config.jhome.gui.enable then pkgs.pinentry-qt else pkgs.pinentry-curses;
|
||||
extraConfig = "allow-preset-passphrase";
|
||||
};
|
||||
# Spotifyd
|
||||
|
|
@ -189,7 +189,7 @@ in {
|
|||
};
|
||||
})
|
||||
(lib.mkIf (cfg.enable && devcfg.enable && devcfg.rust.enable) {
|
||||
home.packages = [pkgs.rustup] ++ devcfg.rust.extraPackages;
|
||||
home.packages = [ pkgs.rustup ] ++ devcfg.rust.extraPackages;
|
||||
# Background code checker (for Rust)
|
||||
programs.bacon = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -4,17 +4,12 @@
|
|||
pkgs,
|
||||
osConfig ? null,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (config) jhome;
|
||||
flatpakEnabled =
|
||||
if osConfig != null
|
||||
then osConfig.services.flatpak.enable
|
||||
else false;
|
||||
flatpakEnabled = if osConfig != null then osConfig.services.flatpak.enable else false;
|
||||
osSway = osConfig == null && !osConfig.programs.sway.enable;
|
||||
swayPkg =
|
||||
if osSway
|
||||
then pkgs.sway
|
||||
else null;
|
||||
swayPkg = if osSway then pkgs.sway else null;
|
||||
cfg = jhome.gui;
|
||||
cursor = {
|
||||
package = pkgs.nordzy-cursor-theme;
|
||||
|
|
@ -24,9 +19,11 @@
|
|||
name = "Papirus-Dark";
|
||||
package = pkgs.papirus-icon-theme;
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
config = lib.mkIf (jhome.enable && cfg.enable) {
|
||||
home.packages = with pkgs;
|
||||
home.packages =
|
||||
with pkgs;
|
||||
[
|
||||
webcord
|
||||
ferdium
|
||||
|
|
@ -36,16 +33,25 @@ in {
|
|||
wl-clipboard
|
||||
# Extra fonts
|
||||
noto-fonts-cjk # Chinese, Japanese and Korean characters
|
||||
(pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
|
||||
(pkgs.nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
|
||||
]
|
||||
++ lib.optional flatpakEnabled flatpak;
|
||||
fonts.fontconfig = {
|
||||
enable = true;
|
||||
defaultFonts = lib.mkIf config.jhome.styling.enable {
|
||||
emoji = ["Noto Color Emoji"];
|
||||
monospace = ["JetBrains Mono" "Symbols Nerd Font"];
|
||||
serif = ["Noto Serif" "Symbols Nerd Font"];
|
||||
sansSerif = ["Noto Sans" "Symbols Nerd Font"];
|
||||
emoji = [ "Noto Color Emoji" ];
|
||||
monospace = [
|
||||
"JetBrains Mono"
|
||||
"Symbols Nerd Font"
|
||||
];
|
||||
serif = [
|
||||
"Noto Serif"
|
||||
"Symbols Nerd Font"
|
||||
];
|
||||
sansSerif = [
|
||||
"Noto Sans"
|
||||
"Symbols Nerd Font"
|
||||
];
|
||||
};
|
||||
};
|
||||
# Browser
|
||||
|
|
@ -63,13 +69,15 @@ in {
|
|||
# Video player
|
||||
mpv = {
|
||||
enable = true;
|
||||
scripts = builtins.attrValues {inherit (pkgs.mpvScripts) uosc thumbfast;};
|
||||
scripts = builtins.attrValues { inherit (pkgs.mpvScripts) uosc thumbfast; };
|
||||
};
|
||||
# Status bar
|
||||
waybar = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
settings = lib.mkIf config.jhome.styling.enable (import ./waybar-settings.nix {inherit config lib;});
|
||||
settings = lib.mkIf config.jhome.styling.enable (
|
||||
import ./waybar-settings.nix { inherit config lib; }
|
||||
);
|
||||
style = lib.optionalString config.jhome.styling.enable ''
|
||||
.modules-left #workspaces button {
|
||||
border-bottom: 3px solid @base01;
|
||||
|
|
@ -130,15 +138,17 @@ in {
|
|||
wayland.windowManager.sway = {
|
||||
inherit (cfg.sway) enable;
|
||||
package = swayPkg; # no sway package if it comes from the OS
|
||||
config = import ./sway-config.nix {inherit config pkgs;};
|
||||
config = import ./sway-config.nix { inherit config pkgs; };
|
||||
};
|
||||
|
||||
# Set cursor style
|
||||
stylix = lib.mkIf config.jhome.styling.enable {inherit cursor;};
|
||||
home.pointerCursor = lib.mkIf config.jhome.styling.enable (lib.mkDefault {
|
||||
stylix = lib.mkIf config.jhome.styling.enable { inherit cursor; };
|
||||
home.pointerCursor = lib.mkIf config.jhome.styling.enable (
|
||||
lib.mkDefault {
|
||||
gtk.enable = true;
|
||||
inherit (cursor) name package;
|
||||
});
|
||||
}
|
||||
);
|
||||
# Set Gtk theme
|
||||
gtk = lib.mkIf config.jhome.styling.enable {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
}: let
|
||||
{ pkgs, config }:
|
||||
let
|
||||
cfg = config.jhome.gui.sway;
|
||||
passmenu = "${pkgs.jpassmenu}/bin/jpassmenu";
|
||||
selectAudio = "${pkgs.audiomenu}/bin/audiomenu --menu 'fuzzel --dmenu'";
|
||||
|
|
@ -33,8 +31,8 @@
|
|||
];
|
||||
joinKeys = builtins.concatStringsSep "+";
|
||||
# Generate a keybind from a modifier prefix and a key
|
||||
keycombo = prefix: key: joinKeys (prefix ++ [key]);
|
||||
modKeybind = keycombo [mod];
|
||||
keycombo = prefix: key: joinKeys (prefix ++ [ key ]);
|
||||
modKeybind = keycombo [ mod ];
|
||||
modCtrlKeybind = keycombo [
|
||||
mod
|
||||
"Ctrl"
|
||||
|
|
@ -53,10 +51,13 @@
|
|||
dir2resize.right = "resize grow width";
|
||||
dir2resize.left = "resize shrink width";
|
||||
# Bind a key combo to an action
|
||||
genKeybind = prefix: action: key: {"${prefix key}" = "${action key}";};
|
||||
genKey = prefix: action: genKeybind ({key, ...}: prefix key) ({direction, ...}: action direction);
|
||||
genArrow = prefix: action: genKeybind ({arrow, ...}: prefix arrow) ({direction, ...}: action direction);
|
||||
genArrowAndKey = prefix: action: key:
|
||||
genKeybind = prefix: action: key: { "${prefix key}" = "${action key}"; };
|
||||
genKey =
|
||||
prefix: action: genKeybind ({ key, ... }: prefix key) ({ direction, ... }: action direction);
|
||||
genArrow =
|
||||
prefix: action: genKeybind ({ arrow, ... }: prefix arrow) ({ direction, ... }: action direction);
|
||||
genArrowAndKey =
|
||||
prefix: action: key:
|
||||
(genKey prefix action key) // (genArrow prefix action key);
|
||||
# Move window
|
||||
moveWindowKeybinds = map (genArrowAndKey modShiftKeybind (dir: "move ${dir}")) dirs;
|
||||
|
|
@ -65,25 +66,19 @@
|
|||
# Resize window
|
||||
resizeWindowKeybinds = map (genArrowAndKey modCtrlKeybind (dir: dir2resize.${dir})) dirs;
|
||||
# Move container to workspace
|
||||
moveWorkspaceKeybindings =
|
||||
map (genKeybind modShiftKeybind (
|
||||
moveWorkspaceKeybindings = map (genKeybind modShiftKeybind (
|
||||
number: "move container to workspace number ${number}"
|
||||
))
|
||||
workspaces;
|
||||
)) workspaces;
|
||||
# Focus workspace
|
||||
focusWorkspaceKeybindings =
|
||||
map (genKeybind modKeybind (
|
||||
focusWorkspaceKeybindings = map (genKeybind modKeybind (
|
||||
number: "workspace number ${number}"
|
||||
))
|
||||
workspaces;
|
||||
)) workspaces;
|
||||
# Move container to Workspace and focus on it
|
||||
moveFocusWorkspaceKeybindings =
|
||||
map (genKeybind modCtrlShiftKeybind (
|
||||
moveFocusWorkspaceKeybindings = map (genKeybind modCtrlShiftKeybind (
|
||||
number: "move container to workspace number ${number}; workspace number ${number}"
|
||||
))
|
||||
workspaces;
|
||||
)) workspaces;
|
||||
in
|
||||
builtins.foldl' (l: r: l // r)
|
||||
builtins.foldl' (l: r: l // r)
|
||||
{
|
||||
"${mod}+Return" = "exec ${swayconf.terminal}";
|
||||
"${mod}+D" = "exec ${swayconf.menu}";
|
||||
|
|
|
|||
|
|
@ -1,16 +1,15 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
}: let
|
||||
{ config, pkgs }:
|
||||
let
|
||||
cfg = config.jhome.gui.sway;
|
||||
modifier = "Mod4";
|
||||
inherit (config.jhome.gui) terminal;
|
||||
termCmd =
|
||||
if terminal == "wezterm"
|
||||
then "wezterm start"
|
||||
else if terminal == "alacritty"
|
||||
then "alacritty -e"
|
||||
else builtins.abort "no command configured for ${terminal}";
|
||||
if terminal == "wezterm" then
|
||||
"wezterm start"
|
||||
else if terminal == "alacritty" then
|
||||
"alacritty -e"
|
||||
else
|
||||
builtins.abort "no command configured for ${terminal}";
|
||||
menu = "${pkgs.fuzzel}/bin/fuzzel --terminal '${termCmd}'";
|
||||
# currently, there is some friction between sway and gtk:
|
||||
# https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland
|
||||
|
|
@ -18,7 +17,8 @@
|
|||
# for gsettings to work, we need to tell it where the schemas are
|
||||
# using the XDG_DATA_DIR environment variable
|
||||
# run at the end of sway config
|
||||
configure-gtk = let
|
||||
configure-gtk =
|
||||
let
|
||||
schema = pkgs.gsettings-desktop-schemas;
|
||||
datadir = "${schema}/share/gsettings-schemas/${schema.name}";
|
||||
in
|
||||
|
|
@ -38,16 +38,17 @@
|
|||
${pkgs.glib}/bin/gsettings set "$gnome_schema" font-name "$font_name"
|
||||
${pkgs.glib}/bin/gsettings set "$gnome_schema" color-scheme prefer-dark
|
||||
'';
|
||||
cmdOnce = command: {inherit command;};
|
||||
cmdOnce = command: { inherit command; };
|
||||
cmdAlways = command: {
|
||||
inherit command;
|
||||
always = true;
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
inherit modifier terminal menu;
|
||||
keybindings = import ./keybindings.nix {inherit config pkgs;};
|
||||
keybindings = import ./keybindings.nix { inherit config pkgs; };
|
||||
# Appearance
|
||||
bars = []; # Waybar is started as a systemd service
|
||||
bars = [ ]; # Waybar is started as a systemd service
|
||||
gaps = {
|
||||
smartGaps = true;
|
||||
smartBorders = "on";
|
||||
|
|
@ -72,12 +73,9 @@ in {
|
|||
}
|
||||
];
|
||||
# Startup scripts
|
||||
startup =
|
||||
[
|
||||
startup = [
|
||||
(cmdAlways "${configure-gtk}/bin/configure-gtk")
|
||||
]
|
||||
++ (builtins.map cmdAlways cfg.exec.always)
|
||||
++ (builtins.map cmdOnce cfg.exec.once);
|
||||
] ++ (builtins.map cmdAlways cfg.exec.always) ++ (builtins.map cmdOnce cfg.exec.once);
|
||||
# Keyboard configuration
|
||||
input."type:keyboard" = {
|
||||
repeat_delay = "300";
|
||||
|
|
|
|||
|
|
@ -1,38 +1,34 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
}: let
|
||||
{ config, lib }:
|
||||
let
|
||||
cfg = config.jhome.gui;
|
||||
in {
|
||||
in
|
||||
{
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
position = "top";
|
||||
margin = "2 2 2 2";
|
||||
# Choose the order of the modules
|
||||
modules-left = ["sway/workspaces"];
|
||||
modules-center = ["clock"];
|
||||
modules-right =
|
||||
[
|
||||
modules-left = [ "sway/workspaces" ];
|
||||
modules-center = [ "clock" ];
|
||||
modules-right = [
|
||||
"pulseaudio"
|
||||
"backlight"
|
||||
"battery"
|
||||
"sway/language"
|
||||
"memory"
|
||||
]
|
||||
++ lib.optional (cfg.tempInfo != null) "temperature"
|
||||
++ ["tray"];
|
||||
] ++ lib.optional (cfg.tempInfo != null) "temperature" ++ [ "tray" ];
|
||||
"sway/workspaces" = {
|
||||
disable-scroll = true;
|
||||
persistent-workspaces = {
|
||||
"1" = [];
|
||||
"2" = [];
|
||||
"3" = [];
|
||||
"4" = [];
|
||||
"5" = [];
|
||||
"6" = [];
|
||||
"7" = [];
|
||||
"8" = [];
|
||||
"9" = [];
|
||||
"1" = [ ];
|
||||
"2" = [ ];
|
||||
"3" = [ ];
|
||||
"4" = [ ];
|
||||
"5" = [ ];
|
||||
"6" = [ ];
|
||||
"7" = [ ];
|
||||
"8" = [ ];
|
||||
"9" = [ ];
|
||||
};
|
||||
};
|
||||
"sway/language" = {
|
||||
|
|
@ -64,7 +60,11 @@ in {
|
|||
phone = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = ["" "" ""];
|
||||
default = [
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
on-click = "pavucontrol";
|
||||
min-length = 13;
|
||||
|
|
@ -73,13 +73,27 @@ in {
|
|||
inherit (cfg.tempInfo) hwmon-path;
|
||||
critical-threshold = 80;
|
||||
format = "{temperatureC}°C {icon}";
|
||||
format-icons = ["" "" "" "" ""];
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
tooltip = false;
|
||||
};
|
||||
backlight = {
|
||||
device = "intel_backlight";
|
||||
format = "{percent}% {icon}";
|
||||
format-icons = ["" "" "" "" "" "" ""];
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
min-length = 7;
|
||||
};
|
||||
battery = {
|
||||
|
|
@ -89,7 +103,18 @@ in {
|
|||
format-charging = "{capacity}% ";
|
||||
format-plugged = "{capacity}% ";
|
||||
format-alt = "{time} {icon}";
|
||||
format-icons = ["" "" "" "" "" "" "" "" "" ""];
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
tray = {
|
||||
icon-size = 16;
|
||||
|
|
|
|||
140
home/options.nix
140
home/options.nix
|
|
@ -1,28 +1,22 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
} @ attrs: let
|
||||
{ lib, pkgs, ... }@attrs:
|
||||
let
|
||||
osConfig = attrs.osConfig or null;
|
||||
inherit (lib) types;
|
||||
fromOs = let
|
||||
get = path: set:
|
||||
if path == []
|
||||
then set
|
||||
else get (builtins.tail path) (builtins.getAttr (builtins.head path) set);
|
||||
fromOs =
|
||||
let
|
||||
get =
|
||||
path: set:
|
||||
if path == [ ] then set else get (builtins.tail path) (builtins.getAttr (builtins.head path) set);
|
||||
in
|
||||
path: default:
|
||||
if osConfig == null
|
||||
then default
|
||||
else get path osConfig;
|
||||
fromConfig = path: default: fromOs (["jconfig"] ++ path) default;
|
||||
path: default: if osConfig == null then default else get path osConfig;
|
||||
fromConfig = path: default: fromOs ([ "jconfig" ] ++ path) default;
|
||||
|
||||
mkExtraPackagesOption = name: defaultPkgsPath: let
|
||||
text =
|
||||
lib.strings.concatMapStringsSep " " (
|
||||
mkExtraPackagesOption =
|
||||
name: defaultPkgsPath:
|
||||
let
|
||||
text = lib.strings.concatMapStringsSep " " (
|
||||
pkgPath: "pkgs." + (lib.strings.concatStringsSep "." pkgPath)
|
||||
)
|
||||
defaultPkgsPath;
|
||||
) defaultPkgsPath;
|
||||
defaultText = lib.literalExpression "[ ${text} ]";
|
||||
default = builtins.map (pkgPath: lib.attrsets.getAttrFromPath pkgPath pkgs) defaultPkgsPath;
|
||||
in
|
||||
|
|
@ -30,7 +24,7 @@
|
|||
description = "Extra ${name} Packages.";
|
||||
type = types.listOf types.package;
|
||||
inherit default defaultText;
|
||||
example = [];
|
||||
example = [ ];
|
||||
};
|
||||
|
||||
identity.options = {
|
||||
|
|
@ -62,12 +56,12 @@
|
|||
enable = lib.mkEnableOption "Jalil's default user configuration";
|
||||
gpg = lib.mkOption {
|
||||
description = "GnuPG Configuration.";
|
||||
default = {};
|
||||
default = { };
|
||||
type = types.submodule {
|
||||
options.unlockKeys = lib.mkOption {
|
||||
description = "Keygrips of keys to unlock through `pam-gnupg` when logging in.";
|
||||
default = [];
|
||||
example = ["6F4ABB77A88E922406BCE6627AFEEE2363914B76"];
|
||||
default = [ ];
|
||||
example = [ "6F4ABB77A88E922406BCE6627AFEEE2363914B76" ];
|
||||
type = types.listOf types.str;
|
||||
};
|
||||
};
|
||||
|
|
@ -85,14 +79,27 @@
|
|||
};
|
||||
|
||||
sway.options = {
|
||||
enable = lib.mkEnableOption "sway" // {default = fromConfig ["gui" "sway"] true;};
|
||||
enable = lib.mkEnableOption "sway" // {
|
||||
default = fromConfig [
|
||||
"gui"
|
||||
"sway"
|
||||
] true;
|
||||
};
|
||||
background = lib.mkOption {
|
||||
description = "The wallpaper to use.";
|
||||
type = types.path;
|
||||
default = fromConfig ["styling" "wallpaper"] (builtins.fetchurl {
|
||||
default =
|
||||
fromConfig
|
||||
[
|
||||
"styling"
|
||||
"wallpaper"
|
||||
]
|
||||
(
|
||||
builtins.fetchurl {
|
||||
url = "https://raw.githubusercontent.com/lunik1/nixos-logo-gruvbox-wallpaper/d4937c424fad79c1136a904599ba689fcf8d0fad/png/gruvbox-dark-rainbow.png";
|
||||
sha256 = "036gqhbf6s5ddgvfbgn6iqbzgizssyf7820m5815b2gd748jw8zc";
|
||||
});
|
||||
}
|
||||
);
|
||||
};
|
||||
autostart = lib.mkOption {
|
||||
description = ''
|
||||
|
|
@ -109,20 +116,20 @@
|
|||
};
|
||||
exec = lib.mkOption {
|
||||
description = "Run commands when starting sway.";
|
||||
default = {};
|
||||
default = { };
|
||||
type = types.submodule {
|
||||
options = {
|
||||
once = lib.mkOption {
|
||||
description = "Programs to start only once (`exec`).";
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
example = ["signal-desktop --start-in-tray"];
|
||||
default = [ ];
|
||||
example = [ "signal-desktop --start-in-tray" ];
|
||||
};
|
||||
always = lib.mkOption {
|
||||
description = "Programs to start whenever the config is sourced (`exec_always`).";
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
example = ["signal-desktop --start-in-tray"];
|
||||
default = [ ];
|
||||
example = [ "signal-desktop --start-in-tray" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -130,7 +137,12 @@
|
|||
};
|
||||
|
||||
gui.options = {
|
||||
enable = lib.mkEnableOption "GUI applications" // {default = fromConfig ["gui" "enable"] false;};
|
||||
enable = lib.mkEnableOption "GUI applications" // {
|
||||
default = fromConfig [
|
||||
"gui"
|
||||
"enable"
|
||||
] false;
|
||||
};
|
||||
tempInfo = lib.mkOption {
|
||||
description = "Temperature info to display in the statusbar.";
|
||||
default = null;
|
||||
|
|
@ -138,7 +150,7 @@
|
|||
};
|
||||
sway = lib.mkOption {
|
||||
description = "Sway window manager configuration.";
|
||||
default = {};
|
||||
default = { };
|
||||
type = types.submodule sway;
|
||||
};
|
||||
terminal = lib.mkOption {
|
||||
|
|
@ -151,48 +163,57 @@
|
|||
];
|
||||
};
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.jhome = lib.mkOption {
|
||||
description = "Jalil's default home-manager configuration.";
|
||||
default = {};
|
||||
default = { };
|
||||
type = types.submodule {
|
||||
options = {
|
||||
enable = lib.mkEnableOption "jalil's home defaults";
|
||||
hostName = lib.mkOption {
|
||||
description = "The hostname of this system.";
|
||||
type = types.str;
|
||||
default = fromOs ["networking" "hostName"] "nixos";
|
||||
default = fromOs [
|
||||
"networking"
|
||||
"hostName"
|
||||
] "nixos";
|
||||
example = "my pc";
|
||||
};
|
||||
dev = lib.mkOption {
|
||||
description = "Setup development environment for programming languages.";
|
||||
default = {};
|
||||
default = { };
|
||||
type = types.submodule {
|
||||
options = {
|
||||
enable = lib.mkEnableOption "development settings" // {default = fromConfig ["dev" "enable"] false;};
|
||||
enable = lib.mkEnableOption "development settings" // {
|
||||
default = fromConfig [
|
||||
"dev"
|
||||
"enable"
|
||||
] false;
|
||||
};
|
||||
neovimAsManPager = lib.mkEnableOption "neovim as the man pager";
|
||||
extraPackages = mkExtraPackagesOption "dev" [
|
||||
["jq"] # json parser
|
||||
["just"] # just a command runner
|
||||
["typos"] # low false positive rate typo checker
|
||||
["gcc"] # GNU Compiler Collection
|
||||
["git-absorb"] # fixup! but automatic
|
||||
["man-pages"] # gimme the man pages
|
||||
["man-pages-posix"] # I said gimme the man pages!!!
|
||||
[ "jq" ] # json parser
|
||||
[ "just" ] # just a command runner
|
||||
[ "typos" ] # low false positive rate typo checker
|
||||
[ "gcc" ] # GNU Compiler Collection
|
||||
[ "git-absorb" ] # fixup! but automatic
|
||||
[ "man-pages" ] # gimme the man pages
|
||||
[ "man-pages-posix" ] # I said gimme the man pages!!!
|
||||
];
|
||||
rust = lib.mkOption {
|
||||
description = "Jalil's default rust configuration.";
|
||||
default = {};
|
||||
default = { };
|
||||
type = types.submodule {
|
||||
options.enable = lib.mkEnableOption "rust development settings";
|
||||
options.extraPackages = mkExtraPackagesOption "Rust" [
|
||||
["cargo-insta"] # snapshot testing
|
||||
["cargo-llvm-cov"] # code coverage
|
||||
["cargo-msrv"] # minimum supported version
|
||||
["cargo-nextest"] # better testing harness
|
||||
["cargo-sort"] # sort deps and imports
|
||||
["cargo-udeps"] # check for unused dependencies (requires nightly)
|
||||
["cargo-watch"] # watch for file changes and run commands
|
||||
[ "cargo-insta" ] # snapshot testing
|
||||
[ "cargo-llvm-cov" ] # code coverage
|
||||
[ "cargo-msrv" ] # minimum supported version
|
||||
[ "cargo-nextest" ] # better testing harness
|
||||
[ "cargo-sort" ] # sort deps and imports
|
||||
[ "cargo-udeps" ] # check for unused dependencies (requires nightly)
|
||||
[ "cargo-watch" ] # watch for file changes and run commands
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
@ -206,15 +227,20 @@ in {
|
|||
};
|
||||
gui = lib.mkOption {
|
||||
description = "Jalil's default GUI configuration.";
|
||||
default = {};
|
||||
default = { };
|
||||
type = types.submodule gui;
|
||||
};
|
||||
styling = lib.mkOption {
|
||||
description = "My custom styling (uses stylix)";
|
||||
default = {};
|
||||
default = { };
|
||||
type = types.submodule {
|
||||
options = {
|
||||
enable = lib.mkEnableOption "styling" // {default = fromConfig ["styling" "enable"] true;};
|
||||
enable = lib.mkEnableOption "styling" // {
|
||||
default = fromConfig [
|
||||
"styling"
|
||||
"enable"
|
||||
] true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
inherit (config) jhome;
|
||||
inherit (cfg.defaultIdentity) signingKey;
|
||||
|
||||
|
|
@ -10,8 +7,9 @@
|
|||
hasConfig = jhome.enable && cfg != null;
|
||||
hasKey = signingKey != null;
|
||||
gpgHome = config.programs.gpg.homedir;
|
||||
unlockKey = hasConfig && cfg.gpg.unlockKeys != [];
|
||||
in {
|
||||
unlockKey = hasConfig && cfg.gpg.unlockKeys != [ ];
|
||||
in
|
||||
{
|
||||
config = lib.mkMerge [
|
||||
(lib.mkIf hasConfig {
|
||||
programs.git = {
|
||||
|
|
@ -23,7 +21,7 @@ in {
|
|||
};
|
||||
};
|
||||
programs.jujutsu.settings = {
|
||||
user = lib.mkIf (cfg.defaultIdentity != null) {inherit (cfg.defaultIdentity) name email;};
|
||||
user = lib.mkIf (cfg.defaultIdentity != null) { inherit (cfg.defaultIdentity) name email; };
|
||||
signing = lib.mkIf hasKey {
|
||||
sign-all = true;
|
||||
backend = "gpg";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{nixos-hardware}: {
|
||||
{ nixos-hardware }:
|
||||
{
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
|
|
@ -9,8 +10,8 @@
|
|||
];
|
||||
fileSystems = {
|
||||
# Setup extra filesystem options
|
||||
"/".options = ["compress=zstd"];
|
||||
"/home".options = ["compress=zstd"];
|
||||
"/".options = [ "compress=zstd" ];
|
||||
"/home".options = [ "compress=zstd" ];
|
||||
"/nix".options = [
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
|
|
|
|||
|
|
@ -6,8 +6,9 @@
|
|||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
||||
}:
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
boot = {
|
||||
initrd = {
|
||||
availableKernelModules = [
|
||||
|
|
@ -16,22 +17,22 @@
|
|||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
kernelModules = [];
|
||||
kernelModules = [ ];
|
||||
};
|
||||
kernelModules = ["kvm-intel"];
|
||||
extraModulePackages = [];
|
||||
kernelModules = [ "kvm-intel" ];
|
||||
extraModulePackages = [ ];
|
||||
};
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-label/NIXROOT";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=root"];
|
||||
options = [ "subvol=root" ];
|
||||
};
|
||||
|
||||
"/nix" = {
|
||||
device = "/dev/disk/by-label/NIXROOT";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=nix"];
|
||||
options = [ "subvol=nix" ];
|
||||
};
|
||||
|
||||
"/home" = {
|
||||
|
|
@ -45,7 +46,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
swapDevices = [{device = "/dev/disk/by-label/NIXSWAP";}];
|
||||
swapDevices = [ { device = "/dev/disk/by-label/NIXSWAP"; } ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
{nixos-hardware}: {pkgs, ...}: {
|
||||
{ nixos-hardware }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
|
|
@ -11,9 +13,9 @@
|
|||
nixos-hardware.nixosModules.common-gpu-amd
|
||||
];
|
||||
fileSystems = {
|
||||
"/".options = ["compress=zstd"];
|
||||
"/steam".options = ["compress=zstd"];
|
||||
"/home".options = ["compress=zstd"];
|
||||
"/".options = [ "compress=zstd" ];
|
||||
"/steam".options = [ "compress=zstd" ];
|
||||
"/home".options = [ "compress=zstd" ];
|
||||
"/nix".options = [
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
|
|
@ -48,7 +50,7 @@
|
|||
# };
|
||||
enable = true;
|
||||
startWhenNeeded = true;
|
||||
settings.AllowUsers = ["jalil"];
|
||||
settings.AllowUsers = [ "jalil" ];
|
||||
};
|
||||
|
||||
# Enable CUPS to print documents.
|
||||
|
|
|
|||
|
|
@ -6,8 +6,9 @@
|
|||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
||||
}:
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
boot = {
|
||||
initrd = {
|
||||
availableKernelModules = [
|
||||
|
|
@ -18,17 +19,17 @@
|
|||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
kernelModules = [];
|
||||
kernelModules = [ ];
|
||||
};
|
||||
kernelModules = ["kvm-amd"];
|
||||
extraModulePackages = [];
|
||||
kernelModules = [ "kvm-amd" ];
|
||||
extraModulePackages = [ ];
|
||||
};
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
# device = "/dev/disk/by-label/NIXOSROOT";
|
||||
device = "/dev/disk/by-label/NIXOSHOME";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=root"];
|
||||
options = [ "subvol=root" ];
|
||||
};
|
||||
|
||||
"/steam" = {
|
||||
|
|
@ -39,13 +40,13 @@
|
|||
"/home" = {
|
||||
device = "/dev/disk/by-label/NIXOSHOME";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=home"];
|
||||
options = [ "subvol=home" ];
|
||||
};
|
||||
|
||||
"/nix" = {
|
||||
device = "/dev/disk/by-label/NIXOSROOT";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=nix"];
|
||||
options = [ "subvol=nix" ];
|
||||
};
|
||||
|
||||
"/boot" = {
|
||||
|
|
@ -54,7 +55,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
swapDevices = [{device = "/dev/disk/by-label/SWAP";}];
|
||||
swapDevices = [ { device = "/dev/disk/by-label/SWAP"; } ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page, on
|
||||
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||
{nixos-hardware}: {pkgs, ...}: {
|
||||
{ nixos-hardware }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
|
|
@ -13,8 +15,8 @@
|
|||
];
|
||||
|
||||
fileSystems = {
|
||||
"/".options = ["compress=zstd"];
|
||||
"/home".options = ["compress=zstd"];
|
||||
"/".options = [ "compress=zstd" ];
|
||||
"/home".options = [ "compress=zstd" ];
|
||||
"/nix".options = [
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
|
|
@ -22,7 +24,7 @@
|
|||
};
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelParams = ["amdgpu.dcdebugmask=0x10"];
|
||||
kernelParams = [ "amdgpu.dcdebugmask=0x10" ];
|
||||
loader = {
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
timeout = 0; # Press Space to show the menu
|
||||
|
|
|
|||
|
|
@ -7,8 +7,9 @@
|
|||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
||||
}:
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
boot = {
|
||||
initrd = {
|
||||
availableKernelModules = [
|
||||
|
|
@ -17,28 +18,28 @@
|
|||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
kernelModules = [];
|
||||
kernelModules = [ ];
|
||||
};
|
||||
kernelModules = ["kvm-amd"];
|
||||
extraModulePackages = [];
|
||||
kernelModules = [ "kvm-amd" ];
|
||||
extraModulePackages = [ ];
|
||||
};
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-uuid/efbda7f0-c286-4fb1-b780-d3128e4d1a3e";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=root"];
|
||||
options = [ "subvol=root" ];
|
||||
};
|
||||
|
||||
"/home" = {
|
||||
device = "/dev/disk/by-uuid/efbda7f0-c286-4fb1-b780-d3128e4d1a3e";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=home"];
|
||||
options = [ "subvol=home" ];
|
||||
};
|
||||
|
||||
"/nix" = {
|
||||
device = "/dev/disk/by-uuid/efbda7f0-c286-4fb1-b780-d3128e4d1a3e";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=nix"];
|
||||
options = [ "subvol=nix" ];
|
||||
};
|
||||
|
||||
"/boot" = {
|
||||
|
|
@ -47,7 +48,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
swapDevices = [];
|
||||
swapDevices = [ ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
{helpers, ...}: let
|
||||
{ helpers, ... }:
|
||||
let
|
||||
inherit (helpers) mkRaw;
|
||||
in {
|
||||
in
|
||||
{
|
||||
config = {
|
||||
autoGroups = {
|
||||
"highlightOnYank" = {};
|
||||
"lspConfig" = {};
|
||||
"restoreCursorPosition" = {};
|
||||
"highlightOnYank" = { };
|
||||
"lspConfig" = { };
|
||||
"restoreCursorPosition" = { };
|
||||
};
|
||||
autoCmd = [
|
||||
{
|
||||
|
|
@ -14,9 +16,7 @@ in {
|
|||
pattern = "*";
|
||||
callback =
|
||||
mkRaw
|
||||
/*
|
||||
lua
|
||||
*/
|
||||
# lua
|
||||
''
|
||||
function()
|
||||
vim.highlight.on_yank {
|
||||
|
|
@ -34,9 +34,7 @@ in {
|
|||
pattern = "*";
|
||||
callback =
|
||||
mkRaw
|
||||
/*
|
||||
lua
|
||||
*/
|
||||
# lua
|
||||
''
|
||||
function()
|
||||
if vim.fn.line '\'"' > 0 and vim.fn.line '\'"' <= vim.fn.line '$' then
|
||||
|
|
@ -49,13 +47,12 @@ in {
|
|||
group = "lspConfig";
|
||||
event = "LspAttach";
|
||||
pattern = "*";
|
||||
callback = let
|
||||
callback =
|
||||
let
|
||||
opts = "noremap = true, buffer = bufnr";
|
||||
in
|
||||
mkRaw
|
||||
/*
|
||||
lua
|
||||
*/
|
||||
# lua
|
||||
''
|
||||
function(opts)
|
||||
local bufnr = opts.buf
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
{ lib, config, ... }:
|
||||
let
|
||||
cfg = config.jhome.nvim;
|
||||
in {
|
||||
imports = [./options.nix];
|
||||
in
|
||||
{
|
||||
imports = [ ./options.nix ];
|
||||
|
||||
config.programs.nixvim = lib.mkMerge [
|
||||
./standalone.nix
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{pkgs}: {
|
||||
vim-jjdescription = pkgs.callPackage ./vim-jjdescription.nix {};
|
||||
nvim-silicon = pkgs.callPackage ./nvim-silicon.nix {};
|
||||
{ pkgs }:
|
||||
{
|
||||
vim-jjdescription = pkgs.callPackage ./vim-jjdescription.nix { };
|
||||
nvim-silicon = pkgs.callPackage ./nvim-silicon.nix { };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
{
|
||||
vimUtils,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
{ vimUtils, fetchFromGitHub }:
|
||||
vimUtils.buildVimPlugin {
|
||||
name = "nvim-silicon";
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
{
|
||||
vimUtils,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
{ vimUtils, fetchFromGitHub }:
|
||||
vimUtils.buildVimPlugin {
|
||||
name = "jjdescription";
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{helpers, ...}: let
|
||||
{ helpers, ... }:
|
||||
let
|
||||
inherit (helpers) mkRaw;
|
||||
in {
|
||||
in
|
||||
{
|
||||
config.keymaps = [
|
||||
# Quickfix
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{lib, ...}: {
|
||||
options.jhome.nvim.enable =
|
||||
lib.mkEnableOption "jalil's neovim configuration"
|
||||
// {
|
||||
{ lib, ... }:
|
||||
{
|
||||
options.jhome.nvim.enable = lib.mkEnableOption "jalil's neovim configuration" // {
|
||||
default = true;
|
||||
example = false;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,9 +3,11 @@
|
|||
pkgs,
|
||||
helpers,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (helpers) mkRaw;
|
||||
in {
|
||||
in
|
||||
{
|
||||
config.plugins = {
|
||||
bacon = {
|
||||
enable = true;
|
||||
|
|
@ -17,38 +19,32 @@ in {
|
|||
"/" = {
|
||||
mapping =
|
||||
mkRaw
|
||||
/*
|
||||
lua
|
||||
*/
|
||||
# lua
|
||||
''
|
||||
cmp.mapping.preset.cmdline()
|
||||
'';
|
||||
sources = [
|
||||
{name = "rg";}
|
||||
{name = "buffer";}
|
||||
{ name = "rg"; }
|
||||
{ name = "buffer"; }
|
||||
];
|
||||
};
|
||||
":" = {
|
||||
mapping =
|
||||
mkRaw
|
||||
/*
|
||||
lua
|
||||
*/
|
||||
# lua
|
||||
''
|
||||
cmp.mapping.preset.cmdline()
|
||||
'';
|
||||
sources = [
|
||||
{name = "path";}
|
||||
{name = "cmdline";}
|
||||
{ name = "path"; }
|
||||
{ name = "cmdline"; }
|
||||
];
|
||||
};
|
||||
};
|
||||
settings = {
|
||||
# Snippets
|
||||
snippet.expand =
|
||||
/*
|
||||
lua
|
||||
*/
|
||||
# lua
|
||||
''
|
||||
function(args) require('luasnip').lsp_expand(args.body) end
|
||||
'';
|
||||
|
|
@ -105,9 +101,7 @@ in {
|
|||
];
|
||||
mapping =
|
||||
mkRaw
|
||||
/*
|
||||
lua
|
||||
*/
|
||||
# lua
|
||||
''
|
||||
cmp.mapping.preset.insert({
|
||||
["<C-n>"] = function(fallback)
|
||||
|
|
@ -150,28 +144,31 @@ in {
|
|||
conform-nvim = {
|
||||
enable = true;
|
||||
formattersByFt = {
|
||||
"_" = ["trim_whitespace"];
|
||||
c = ["clang_format"];
|
||||
cpp = ["clang_format"];
|
||||
lua = ["stylua"];
|
||||
nix = ["alejandra"];
|
||||
rust = ["rustfmt"];
|
||||
sh = ["shfmt"];
|
||||
toml = ["taplo"];
|
||||
yaml = ["yamlfmt"];
|
||||
zig = ["zigfmt"];
|
||||
"_" = [ "trim_whitespace" ];
|
||||
c = [ "clang_format" ];
|
||||
cpp = [ "clang_format" ];
|
||||
lua = [ "stylua" ];
|
||||
nix = [ "alejandra" ];
|
||||
rust = [ "rustfmt" ];
|
||||
sh = [ "shfmt" ];
|
||||
toml = [ "taplo" ];
|
||||
yaml = [ "yamlfmt" ];
|
||||
zig = [ "zigfmt" ];
|
||||
};
|
||||
};
|
||||
gitsigns.enable = true;
|
||||
lint = {
|
||||
enable = true;
|
||||
lintersByFt = {
|
||||
rust = ["typos"];
|
||||
latex = ["chktex" "typos"];
|
||||
markdown = ["typos"];
|
||||
nix = ["statix"];
|
||||
sh = ["dash"];
|
||||
zsh = ["zsh"];
|
||||
rust = [ "typos" ];
|
||||
latex = [
|
||||
"chktex"
|
||||
"typos"
|
||||
];
|
||||
markdown = [ "typos" ];
|
||||
nix = [ "statix" ];
|
||||
sh = [ "dash" ];
|
||||
zsh = [ "zsh" ];
|
||||
};
|
||||
};
|
||||
lsp = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,11 @@
|
|||
{pkgs, ...}: {
|
||||
imports = [./options.nix ./plugins.nix ./mappings.nix ./augroups.nix];
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./options.nix
|
||||
./plugins.nix
|
||||
./mappings.nix
|
||||
./augroups.nix
|
||||
];
|
||||
|
||||
config = {
|
||||
globals.mapleader = " ";
|
||||
|
|
@ -34,10 +40,12 @@
|
|||
# Enable local configuration :h 'exrc'
|
||||
exrc = true; # safe since nvim 0.9
|
||||
};
|
||||
extraPlugins = let
|
||||
extraPlugins =
|
||||
let
|
||||
plugins = pkgs.unstable.vimPlugins;
|
||||
extraPlugins = import ./extraPlugins {pkgs = pkgs.unstable;};
|
||||
in [
|
||||
extraPlugins = import ./extraPlugins { pkgs = pkgs.unstable; };
|
||||
in
|
||||
[
|
||||
plugins.nui-nvim
|
||||
plugins.nvim-web-devicons
|
||||
extraPlugins.vim-jjdescription
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
{stylix}: {
|
||||
{ stylix }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
cfg = config.jconfig;
|
||||
keysFromGithub =
|
||||
lib.attrsets.mapAttrs' (username: sha256: {
|
||||
keysFromGithub = lib.attrsets.mapAttrs' (username: sha256: {
|
||||
name = "pubkeys/${username}";
|
||||
value = {
|
||||
mode = "0755";
|
||||
|
|
@ -15,14 +16,14 @@
|
|||
url = "https://github.com/${username}.keys";
|
||||
};
|
||||
};
|
||||
})
|
||||
cfg.importSSHKeysFromGithub;
|
||||
in {
|
||||
}) cfg.importSSHKeysFromGithub;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./options.nix
|
||||
./gui
|
||||
stylix.nixosModules.stylix
|
||||
{stylix = import ./stylix-config.nix {inherit config pkgs;};}
|
||||
{ stylix = import ./stylix-config.nix { inherit config pkgs; }; }
|
||||
];
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
|
@ -86,8 +87,8 @@ in {
|
|||
users.defaultUserShell = pkgs.zsh;
|
||||
# Open ports for spotifyd
|
||||
networking.firewall = {
|
||||
allowedUDPPorts = [5353];
|
||||
allowedTCPPorts = [2020];
|
||||
allowedUDPPorts = [ 5353 ];
|
||||
allowedTCPPorts = [ 2020 ];
|
||||
};
|
||||
# Nix Settings
|
||||
nix = {
|
||||
|
|
|
|||
|
|
@ -3,24 +3,24 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
cfg = config.jconfig.gui;
|
||||
enable = config.jconfig.enable && cfg.enable;
|
||||
in {
|
||||
in
|
||||
{
|
||||
config = lib.mkMerge [
|
||||
(lib.mkIf enable {
|
||||
environment.systemPackages =
|
||||
[
|
||||
environment.systemPackages = [
|
||||
pkgs.gnome.adwaita-icon-theme
|
||||
pkgs.adwaita-qt
|
||||
pkgs.nordzy-cursor-theme
|
||||
pkgs.pinentry-qt
|
||||
]
|
||||
++ lib.optional cfg.ydotool.enable pkgs.ydotool;
|
||||
] ++ lib.optional cfg.ydotool.enable pkgs.ydotool;
|
||||
systemd = {
|
||||
user.services.ydotool = lib.mkIf cfg.ydotool.enable {
|
||||
enable = cfg.ydotool.autoStart;
|
||||
wantedBy = ["default.target"];
|
||||
wantedBy = [ "default.target" ];
|
||||
description = "Generic command-line automation tool";
|
||||
documentation = [
|
||||
"man:ydotool(1)"
|
||||
|
|
@ -47,7 +47,7 @@ in {
|
|||
sway = {
|
||||
enable = cfg.sway;
|
||||
# No extra packages (by default it adds foot, dmenu, and other stuff)
|
||||
extraPackages = [];
|
||||
extraPackages = [ ];
|
||||
wrapperFeatures = {
|
||||
base = true;
|
||||
gtk = true;
|
||||
|
|
@ -77,7 +77,7 @@ in {
|
|||
# XDG portals
|
||||
enable = true;
|
||||
wlr.enable = true;
|
||||
extraPortals = [pkgs.xdg-desktop-portal-gtk];
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||
config.preferred = {
|
||||
# Default to the gtk portal
|
||||
default = "gtk";
|
||||
|
|
|
|||
|
|
@ -1,13 +1,16 @@
|
|||
{lib, ...}: let
|
||||
{ lib, ... }:
|
||||
let
|
||||
inherit (lib) types;
|
||||
# Like mkEnableOption but defaults to true
|
||||
mkDisableOption = option:
|
||||
mkDisableOption =
|
||||
option:
|
||||
(lib.mkEnableOption option)
|
||||
// {
|
||||
default = true;
|
||||
example = false;
|
||||
};
|
||||
mkImageOption = {
|
||||
mkImageOption =
|
||||
{
|
||||
description,
|
||||
url,
|
||||
sha256 ? "",
|
||||
|
|
@ -15,7 +18,7 @@
|
|||
lib.mkOption {
|
||||
inherit description;
|
||||
type = types.path;
|
||||
default = builtins.fetchurl {inherit url sha256;};
|
||||
default = builtins.fetchurl { inherit url sha256; };
|
||||
defaultText = lib.literalMD "";
|
||||
};
|
||||
|
||||
|
|
@ -28,7 +31,7 @@
|
|||
steamHardwareSupport = mkDisableOption "steam hardware support";
|
||||
ydotool = lib.mkOption {
|
||||
description = "Jalil's default ydotool configuration.";
|
||||
default = {};
|
||||
default = { };
|
||||
type = types.submodule {
|
||||
options.enable = mkDisableOption "ydotool";
|
||||
options.autoStart = mkDisableOption "autostarting ydotool at login";
|
||||
|
|
@ -56,17 +59,17 @@
|
|||
enable = lib.mkEnableOption "jalil's default configuration.";
|
||||
dev = lib.mkOption {
|
||||
description = "Options for setting up a dev environment";
|
||||
default = {};
|
||||
type = types.submodule {options.enable = lib.mkEnableOption "dev configuration";};
|
||||
default = { };
|
||||
type = types.submodule { options.enable = lib.mkEnableOption "dev configuration"; };
|
||||
};
|
||||
gui = lib.mkOption {
|
||||
description = "Jalil's default configuration for a NixOS gui.";
|
||||
default = {};
|
||||
default = { };
|
||||
type = types.submodule gui;
|
||||
};
|
||||
styling = lib.mkOption {
|
||||
description = "Jalil's styling options";
|
||||
default = {};
|
||||
default = { };
|
||||
type = types.submodule styling;
|
||||
};
|
||||
importSSHKeysFromGithub = lib.mkOption {
|
||||
|
|
@ -83,17 +86,18 @@
|
|||
`users.users.<name>.openssh.authorizedKeys.keyFiles` on the users you
|
||||
want to allow ssh logins.
|
||||
'';
|
||||
default = {};
|
||||
default = { };
|
||||
example = {
|
||||
"jalil-salame" = "sha256:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
|
||||
};
|
||||
type = types.attrsOf types.str;
|
||||
};
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.jconfig = lib.mkOption {
|
||||
description = "Jalil's default NixOS configuration.";
|
||||
default = {};
|
||||
default = { };
|
||||
type = types.submodule config;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
}: let
|
||||
{ config, pkgs }:
|
||||
let
|
||||
cfg = config.jconfig.styling;
|
||||
in {
|
||||
in
|
||||
{
|
||||
inherit (cfg) enable;
|
||||
image = cfg.wallpaper;
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
|
||||
|
|
|
|||
Loading…
Reference in a new issue