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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -5,7 +5,8 @@
{
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" ];
@ -14,12 +15,14 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/e34f26e4-2f68-4f9c-ab7d-836b4f4b9f74";
{
device = "/dev/disk/by-uuid/e34f26e4-2f68-4f9c-ab7d-836b4f4b9f74";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/90D9-F457";
{
device = "/dev/disk/by-uuid/90D9-F457";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};

View File

@ -82,10 +82,10 @@
};
};
# Calendar
# Add the server using gnome-online-accounts:
# 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.
# Calendar
# Add the server using gnome-online-accounts:
# 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.
programs.dconf.enable = true;
services.gnome.evolution-data-server.enable = true;
services.gnome.gnome-online-accounts.enable = true;

View File

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