starred/Foundry
1
0
Fork 0
mirror of https://github.com/Misterio77/Foundry.git synced 2026-08-24 02:14:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

nixfmt

Browse Source
This commit is contained in:
Gabriel Fontes
2021-08-19 11:51:48 -03:00
parent 409bac66cc
commit 68d2a7e5e1
11 changed files with 344 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
colors.nix
+237 -216
View File
File diff suppressed because it is too large Load Diff
flake.nix
+27 -30
View File
@@ -10,37 +10,34 @@
impermanence.url = "github:RiscadoA/impermanence";
};
outputs = { self, home-manager, nixpkgs, hardware, impermanence }:
{
overlay = import ./overlays;
nixosConfigurations = let
# For a list of users, get their configuration (./users/name),
# plus their home-manager configuration (./users/name/home)
users = users:
nixpkgs.lib.forEach users (user: (./users + "/${user}")) ++ [
home-manager.nixosModules.home-manager
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
sharedModules = [ impermanence.nixosModules.impermanence-home ];
users = builtins.listToAttrs (nixpkgs.lib.forEach users (user: {
name = "${user}";
value = (./users + "/${user}" + /home);
}));
};
}
];
in {
# Hosts
thanatos = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit hardware nixpkgs impermanence; };
modules = [
./hosts/thanatos
] ++ users [ "misterio" ];
};
outputs = { self, home-manager, nixpkgs, hardware, impermanence }: {
overlay = import ./overlays;
nixosConfigurations = let
# For a list of users, get their configuration (./users/name),
# plus their home-manager configuration (./users/name/home)
users = users:
nixpkgs.lib.forEach users (user: (./users + "/${user}")) ++ [
home-manager.nixosModules.home-manager
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
sharedModules = [ impermanence.nixosModules.impermanence-home ];
users = builtins.listToAttrs (nixpkgs.lib.forEach users (user: {
name = "${user}";
value = (./users + "/${user}" + /home);
}));
};
}
];
in {
# Hosts
thanatos = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit hardware nixpkgs impermanence; };
modules = [ ./hosts/thanatos ] ++ users [ "misterio" ];
};
};
};
}
hosts/thanatos/default.nix
+3 -9
View File
@@ -14,12 +14,8 @@
fileSystems."/data".neededForBoot = true;
environment.persistence."/data" = {
directories = [
"/var/log"
"/var/lib/docker"
"/var/lib/systemd"
"/var/lib/postgresql"
];
directories =
[ "/var/log" "/var/lib/docker" "/var/lib/systemd" "/var/lib/postgresql" ];
};
system.stateVersion = "21.11";
@@ -41,9 +37,7 @@
networking = {
hostName = "thanatos";
networkmanager.enable = true;
firewall = {
allowedTCPPorts = [ 25565 51820 ];
};
firewall = { allowedTCPPorts = [ 25565 51820 ]; };
wg-quick.interfaces = {
# wg0 = import ./wg0.nix;
};
modules/colorscheme.nix
+4 -1
View File
@@ -26,7 +26,10 @@ in {
};
kind = mkOption {
type = types.enum [ "dark" "light" ];
default = if builtins.substring 0 1 cfg.colors.base00 < "5" then "dark" else "light";
default = if builtins.substring 0 1 cfg.colors.base00 < "5" then
"dark"
else
"light";
description = ''
Whether the scheme is dark or light
'';
modules/rgbdaemon.nix
+3 -1
View File
@@ -116,7 +116,9 @@ in {
DAEMON_INTERVAL=${lib.strings.floatToString cfg.interval}
KEYBOARD_DEVICE=${cfg.keyboard.device}
MOUSE_DEVICE=${cfg.mouse.device}
KEYBOARD_HIGHLIGHTED=${lib.concatStringsSep "," cfg.keyboard.highlighted}
KEYBOARD_HIGHLIGHTED=${
lib.concatStringsSep "," cfg.keyboard.highlighted
}
MOUSE_HIGHLIGHTED=${lib.concatStringsSep "," cfg.mouse.highlighted}
COLOR_BACKGROUND=${cfg.colors.background}
COLOR_FOREGROUND=${cfg.colors.foreground}
users/misterio/home/default.nix
+23 -27
View File
@@ -1,7 +1,6 @@
{ pkgs, ... }:
let
colors = import ../../../colors.nix;
let colors = import ../../../colors.nix;
in {
imports = [
../../../modules/colorscheme.nix
@@ -30,7 +29,7 @@ in {
./zathura.nix
];
colorscheme = colors.${ import ./current-scheme.nix };
colorscheme = colors.${import ./current-scheme.nix};
wallpaper.generate = true;
home.packages = with pkgs; [
@@ -60,28 +59,25 @@ in {
# Writable (persistent) data
home.persistence."/data/home/misterio" = {
directories = [
"Documents"
"Downloads"
"Games"
"Pictures"
".gnupg"
".cache/nix-index"
".config/Hero_Siege"
".config/kdeconnect"
".config/lutris"
".local/share/Steam"
".local/share/Tabletop Simulator"
".local/share/direnv"
".local/share/lutris"
".local/share/multimc"
".local/share/osu"
".local/share/password-store"
];
files = [
".steam/steam.token"
".steam/registry.vdf"
];
allowOther = true;
};
directories = [
"Documents"
"Downloads"
"Games"
"Pictures"
".gnupg"
".cache/nix-index"
".config/Hero_Siege"
".config/kdeconnect"
".config/lutris"
".local/share/Steam"
".local/share/Tabletop Simulator"
".local/share/direnv"
".local/share/lutris"
".local/share/multimc"
".local/share/osu"
".local/share/password-store"
];
files = [ ".steam/steam.token" ".steam/registry.vdf" ];
allowOther = true;
};
}
users/misterio/home/fish.nix
+39 -44
View File
@@ -12,50 +12,45 @@
m = "neomutt";
mutt = "neomutt";
};
shellAliases = {
getip = "curl ifconfig.me";
};
functions = {
fish_greeting = "${pkgs.fortune}/bin/fortune -s";
};
shellAliases = { getip = "curl ifconfig.me"; };
functions = { fish_greeting = "${pkgs.fortune}/bin/fortune -s"; };
interactiveShellInit =
# Use vim bindings and cursors
''
fish_vi_key_bindings
set fish_cursor_default block blink
set fish_cursor_insert line blink
set fish_cursor_replace_one underscore blink
set fish_cursor_visual block
''
+
# Use terminal colors
''
set -U fish_color_autosuggestion brblack
set -U fish_color_cancel -r
set -U fish_color_command brgreen
set -U fish_color_comment brmagenta
set -U fish_color_cwd green
set -U fish_color_cwd_root red
set -U fish_color_end brmagenta
set -U fish_color_error brred
set -U fish_color_escape brcyan
set -U fish_color_history_current --bold
set -U fish_color_host normal
set -U fish_color_match --background=brblue
set -U fish_color_normal normal
set -U fish_color_operator cyan
set -U fish_color_param brblue
set -U fish_color_quote yellow
set -U fish_color_redirection bryellow
set -U fish_color_search_match 'bryellow' '--background=brblack'
set -U fish_color_selection 'white' '--bold' '--background=brblack'
set -U fish_color_status red
set -U fish_color_user brgreen
set -U fish_color_valid_path --underline
set -U fish_pager_color_completion normal
set -U fish_pager_color_description yellow
set -U fish_pager_color_prefix 'white' '--bold' '--underline'
set -U fish_pager_color_progress 'brwhite' '--background=cyan'
'';
# Use vim bindings and cursors
''
fish_vi_key_bindings
set fish_cursor_default block blink
set fish_cursor_insert line blink
set fish_cursor_replace_one underscore blink
set fish_cursor_visual block
'' +
# Use terminal colors
''
set -U fish_color_autosuggestion brblack
set -U fish_color_cancel -r
set -U fish_color_command brgreen
set -U fish_color_comment brmagenta
set -U fish_color_cwd green
set -U fish_color_cwd_root red
set -U fish_color_end brmagenta
set -U fish_color_error brred
set -U fish_color_escape brcyan
set -U fish_color_history_current --bold
set -U fish_color_host normal
set -U fish_color_match --background=brblue
set -U fish_color_normal normal
set -U fish_color_operator cyan
set -U fish_color_param brblue
set -U fish_color_quote yellow
set -U fish_color_redirection bryellow
set -U fish_color_search_match 'bryellow' '--background=brblack'
set -U fish_color_selection 'white' '--bold' '--background=brblack'
set -U fish_color_status red
set -U fish_color_user brgreen
set -U fish_color_valid_path --underline
set -U fish_pager_color_completion normal
set -U fish_pager_color_description yellow
set -U fish_pager_color_prefix 'white' '--bold' '--underline'
set -U fish_pager_color_progress 'brwhite' '--background=cyan'
'';
};
}
users/misterio/home/mako.nix
+1 -6
View File
@@ -1,6 +1 @@
{ pkgs, config, ... }:
{
programs.mako = {
enable = true;
};
}
{ pkgs, config, ... }: { programs.mako = { enable = true; }; }
users/misterio/home/nix-index.nix
+1 -5
View File
@@ -1,5 +1 @@
{
programs.nix-index = {
enable = true;
};
}
{ programs.nix-index = { enable = true; }; }
users/misterio/home/sway.nix
+4 -6
View File
@@ -64,10 +64,8 @@ in {
workspace = "2";
}
];
floating.criteria = [
{ app_id = "zenity"; }
{ app_id = "AlacrittyFloating*"; }
];
floating.criteria =
[ { app_id = "zenity"; } { app_id = "AlacrittyFloating*"; } ];
colors = {
focused = {
border = "${colors.base0C}";
@@ -129,7 +127,7 @@ in {
resume 'pgrep -x swaylock && swaymsg "output * dpms on"' \
timeout 620 'swaymsg "output * dpms off"' \
resume 'swaymsg "output * dpms on"'
'';
'';
}
# Start waybar
{
@@ -141,7 +139,7 @@ in {
"${xrandr} --output $(${xrandr} | grep 'XWAYLAND.*2560x1080' | awk '{printf $1}') --primary";
}
];
bars = [];
bars = [ ];
window = {
border = 2;
commands = [{
users/misterio/home/swaylock-command.nix
+2 -1
View File
@@ -1,3 +1,4 @@
{ package, colors }:
''${package}/bin/swaylock --effect-blur 20x3 --fade-in 0.1 --line-uses-inside --font "Fira Sans" --font-size 15 --indicator-idle-visible --indicator-radius 40 --disable-caps-lock-text --indicator-caps-lock --indicator-y-position 1000 --ring-color "#${colors.base02}" --inside-wrong-color "#${colors.base08}" --ring-wrong-color "#${colors.base08}" --key-hl-color "#${colors.base0B}" --bs-hl-color "#${colors.base08}" --ring-ver-color "#${colors.base09}" --inside-ver-color "#${colors.base09}" --inside-color "#${colors.base01}" --text-color "#${colors.base07}" --text-clear-color "#${colors.base01}" --text-ver-color "#${colors.base01}" --text-wrong-color "#${colors.base01}" --text-caps-lock-color "#${colors.base07}" --inside-clear-color "#${colors.base0C}" --ring-clear-color "#${colors.base0C}" --inside-caps-lock-color "#${colors.base09}" --ring-caps-lock-color "#${colors.base02}" --separator-color "#${colors.base02}"''
''
${package}/bin/swaylock --effect-blur 20x3 --fade-in 0.1 --line-uses-inside --font "Fira Sans" --font-size 15 --indicator-idle-visible --indicator-radius 40 --disable-caps-lock-text --indicator-caps-lock --indicator-y-position 1000 --ring-color "#${colors.base02}" --inside-wrong-color "#${colors.base08}" --ring-wrong-color "#${colors.base08}" --key-hl-color "#${colors.base0B}" --bs-hl-color "#${colors.base08}" --ring-ver-color "#${colors.base09}" --inside-ver-color "#${colors.base09}" --inside-color "#${colors.base01}" --text-color "#${colors.base07}" --text-clear-color "#${colors.base01}" --text-ver-color "#${colors.base01}" --text-wrong-color "#${colors.base01}" --text-caps-lock-color "#${colors.base07}" --inside-clear-color "#${colors.base0C}" --ring-clear-color "#${colors.base0C}" --inside-caps-lock-color "#${colors.base09}" --ring-caps-lock-color "#${colors.base02}" --separator-color "#${colors.base02}"''