Formatting

This commit is contained in:
Thomas Avé 2024-06-13 11:53:29 +02:00
parent d14db5a303
commit 9b4bd8fcc1
17 changed files with 438 additions and 425 deletions

View File

@ -107,5 +107,6 @@
Kell = { user = "user"; }; Kell = { user = "user"; };
Aloria = { user = "user"; }; Aloria = { user = "user"; };
}; };
in { nixosConfigurations = nixpkgs.lib.mapAttrs mkSystem systems; }; in
{ nixosConfigurations = nixpkgs.lib.mapAttrs mkSystem systems; };
} }

View File

@ -1,7 +1,7 @@
{ inputs, config, pkgs, ... }: { inputs, config, pkgs, ... }:
let let
scripts = { scripts = {
disk_check = import ./utils/disk_check.nix {inherit pkgs;}; disk_check = import ./utils/disk_check.nix { inherit pkgs; };
vdirsyncer = { vdirsyncer = {
when = "*:0/15"; when = "*:0/15";
script = toString (pkgs.writeShellScript "script" '' script = toString (pkgs.writeShellScript "script" ''
@ -49,7 +49,8 @@ let
''); '');
}; };
}; };
in { in
{
home.username = "server"; home.username = "server";
home.homeDirectory = "/home/server"; home.homeDirectory = "/home/server";
nix = { nix = {
@ -61,7 +62,7 @@ in {
imports = [ imports = [
(import ./utils/common.nix { inherit inputs config pkgs; }) (import ./utils/common.nix { inherit inputs config pkgs; })
(import ./utils/services.nix { inherit pkgs; scripts=scripts; }) (import ./utils/services.nix { inherit pkgs; scripts = scripts; })
./ssh ./ssh
]; ];
programs.ssh.matchBlocks."*".identityFile = "/home/server/.secrets/SSH/Mallorea/id_ed25519"; programs.ssh.matchBlocks."*".identityFile = "/home/server/.secrets/SSH/Mallorea/id_ed25519";

View File

@ -47,7 +47,8 @@ let
''); '');
}; };
}; };
in { in
{
home.username = "server"; home.username = "server";
home.homeDirectory = "/home/server"; home.homeDirectory = "/home/server";
nix = { nix = {
@ -58,7 +59,7 @@ in {
xdg.enable = true; xdg.enable = true;
imports = [ imports = [
(import ./common.nix { inherit inputs config pkgs; }) (import ./common.nix { inherit inputs config pkgs; })
(import ./utils/services.nix { inherit pkgs; scripts=scripts; }) (import ./utils/services.nix { inherit pkgs; scripts = scripts; })
./ssh ./ssh
]; ];

View File

@ -4,7 +4,8 @@ let
Value = false; Value = false;
Status = "locked"; Status = "locked";
}; };
in { in
{
programs.firefox = { programs.firefox = {
enable = true; enable = true;
package = pkgs.wrapFirefox pkgs.firefox-unwrapped { package = pkgs.wrapFirefox pkgs.firefox-unwrapped {

View File

@ -20,7 +20,7 @@ let
''; '';
workspace_command_prefix = "split-"; workspace_command_prefix = "split-";
hyprland_plugins = [inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces]; hyprland_plugins = [ inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces ];
# Disable split-monitor-workspaces # Disable split-monitor-workspaces
# workspace_command_prefix = ""; # workspace_command_prefix = "";
@ -61,7 +61,8 @@ let
fi fi
fi fi
''; '';
in { in
{
services.kdeconnect = { services.kdeconnect = {
enable = true; enable = true;
package = pkgs.kdePackages.kdeconnect-kde; package = pkgs.kdePackages.kdeconnect-kde;
@ -132,7 +133,7 @@ in {
systemd.enableXdgAutostart = true; systemd.enableXdgAutostart = true;
xwayland.enable = true; xwayland.enable = true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland; package = inputs.hyprland.packages.${pkgs.system}.hyprland;
plugins = [] ++ hyprland_plugins; plugins = [ ] ++ hyprland_plugins;
settings = { settings = {
"$mainMod" = "SUPER"; "$mainMod" = "SUPER";
exec-once = [ exec-once = [
@ -266,10 +267,12 @@ in {
] ++ ( ] ++ (
# workspaces # workspaces
# binds $mod + [shift +] {1..10} to [move to] workspace {1..10} # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
builtins.concatLists (builtins.genList (x: builtins.concatLists (builtins.genList
(x:
let let
ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10)); ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
in [ in
[
"$mainMod, ${ws}, ${workspace_command_prefix}workspace, ${toString (x + 1)}" "$mainMod, ${ws}, ${workspace_command_prefix}workspace, ${toString (x + 1)}"
"$mainMod SHIFT, ${ws}, ${workspace_command_prefix}movetoworkspace, ${toString (x + 1)}" "$mainMod SHIFT, ${ws}, ${workspace_command_prefix}movetoworkspace, ${toString (x + 1)}"
]) 10)); ]) 10));

View File

@ -12,7 +12,8 @@
kb-cancel = "Super_L+XF86Launch5,Escape"; kb-cancel = "Super_L+XF86Launch5,Escape";
combi-hide-mode-prefix = true; combi-hide-mode-prefix = true;
}; };
theme = let inherit (config.lib.formats.rasi) mkLiteral; theme =
let inherit (config.lib.formats.rasi) mkLiteral;
in { in {
"*" = { "*" = {
background = mkLiteral "#0f111a"; background = mkLiteral "#0f111a";

View File

@ -13,7 +13,8 @@ let
}; };
}; };
in { in
{
programs.tmux = { programs.tmux = {
shell = "${pkgs.zsh}/bin/zsh"; shell = "${pkgs.zsh}/bin/zsh";
terminal = "screen-256color"; terminal = "screen-256color";

View File

@ -1,4 +1,4 @@
{pkgs}: { pkgs }:
{ {
when = "*-*-* *:00:00"; when = "*-*-* *:00:00";
script = toString (pkgs.writeShellScript "script" '' script = toString (pkgs.writeShellScript "script" ''

View File

@ -1,6 +1,7 @@
{ pkgs, scripts }: { pkgs, scripts }:
let let
notify_script = (pkgs.writers.writePython3Bin "telegram-notify.py" { notify_script = (pkgs.writers.writePython3Bin "telegram-notify.py"
{
libraries = [ pkgs.python3Packages.python-telegram-bot ]; libraries = [ pkgs.python3Packages.python-telegram-bot ];
} '' } ''
import telegram import telegram

View File

@ -5,7 +5,8 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ];
@ -14,12 +15,14 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/e34f26e4-2f68-4f9c-ab7d-836b4f4b9f74"; {
device = "/dev/disk/by-uuid/e34f26e4-2f68-4f9c-ab7d-836b4f4b9f74";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/90D9-F457"; {
device = "/dev/disk/by-uuid/90D9-F457";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [ "fmask=0077" "dmask=0077" ];
}; };

View File

@ -82,10 +82,10 @@
}; };
}; };
# Calendar # Calendar
# Add the server using gnome-online-accounts: # Add the server using gnome-online-accounts:
# nix-shell -p gnome.gnome-control-center --run "gnome-control-center" # nix-shell -p gnome.gnome-control-center --run "gnome-control-center"
# Just add the main webdav server and gnome-calendar will automatically pick up all available calendars. # Just add the main webdav server and gnome-calendar will automatically pick up all available calendars.
programs.dconf.enable = true; programs.dconf.enable = true;
services.gnome.evolution-data-server.enable = true; services.gnome.evolution-data-server.enable = true;
services.gnome.gnome-online-accounts.enable = true; services.gnome.gnome-online-accounts.enable = true;

View File

@ -1,8 +1,8 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = [ "nvidia" ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Cuda # Cuda
pciutils pciutils
file file
gnumake gnumake