format with prettier formatter :3
This commit is contained in:
parent
8b1a6aca39
commit
211fa03252
18 changed files with 480 additions and 500 deletions
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: {
|
||||
{...}: {
|
||||
nix.settings = {
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
download-buffer-size = 524288000;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: {
|
||||
{...}: {
|
||||
nix.settings = {
|
||||
trusted-users = ["root" "@wheel"];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,8 +8,7 @@
|
|||
root,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
inputs.zen.homeModules.twilight
|
||||
|
||||
|
|
@ -77,8 +76,7 @@
|
|||
|
||||
fonts.fontconfig.enable = true;
|
||||
|
||||
home.file.".mozilla/native-messaging-hosts/tridactyl.json".source =
|
||||
"${upkgs.tridactyl-native}/lib/mozilla/native-messaging-hosts/tridactyl.json";
|
||||
home.file.".mozilla/native-messaging-hosts/tridactyl.json".source = "${upkgs.tridactyl-native}/lib/mozilla/native-messaging-hosts/tridactyl.json";
|
||||
|
||||
# some packages are enabled from their own module in ./modules
|
||||
home.packages = with upkgs; [
|
||||
|
|
@ -101,7 +99,7 @@
|
|||
ripgrep # rlly fast grep :3
|
||||
zip # zips .zip
|
||||
unzip # unzips .zip
|
||||
(btop.override { rocmSupport = true; }) # btop + amd gpu support
|
||||
(btop.override {rocmSupport = true;}) # btop + amd gpu support
|
||||
nmap # network discovery and mapping tool!
|
||||
distrobox # use any linux distro inside ur terminal x3
|
||||
parted # create, resize, copy, image partitions
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ upkgs, ... }:
|
||||
{
|
||||
{upkgs, ...}: {
|
||||
programs.alacritty = {
|
||||
enable = true;
|
||||
package = upkgs.alacritty-graphics;
|
||||
|
|
|
|||
|
|
@ -4,13 +4,12 @@
|
|||
inputs,
|
||||
mpkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (inputs.nixcats)
|
||||
}: let
|
||||
inherit
|
||||
(inputs.nixcats)
|
||||
utils
|
||||
;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
inputs.nixcats.homeModule
|
||||
];
|
||||
|
|
@ -31,224 +30,220 @@ in
|
|||
];
|
||||
# see the packageDefinitions below.
|
||||
# This says which of those to install.
|
||||
packageNames = [ "auroranvim" ];
|
||||
packageNames = ["auroranvim"];
|
||||
|
||||
luaPath = "${./.}";
|
||||
|
||||
# the .replace vs .merge options are for modules based on existing configurations,
|
||||
# they refer to how multiple categoryDefinitions get merged together by the module.
|
||||
# for useage of this section, refer to :h nixCats.flake.outputs.categories
|
||||
categoryDefinitions.replace =
|
||||
{
|
||||
pkgs,
|
||||
settings,
|
||||
categories,
|
||||
extra,
|
||||
name,
|
||||
mkNvimPlugin,
|
||||
...
|
||||
}@packageDef:
|
||||
{
|
||||
lspsAndRuntimeDeps = with pkgs; {
|
||||
general = [
|
||||
ripgrep
|
||||
fd
|
||||
categoryDefinitions.replace = {
|
||||
pkgs,
|
||||
settings,
|
||||
categories,
|
||||
extra,
|
||||
name,
|
||||
mkNvimPlugin,
|
||||
...
|
||||
} @ packageDef: {
|
||||
lspsAndRuntimeDeps = with pkgs; {
|
||||
general = [
|
||||
ripgrep
|
||||
fd
|
||||
];
|
||||
treesitter = [
|
||||
tree-sitter
|
||||
];
|
||||
lang = {
|
||||
lua = [
|
||||
lua-language-server
|
||||
stylua
|
||||
];
|
||||
treesitter = [
|
||||
tree-sitter
|
||||
nix = [
|
||||
nil
|
||||
nix-doc # TODO: i forgot what this is for
|
||||
alejandra
|
||||
];
|
||||
lang = {
|
||||
lua = [
|
||||
lua-language-server
|
||||
stylua
|
||||
];
|
||||
nix = [
|
||||
nil
|
||||
nix-doc # TODO: i forgot what this is for
|
||||
alejandra
|
||||
];
|
||||
rust = [
|
||||
cargo
|
||||
mpkgs.rust-analyzer
|
||||
# nightly rustfmt has nicer features :3
|
||||
inputs.fenix.packages.${system}.complete.rustfmt
|
||||
];
|
||||
zig = [
|
||||
zls
|
||||
];
|
||||
elixir = [
|
||||
elixir-ls
|
||||
];
|
||||
gleam = [
|
||||
gleam
|
||||
];
|
||||
haskell = [
|
||||
haskell-language-server
|
||||
ormolu
|
||||
];
|
||||
java = [
|
||||
jdt-language-server
|
||||
javaPackages.compiler.openjdk17
|
||||
javaPackages.compiler.openjdk21
|
||||
];
|
||||
protobuf = [
|
||||
protols
|
||||
buf
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
startupPlugins = with pkgs.vimPlugins; {
|
||||
general = [
|
||||
lze
|
||||
plenary-nvim
|
||||
nvim-notify
|
||||
nvim-web-devicons
|
||||
base16-nvim
|
||||
mini-nvim
|
||||
rust = [
|
||||
cargo
|
||||
mpkgs.rust-analyzer
|
||||
# nightly rustfmt has nicer features :3
|
||||
inputs.fenix.packages.${system}.complete.rustfmt
|
||||
];
|
||||
treesitter = [
|
||||
nvim-treesitter-textobjects
|
||||
nvim-treesitter.withAllGrammars
|
||||
zig = [
|
||||
zls
|
||||
];
|
||||
elixir = [
|
||||
elixir-ls
|
||||
];
|
||||
gleam = [
|
||||
gleam
|
||||
];
|
||||
haskell = [
|
||||
haskell-language-server
|
||||
ormolu
|
||||
];
|
||||
java = [
|
||||
jdt-language-server
|
||||
javaPackages.compiler.openjdk17
|
||||
javaPackages.compiler.openjdk21
|
||||
];
|
||||
protobuf = [
|
||||
protols
|
||||
buf
|
||||
];
|
||||
};
|
||||
|
||||
optionalPlugins = with pkgs.vimPlugins; {
|
||||
general = [
|
||||
];
|
||||
ui = [
|
||||
dressing-nvim
|
||||
];
|
||||
qol = [
|
||||
undotree
|
||||
mini-hipatterns
|
||||
];
|
||||
telescope = [
|
||||
telescope-nvim
|
||||
telescope-fzf-native-nvim
|
||||
telescope-ui-select-nvim
|
||||
];
|
||||
fyler = [
|
||||
fyler-nvim
|
||||
];
|
||||
lsp = [
|
||||
nvim-lspconfig
|
||||
];
|
||||
completion = [
|
||||
blink-cmp
|
||||
nvim-cmp
|
||||
luasnip
|
||||
friendly-snippets
|
||||
cmp_luasnip
|
||||
cmp-buffer
|
||||
cmp-path
|
||||
cmp-nvim-lua
|
||||
cmp-nvim-lsp
|
||||
cmp-cmdline
|
||||
cmp-nvim-lsp-signature-help
|
||||
cmp-cmdline-history
|
||||
lspkind-nvim
|
||||
];
|
||||
format = [
|
||||
conform-nvim
|
||||
];
|
||||
comment = [
|
||||
comment-nvim
|
||||
];
|
||||
lang = {
|
||||
java = [
|
||||
nvim-jdtls
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
# shared libraries to be added to LD_LIBRARY_PATH
|
||||
# variable available to nvim runtime
|
||||
sharedLibraries = {
|
||||
general = with pkgs; [
|
||||
# libgit2
|
||||
];
|
||||
};
|
||||
|
||||
environmentVariables = {
|
||||
lang = {
|
||||
rust.lsp = {
|
||||
# it literally won't see the rust-analyzer provided to it
|
||||
# if you don't use an envrionment variable to tell it
|
||||
RUST_ANALYZER_CMD = "${mpkgs.rust-analyzer}/bin/rust-analyzer";
|
||||
};
|
||||
elixir.lsp = {
|
||||
ELIXIR_LS_CMD = "${pkgs.elixir-ls}/scripts/language_server.sh";
|
||||
};
|
||||
java.lsp = {
|
||||
JAVA_HOME = "${pkgs.javaPackages.compiler.openjdk17}";
|
||||
OPENJDK_17 = "${pkgs.javaPackages.compiler.openjdk17}";
|
||||
OPENJDK_21 = "${pkgs.javaPackages.compiler.openjdk21}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
extraWrapperArgs = { };
|
||||
# lists of the functions you would have passed to
|
||||
# python.withPackages or lua.withPackages
|
||||
|
||||
# get the path to this python environment
|
||||
# in your lua config via
|
||||
# vim.g.python3_host_prog
|
||||
# or run from nvim terminal via :!<packagename>-python3
|
||||
extraPython3Packages = { };
|
||||
# populates $LUA_PATH and $LUA_CPATH
|
||||
extraLuaPackages = { };
|
||||
};
|
||||
|
||||
startupPlugins = with pkgs.vimPlugins; {
|
||||
general = [
|
||||
lze
|
||||
plenary-nvim
|
||||
nvim-notify
|
||||
nvim-web-devicons
|
||||
base16-nvim
|
||||
mini-nvim
|
||||
];
|
||||
treesitter = [
|
||||
nvim-treesitter-textobjects
|
||||
nvim-treesitter.withAllGrammars
|
||||
];
|
||||
};
|
||||
|
||||
optionalPlugins = with pkgs.vimPlugins; {
|
||||
general = [
|
||||
];
|
||||
ui = [
|
||||
dressing-nvim
|
||||
];
|
||||
qol = [
|
||||
undotree
|
||||
mini-hipatterns
|
||||
];
|
||||
telescope = [
|
||||
telescope-nvim
|
||||
telescope-fzf-native-nvim
|
||||
telescope-ui-select-nvim
|
||||
];
|
||||
fyler = [
|
||||
fyler-nvim
|
||||
];
|
||||
lsp = [
|
||||
nvim-lspconfig
|
||||
];
|
||||
completion = [
|
||||
blink-cmp
|
||||
nvim-cmp
|
||||
luasnip
|
||||
friendly-snippets
|
||||
cmp_luasnip
|
||||
cmp-buffer
|
||||
cmp-path
|
||||
cmp-nvim-lua
|
||||
cmp-nvim-lsp
|
||||
cmp-cmdline
|
||||
cmp-nvim-lsp-signature-help
|
||||
cmp-cmdline-history
|
||||
lspkind-nvim
|
||||
];
|
||||
format = [
|
||||
conform-nvim
|
||||
];
|
||||
comment = [
|
||||
comment-nvim
|
||||
];
|
||||
lang = {
|
||||
java = [
|
||||
nvim-jdtls
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
# shared libraries to be added to LD_LIBRARY_PATH
|
||||
# variable available to nvim runtime
|
||||
sharedLibraries = {
|
||||
general = with pkgs; [
|
||||
# libgit2
|
||||
];
|
||||
};
|
||||
|
||||
environmentVariables = {
|
||||
lang = {
|
||||
rust.lsp = {
|
||||
# it literally won't see the rust-analyzer provided to it
|
||||
# if you don't use an envrionment variable to tell it
|
||||
RUST_ANALYZER_CMD = "${mpkgs.rust-analyzer}/bin/rust-analyzer";
|
||||
};
|
||||
elixir.lsp = {
|
||||
ELIXIR_LS_CMD = "${pkgs.elixir-ls}/scripts/language_server.sh";
|
||||
};
|
||||
java.lsp = {
|
||||
JAVA_HOME = "${pkgs.javaPackages.compiler.openjdk17}";
|
||||
OPENJDK_17 = "${pkgs.javaPackages.compiler.openjdk17}";
|
||||
OPENJDK_21 = "${pkgs.javaPackages.compiler.openjdk21}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
extraWrapperArgs = {};
|
||||
# lists of the functions you would have passed to
|
||||
# python.withPackages or lua.withPackages
|
||||
|
||||
# get the path to this python environment
|
||||
# in your lua config via
|
||||
# vim.g.python3_host_prog
|
||||
# or run from nvim terminal via :!<packagename>-python3
|
||||
extraPython3Packages = {};
|
||||
# populates $LUA_PATH and $LUA_CPATH
|
||||
extraLuaPackages = {};
|
||||
};
|
||||
|
||||
# see :help nixCats.flake.outputs.packageDefinitions
|
||||
packageDefinitions.replace = {
|
||||
# these are the names of your packages
|
||||
# you can include as many as you wish.
|
||||
auroranvim =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
# they contain a settings set defined above
|
||||
# see :help nixCats.flake.outputs.settings
|
||||
settings = {
|
||||
wrapRc = true;
|
||||
# IMPORTANT:
|
||||
# your alias may not conflict with your other packages.
|
||||
aliases = [
|
||||
"auravim"
|
||||
"foxyvim"
|
||||
"avix"
|
||||
"fvix"
|
||||
];
|
||||
};
|
||||
# and a set of categories that you want
|
||||
# (and other information to pass to lua)
|
||||
categories = {
|
||||
general = true;
|
||||
auroranvim = {pkgs, ...}: {
|
||||
# they contain a settings set defined above
|
||||
# see :help nixCats.flake.outputs.settings
|
||||
settings = {
|
||||
wrapRc = true;
|
||||
# IMPORTANT:
|
||||
# your alias may not conflict with your other packages.
|
||||
aliases = [
|
||||
"auravim"
|
||||
"foxyvim"
|
||||
"avix"
|
||||
"fvix"
|
||||
];
|
||||
};
|
||||
# and a set of categories that you want
|
||||
# (and other information to pass to lua)
|
||||
categories = {
|
||||
general = true;
|
||||
|
||||
ui = true;
|
||||
qol = true;
|
||||
telescope = true;
|
||||
fyler = true;
|
||||
lsp = true;
|
||||
completion = true;
|
||||
treesitter = true;
|
||||
format = true;
|
||||
comment = true;
|
||||
ui = true;
|
||||
qol = true;
|
||||
telescope = true;
|
||||
fyler = true;
|
||||
lsp = true;
|
||||
completion = true;
|
||||
treesitter = true;
|
||||
format = true;
|
||||
comment = true;
|
||||
|
||||
lang = {
|
||||
lua = true;
|
||||
nix = true;
|
||||
rust = true;
|
||||
zig = true;
|
||||
elixir = true;
|
||||
gleam = true;
|
||||
haskell = true;
|
||||
java = true;
|
||||
protobuf = true;
|
||||
};
|
||||
lang = {
|
||||
lua = true;
|
||||
nix = true;
|
||||
rust = true;
|
||||
zig = true;
|
||||
elixir = true;
|
||||
gleam = true;
|
||||
haskell = true;
|
||||
java = true;
|
||||
protobuf = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
{inputs, ...}: {
|
||||
imports = [
|
||||
inputs.nixcord.homeModules.nixcord
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ upkgs, ... }:
|
||||
{
|
||||
{upkgs, ...}: {
|
||||
# optional dependencies can be found here:
|
||||
# https://yazi-rs.github.io/docs/installation/
|
||||
home.packages = with upkgs; [
|
||||
|
|
@ -24,12 +23,12 @@
|
|||
mgr.prepend_keymap = [
|
||||
# drag and drop!!
|
||||
{
|
||||
on = [ "<S-c>" ];
|
||||
on = ["<S-c>"];
|
||||
run = ''shell "ripdrag -x -a \"$@\"" --confirm'';
|
||||
}
|
||||
# copy hovered file to clipboard
|
||||
{
|
||||
on = [ "<S-y>" ];
|
||||
on = ["<S-y>"];
|
||||
run = ''shell -- path=%h; echo "file://$path" | wl-copy -t text/uri-list'';
|
||||
}
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ upkgs, ... }:
|
||||
{
|
||||
{upkgs, ...}: {
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
enableCompletion = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
{inputs, ...}: {
|
||||
imports = [
|
||||
inputs.mango.hmModules.mango
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,83 +1,78 @@
|
|||
{ ... }:
|
||||
{
|
||||
wayland.windowManager.river =
|
||||
let
|
||||
layout = "rivertile";
|
||||
in
|
||||
{
|
||||
enable = true;
|
||||
xwayland.enable = true;
|
||||
{...}: {
|
||||
wayland.windowManager.river = let
|
||||
layout = "rivertile";
|
||||
in {
|
||||
enable = true;
|
||||
xwayland.enable = true;
|
||||
|
||||
settings =
|
||||
let
|
||||
main = "Super";
|
||||
settings = let
|
||||
main = "Super";
|
||||
|
||||
# applications
|
||||
terminal = "alacritty";
|
||||
browser = "firefox";
|
||||
in
|
||||
{
|
||||
default-layout = "${layout}";
|
||||
output-layout = "${layout}";
|
||||
border-width = 1;
|
||||
# applications
|
||||
terminal = "alacritty";
|
||||
browser = "firefox";
|
||||
in {
|
||||
default-layout = "${layout}";
|
||||
output-layout = "${layout}";
|
||||
border-width = 1;
|
||||
|
||||
spawn = [
|
||||
"${layout}"
|
||||
spawn = [
|
||||
"${layout}"
|
||||
|
||||
"awww-daemon"
|
||||
"waybar"
|
||||
];
|
||||
"awww-daemon"
|
||||
"waybar"
|
||||
];
|
||||
|
||||
map.normal = {
|
||||
"${main} C" = "close"; # close focused window
|
||||
"${main}+Alt Delete" = "exit"; # exit river
|
||||
map.normal = {
|
||||
"${main} C" = "close"; # close focused window
|
||||
"${main}+Alt Delete" = "exit"; # exit river
|
||||
|
||||
# app launcher
|
||||
"${main} D" = ''spawn "pkill -x rofi || rofi -show drun -show-icons"'';
|
||||
"Alt Tab" = ''spawn "pkill -x rofi || rofi -modi window -show window -show-icons"'';
|
||||
# app launcher
|
||||
"${main} D" = ''spawn "pkill -x rofi || rofi -show drun -show-icons"'';
|
||||
"Alt Tab" = ''spawn "pkill -x rofi || rofi -modi window -show window -show-icons"'';
|
||||
|
||||
# spawn applications
|
||||
"${main} T" = ''spawn "${terminal}"'';
|
||||
"${main} R" = ''spawn "${browser}"'';
|
||||
# spawn applications
|
||||
"${main} T" = ''spawn "${terminal}"'';
|
||||
"${main} R" = ''spawn "${browser}"'';
|
||||
|
||||
# move focused view to top of layout stack
|
||||
"${main} N" = "zoom";
|
||||
# move focused view to top of layout stack
|
||||
"${main} N" = "zoom";
|
||||
|
||||
# focus next/previous view
|
||||
"${main} J" = "focus-view previous";
|
||||
"${main} K" = "focus-view next";
|
||||
# move to next/previous output
|
||||
"${main} H" = "focus-output previous";
|
||||
"${main} L" = "focus-output next";
|
||||
# focus next/previous view
|
||||
"${main} J" = "focus-view previous";
|
||||
"${main} K" = "focus-view next";
|
||||
# move to next/previous output
|
||||
"${main} H" = "focus-output previous";
|
||||
"${main} L" = "focus-output next";
|
||||
|
||||
# swap next/previous view
|
||||
"${main}+Alt J" = "swap previous";
|
||||
"${main}+Alt K" = "swap next";
|
||||
# send view to next/previous output
|
||||
# and switch to that output (wip)
|
||||
"${main}+Alt H" = "send-to-output previous";
|
||||
#"${main}+Alt H" = "focus-output previous";
|
||||
"${main}+Alt L" = "send-to-output next";
|
||||
#"${main}+Alt L" = "focus-output next";
|
||||
# swap next/previous view
|
||||
"${main}+Alt J" = "swap previous";
|
||||
"${main}+Alt K" = "swap next";
|
||||
# send view to next/previous output
|
||||
# and switch to that output (wip)
|
||||
"${main}+Alt H" = "send-to-output previous";
|
||||
#"${main}+Alt H" = "focus-output previous";
|
||||
"${main}+Alt L" = "send-to-output next";
|
||||
#"${main}+Alt L" = "focus-output next";
|
||||
|
||||
# move views
|
||||
#"${main}+Alt H" = "move left 100";
|
||||
#"${main}+Alt J" = "move down 100";
|
||||
#"${main}+Alt K" = "move up 100";
|
||||
#"${main}+Alt L" = "move right 100";
|
||||
# move views
|
||||
#"${main}+Alt H" = "move left 100";
|
||||
#"${main}+Alt J" = "move down 100";
|
||||
#"${main}+Alt K" = "move up 100";
|
||||
#"${main}+Alt L" = "move right 100";
|
||||
|
||||
# snap views
|
||||
#"${main}+Control H" = "snap left";
|
||||
#"${main}+Control J" = "snap down";
|
||||
#"${main}+Control K" = "snap up";
|
||||
#"${main}+Control L" = "snap right";
|
||||
# snap views
|
||||
#"${main}+Control H" = "snap left";
|
||||
#"${main}+Control J" = "snap down";
|
||||
#"${main}+Control K" = "snap up";
|
||||
#"${main}+Control L" = "snap right";
|
||||
|
||||
# resize views
|
||||
#"${main}+Shift H" = "resize horizontal -100";
|
||||
#"${main}+Shift J" = "resize vertical -100";
|
||||
#"${main}+Shift K" = "resize vertical 100";
|
||||
#"${main}+Shift L" = "resize horizontal 100";
|
||||
};
|
||||
};
|
||||
# resize views
|
||||
#"${main}+Shift H" = "resize horizontal -100";
|
||||
#"${main}+Shift J" = "resize vertical -100";
|
||||
#"${main}+Shift K" = "resize vertical 100";
|
||||
#"${main}+Shift L" = "resize horizontal 100";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ config, ... }:
|
||||
{
|
||||
{config, ...}: {
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
config = rec {
|
||||
|
|
@ -7,46 +6,44 @@
|
|||
terminal = "alacritty";
|
||||
|
||||
# disable sway bar
|
||||
bars = [ ];
|
||||
bars = [];
|
||||
|
||||
# set border colors
|
||||
#colors = {
|
||||
#focused =
|
||||
|
||||
startup = [
|
||||
{ command = "awww-daemon"; }
|
||||
{ command = "waybar"; }
|
||||
{command = "awww-daemon";}
|
||||
{command = "waybar";}
|
||||
];
|
||||
|
||||
keybindings =
|
||||
let
|
||||
main = config.wayland.windowManager.sway.config.modifier;
|
||||
terminal = config.wayland.windowManager.sway.config.terminal;
|
||||
browser = "firefox";
|
||||
in
|
||||
{
|
||||
"${main}+c" = "kill"; # close focused window
|
||||
"${main}+Alt+Delete" = "exit"; # exit sway
|
||||
keybindings = let
|
||||
main = config.wayland.windowManager.sway.config.modifier;
|
||||
terminal = config.wayland.windowManager.sway.config.terminal;
|
||||
browser = "firefox";
|
||||
in {
|
||||
"${main}+c" = "kill"; # close focused window
|
||||
"${main}+Alt+Delete" = "exit"; # exit sway
|
||||
|
||||
# open launcher
|
||||
"${main}+d" = "exec pkill -x rofi || rofi -show drun -show-icons";
|
||||
"Alt+Tab" = "exec pkill -x rofi || rofi -modi window -show window -show-icons";
|
||||
# open launcher
|
||||
"${main}+d" = "exec pkill -x rofi || rofi -show drun -show-icons";
|
||||
"Alt+Tab" = "exec pkill -x rofi || rofi -modi window -show window -show-icons";
|
||||
|
||||
"${main}+t" = "exec ${terminal}"; # open terminal
|
||||
"${main}+r" = "exec ${browser}"; # open browser
|
||||
"${main}+t" = "exec ${terminal}"; # open terminal
|
||||
"${main}+r" = "exec ${browser}"; # open browser
|
||||
|
||||
# move focus
|
||||
"${main}+h" = "focus left";
|
||||
"${main}+j" = "focus down";
|
||||
"${main}+k" = "focus up";
|
||||
"${main}+l" = "focus right";
|
||||
# move focus
|
||||
"${main}+h" = "focus left";
|
||||
"${main}+j" = "focus down";
|
||||
"${main}+k" = "focus up";
|
||||
"${main}+l" = "focus right";
|
||||
|
||||
# move focused window
|
||||
"${main}+Alt+h" = "move left";
|
||||
"${main}+Alt+j" = "move down";
|
||||
"${main}+Alt+k" = "move up";
|
||||
"${main}+Alt+l" = "move right";
|
||||
};
|
||||
# move focused window
|
||||
"${main}+Alt+h" = "move left";
|
||||
"${main}+Alt+j" = "move down";
|
||||
"${main}+Alt+k" = "move up";
|
||||
"${main}+Alt+l" = "move right";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
|
@ -117,7 +116,7 @@
|
|||
|
||||
users.users.foxora = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ];
|
||||
extraGroups = ["wheel"];
|
||||
|
||||
packages = with pkgs; [
|
||||
tree
|
||||
|
|
|
|||
|
|
@ -1,32 +1,35 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ahci" "ehci_pci" "megaraid_sas" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["ahci" "ehci_pci" "megaraid_sas" "usb_storage" "usbhid" "sd_mod" "sr_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/7f22e35f-7536-49c4-9c04-88874e87f266";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/7f22e35f-7536-49c4-9c04-88874e87f266";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/0213-F9A0";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/0213-F9A0";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0077" "dmask=0077"];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/0d04172b-aed8-42ea-9cb8-e5dcbf960200"; }
|
||||
];
|
||||
swapDevices = [
|
||||
{device = "/dev/disk/by-uuid/0d04172b-aed8-42ea-9cb8-e5dcbf960200";}
|
||||
];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
|
@ -57,7 +56,7 @@
|
|||
|
||||
users.users.foxora = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ];
|
||||
extraGroups = ["wheel"];
|
||||
|
||||
packages = with pkgs; [
|
||||
tree
|
||||
|
|
@ -91,4 +90,3 @@
|
|||
|
||||
system.stateVersion = "25.11";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,32 +1,35 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "megaraid_sas" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "megaraid_sas" "usb_storage" "usbhid" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/1bc53888-6db8-46df-aa28-975b710c5de8";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/1bc53888-6db8-46df-aa28-975b710c5de8";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/12CE-A600";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/12CE-A600";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0077" "dmask=0077"];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/60643004-6916-46b3-8655-66fdc28cf5ad"; }
|
||||
];
|
||||
swapDevices = [
|
||||
{device = "/dev/disk/by-uuid/60643004-6916-46b3-8655-66fdc28cf5ad";}
|
||||
];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
|
|
|||
|
|
@ -3,8 +3,7 @@
|
|||
root,
|
||||
upkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
|
||||
|
|
@ -13,7 +12,7 @@
|
|||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
boot = rec {
|
||||
initrd.kernelModules = [ "amdgpu" ];
|
||||
initrd.kernelModules = ["amdgpu"];
|
||||
|
||||
loader = {
|
||||
systemd-boot.enable = true;
|
||||
|
|
@ -23,8 +22,8 @@
|
|||
kernelPackages = upkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v4;
|
||||
# TODO: idk make this a toggle or smth idfk
|
||||
# kernelPackages = upkgs.linuxPackages_latest;
|
||||
kernelModules = [ "v4l2loopback" ];
|
||||
extraModulePackages = with kernelPackages; [ v4l2loopback ];
|
||||
kernelModules = ["v4l2loopback"];
|
||||
extraModulePackages = with kernelPackages; [v4l2loopback];
|
||||
|
||||
# qemu
|
||||
# binfmt.emulatedSystems = [
|
||||
|
|
@ -99,7 +98,7 @@
|
|||
];
|
||||
|
||||
config.common = {
|
||||
"org.freedesktop.impl.portal.FileChooser" = [ "termfilechooser" ];
|
||||
"org.freedesktop.impl.portal.FileChooser" = ["termfilechooser"];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -214,10 +213,9 @@
|
|||
};
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules =
|
||||
let
|
||||
imagePath = root + "/homes/aurora/profile.png";
|
||||
in
|
||||
systemd.tmpfiles.rules = let
|
||||
imagePath = root + "/homes/aurora/profile.png";
|
||||
in
|
||||
lib.mkIf (builtins.pathExists imagePath) [
|
||||
"L /var/lib/AccountsService/icons/aurora - - - - ${imagePath}"
|
||||
];
|
||||
|
|
|
|||
205
snow.nix
205
snow.nix
|
|
@ -1,136 +1,135 @@
|
|||
{ cerulean, ... }@inputs:
|
||||
{cerulean, ...} @ inputs:
|
||||
cerulean.mkNexus ./. (self: {
|
||||
nexus = {
|
||||
args = { inherit inputs; };
|
||||
args = {inherit inputs;};
|
||||
|
||||
modules = with inputs; [ ];
|
||||
modules = with inputs; [];
|
||||
|
||||
base = inputs.nixpkgs;
|
||||
homeManager = inputs.home-manager;
|
||||
|
||||
groups = {
|
||||
servers = { };
|
||||
servers = {};
|
||||
};
|
||||
|
||||
nodes =
|
||||
let
|
||||
inherit (self.nexus)
|
||||
groups
|
||||
;
|
||||
in
|
||||
{
|
||||
nixarawrui = {
|
||||
system = "x86_64-linux";
|
||||
nodes = let
|
||||
inherit
|
||||
(self.nexus)
|
||||
groups
|
||||
;
|
||||
in {
|
||||
nixarawrui = {
|
||||
system = "x86_64-linux";
|
||||
|
||||
base = inputs.nixpkgs-unstable;
|
||||
homeManager = inputs.home-manager-unstable;
|
||||
base = inputs.nixpkgs-unstable;
|
||||
homeManager = inputs.home-manager-unstable;
|
||||
|
||||
modules = with inputs; [
|
||||
sddm-silent.nixosModules.default
|
||||
inputs.mango.nixosModules.mango
|
||||
];
|
||||
};
|
||||
modules = with inputs; [
|
||||
sddm-silent.nixosModules.default
|
||||
inputs.mango.nixosModules.mango
|
||||
];
|
||||
};
|
||||
|
||||
arcturus = {
|
||||
system = "x86_64-linux";
|
||||
arcturus = {
|
||||
system = "x86_64-linux";
|
||||
|
||||
groups = [
|
||||
groups.servers
|
||||
];
|
||||
groups = [
|
||||
groups.servers
|
||||
];
|
||||
|
||||
modules = with inputs; [
|
||||
microvm.nixosModules.host
|
||||
modules = with inputs; [
|
||||
microvm.nixosModules.host
|
||||
|
||||
{
|
||||
microvm.vms = {
|
||||
home-assistant = {
|
||||
autostart = true;
|
||||
{
|
||||
microvm.vms = {
|
||||
home-assistant = {
|
||||
autostart = true;
|
||||
|
||||
config = {
|
||||
imports = [ ./vms/home-assistant/default.nix ];
|
||||
config = {
|
||||
imports = [./vms/home-assistant/default.nix];
|
||||
|
||||
networking.hostName = "home-assistant";
|
||||
networking.hostName = "home-assistant";
|
||||
|
||||
boot.kernelParams = [
|
||||
"console=ttyS0"
|
||||
"console=ttyS1"
|
||||
"8250.nr_uarts=2"
|
||||
boot.kernelParams = [
|
||||
"console=ttyS0"
|
||||
"console=ttyS1"
|
||||
"8250.nr_uarts=2"
|
||||
];
|
||||
systemd.services."serial-getty@ttyS1".enable = true;
|
||||
|
||||
microvm = {
|
||||
hypervisor = "qemu";
|
||||
|
||||
# needed to get interface working
|
||||
qemu.extraArgs = [
|
||||
"-monitor"
|
||||
"unix:/var/lib/microvms/home-assistant/monitor.sock,server,nowait"
|
||||
"-chardev"
|
||||
"socket,id=serial1,path=/var/lib/microvms/home-assistant/serial.sock,server=on,wait=off"
|
||||
"-serial"
|
||||
"chardev:serial1"
|
||||
];
|
||||
systemd.services."serial-getty@ttyS1".enable = true;
|
||||
|
||||
microvm = {
|
||||
hypervisor = "qemu";
|
||||
# memory cannot be 2GB so i doubled it and used 4GB:
|
||||
# https://github.com/microvm-nix/microvm.nix/issues/171
|
||||
# TODO: can be fixed by turning off acpi in qemu
|
||||
mem = 4096; # 4GB
|
||||
vcpu = 2;
|
||||
|
||||
# needed to get interface working
|
||||
qemu.extraArgs = [
|
||||
"-monitor"
|
||||
"unix:/var/lib/microvms/home-assistant/monitor.sock,server,nowait"
|
||||
"-chardev"
|
||||
"socket,id=serial1,path=/var/lib/microvms/home-assistant/serial.sock,server=on,wait=off"
|
||||
"-serial"
|
||||
"chardev:serial1"
|
||||
];
|
||||
interfaces = [
|
||||
{
|
||||
type = "tap";
|
||||
id = "vm-hass";
|
||||
mac = "0a:00:a0:70:01:01";
|
||||
}
|
||||
];
|
||||
|
||||
# memory cannot be 2GB so i doubled it and used 4GB:
|
||||
# https://github.com/microvm-nix/microvm.nix/issues/171
|
||||
# TODO: can be fixed by turning off acpi in qemu
|
||||
mem = 4096; # 4GB
|
||||
vcpu = 2;
|
||||
volumes = [
|
||||
#{
|
||||
#image = "/var/lib/microvms/home-assistant/data.img";
|
||||
#mountPoint = "/var/lib/hass";
|
||||
#autoCreate = false;
|
||||
#}
|
||||
];
|
||||
};
|
||||
|
||||
interfaces = [
|
||||
{
|
||||
type = "tap";
|
||||
id = "vm-hass";
|
||||
mac = "0a:00:a0:70:01:01";
|
||||
}
|
||||
];
|
||||
|
||||
volumes = [
|
||||
#{
|
||||
#image = "/var/lib/microvms/home-assistant/data.img";
|
||||
#mountPoint = "/var/lib/hass";
|
||||
#autoCreate = false;
|
||||
#}
|
||||
];
|
||||
};
|
||||
|
||||
systemd.network.enable = true;
|
||||
systemd.network.networks."20-lan" = {
|
||||
matchConfig.Type = "ether";
|
||||
networkConfig = {
|
||||
Address = [ "10.16.1.127/24" ];
|
||||
Gateway = "10.16.1.1";
|
||||
DNS = [ "10.16.1.1" ];
|
||||
IPv6AcceptRA = true;
|
||||
DHCP = "yes";
|
||||
};
|
||||
systemd.network.enable = true;
|
||||
systemd.network.networks."20-lan" = {
|
||||
matchConfig.Type = "ether";
|
||||
networkConfig = {
|
||||
Address = ["10.16.1.127/24"];
|
||||
Gateway = "10.16.1.1";
|
||||
DNS = ["10.16.1.1"];
|
||||
IPv6AcceptRA = true;
|
||||
DHCP = "yes";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
deploy.ssh = {
|
||||
host = "10.16.1.163";
|
||||
port = 2222;
|
||||
user = "foxora";
|
||||
};
|
||||
};
|
||||
|
||||
lyra = {
|
||||
system = "x86_64-linux";
|
||||
|
||||
groups = [
|
||||
groups.servers
|
||||
];
|
||||
|
||||
deploy.ssh = {
|
||||
host = "10.16.1.58";
|
||||
port = 2222;
|
||||
user = "foxora";
|
||||
};
|
||||
deploy.ssh = {
|
||||
host = "10.16.1.163";
|
||||
port = 2222;
|
||||
user = "foxora";
|
||||
};
|
||||
};
|
||||
|
||||
lyra = {
|
||||
system = "x86_64-linux";
|
||||
|
||||
groups = [
|
||||
groups.servers
|
||||
];
|
||||
|
||||
deploy.ssh = {
|
||||
host = "10.16.1.58";
|
||||
port = 2222;
|
||||
user = "foxora";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
services.home-assistant = {
|
||||
enable = true;
|
||||
configDir = "/var/lib/hass/hass";
|
||||
|
|
@ -21,28 +20,29 @@
|
|||
"mobile_app"
|
||||
];
|
||||
|
||||
extraPackages = python3Packages: with python3Packages; [
|
||||
getmac
|
||||
aiohue
|
||||
numpy
|
||||
aiodhcpwatcher
|
||||
async-upnp-client
|
||||
gtts
|
||||
numpy
|
||||
plexapi
|
||||
pyipp
|
||||
paho-mqtt
|
||||
pyturbojpeg
|
||||
];
|
||||
extraPackages = python3Packages:
|
||||
with python3Packages; [
|
||||
getmac
|
||||
aiohue
|
||||
numpy
|
||||
aiodhcpwatcher
|
||||
async-upnp-client
|
||||
gtts
|
||||
numpy
|
||||
plexapi
|
||||
pyipp
|
||||
paho-mqtt
|
||||
pyturbojpeg
|
||||
];
|
||||
};
|
||||
|
||||
# configures the config directory to be mounted
|
||||
# correctly with the right permissions
|
||||
systemd.services.hass-permissions = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "var-lib-hass.mount" ];
|
||||
requires = [ "var-lib-hass.mount" ];
|
||||
before = [ "home-assistant.service" ];
|
||||
wantedBy = ["multi-user.target"];
|
||||
after = ["var-lib-hass.mount"];
|
||||
requires = ["var-lib-hass.mount"];
|
||||
before = ["home-assistant.service"];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = "${pkgs.bash}/bin/bash -c 'mkdir -p /var/lib/hass/hass && chown hass:hass /var/lib/hass/hass'";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue