nixfmt
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
{ config, pkgs, ... }:
|
||||
let
|
||||
kernel = pkgs.linuxPackages_cachyos;
|
||||
pkgsVersion = pkgs; #.unstable;
|
||||
pkgsVersion = pkgs; # .unstable;
|
||||
in
|
||||
{
|
||||
# Configure bootloader with lanzaboot and secureboot
|
||||
@@ -12,7 +12,7 @@ in
|
||||
"i2c-dev"
|
||||
"ddcci_backlight"
|
||||
];
|
||||
extraModulePackages = [config.boot.kernelPackages.ddcci-driver];
|
||||
extraModulePackages = [ config.boot.kernelPackages.ddcci-driver ];
|
||||
loader = {
|
||||
efi = {
|
||||
canTouchEfiVariables = true;
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
...
|
||||
}:
|
||||
let
|
||||
pkgsVersion = pkgs; #.unstable;
|
||||
pkgsVersion = pkgs; # .unstable;
|
||||
environmentVariables = {
|
||||
STEAM_FORCE_DESKTOPUI_SCALING = "1.0";
|
||||
GDK_SCALE = "1";
|
||||
|
||||
@@ -1,22 +1,23 @@
|
||||
{ # Snowfall Lib provides a customized `lib` instance with access to your flake's library
|
||||
# as well as the libraries available from your flake's inputs.
|
||||
# lib,
|
||||
# # An instance of `pkgs` with your overlays and packages applied is also available.
|
||||
# pkgs,
|
||||
# # You also have access to your flake's inputs.
|
||||
# inputs,
|
||||
# Snowfall Lib provides a customized `lib` instance with access to your flake's library
|
||||
{
|
||||
# as well as the libraries available from your flake's inputs.
|
||||
# lib,
|
||||
# # An instance of `pkgs` with your overlays and packages applied is also available.
|
||||
# pkgs,
|
||||
# # You also have access to your flake's inputs.
|
||||
# inputs,
|
||||
|
||||
# Additional metadata is provided by Snowfall Lib.
|
||||
namespace, # The namespace used for your flake, defaulting to "internal" if not set.
|
||||
# system, # The system architecture for this host (eg. `x86_64-linux`).
|
||||
# target, # The Snowfall Lib target for this system (eg. `x86_64-iso`).
|
||||
# format, # A normalized name for the system target (eg. `iso`).
|
||||
# virtual, # A boolean to determine whether this system is a virtual target using nixos-generators.
|
||||
# systems, # An attribute map of your defined hosts.
|
||||
# Additional metadata is provided by Snowfall Lib.
|
||||
namespace, # The namespace used for your flake, defaulting to "internal" if not set.
|
||||
# system, # The system architecture for this host (eg. `x86_64-linux`).
|
||||
# target, # The Snowfall Lib target for this system (eg. `x86_64-iso`).
|
||||
# format, # A normalized name for the system target (eg. `iso`).
|
||||
# virtual, # A boolean to determine whether this system is a virtual target using nixos-generators.
|
||||
# systems, # An attribute map of your defined hosts.
|
||||
|
||||
# All other arguments come from the system system.
|
||||
config,
|
||||
...
|
||||
# All other arguments come from the system system.
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
passwordFile = config.sops.secrets."desktop/matt_password".path;
|
||||
@@ -31,7 +32,6 @@ in
|
||||
./nix.nix
|
||||
./sops.nix
|
||||
|
||||
|
||||
./specialisations/hyprland
|
||||
];
|
||||
|
||||
@@ -45,4 +45,4 @@ in
|
||||
passwordFile = passwordFile;
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,10 +13,10 @@ let
|
||||
];
|
||||
defaultLocalOptions = [
|
||||
"compress=zstd"
|
||||
# "autodefrag"
|
||||
# "autodefrag"
|
||||
"nofail"
|
||||
# "x-systemd.automount"
|
||||
# "auto"
|
||||
# "x-systemd.automount"
|
||||
# "auto"
|
||||
"rw"
|
||||
];
|
||||
in
|
||||
|
||||
@@ -12,7 +12,7 @@ let
|
||||
"compress=zstd"
|
||||
"autodefrag"
|
||||
];
|
||||
in
|
||||
in
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
|
||||
@@ -43,4 +43,4 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,8 +26,13 @@ in
|
||||
system = "x86_64-linux";
|
||||
maxJobs = 10;
|
||||
sshUser = "admin";
|
||||
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
|
||||
supportedFeatures = [
|
||||
"nixos-test"
|
||||
"benchmark"
|
||||
"big-parallel"
|
||||
"kvm"
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,4 +10,4 @@
|
||||
"/home"
|
||||
];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
"`" = "A-f6";
|
||||
|
||||
# App shortcuts
|
||||
c = "C-insert"; # Copy
|
||||
v = "S-insert"; # Paste
|
||||
x = "S-delete"; # Cut
|
||||
c = "C-insert"; # Copy
|
||||
v = "S-insert"; # Paste
|
||||
x = "S-delete"; # Cut
|
||||
|
||||
"1" = "A-1";
|
||||
"2" = "A-2";
|
||||
@@ -46,4 +46,4 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
services.ratbagd.enable = lib.mkDefault true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,4 +50,4 @@
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -129,7 +129,7 @@ in
|
||||
RESTIC_REST_USER=${config.sops.placeholder."desktop/restic/user"}
|
||||
RESTIC_REST_PASSWORD=${config.sops.placeholder."desktop/restic/password"}
|
||||
'';
|
||||
restartUnits = [
|
||||
restartUnits = [
|
||||
"restic-backups-jallen-nas.service"
|
||||
"restic-backups-proton-drive.service"
|
||||
];
|
||||
|
||||
@@ -31,7 +31,7 @@ in
|
||||
"${displayLeft.input},${displayLeft.resolution}@${displayLeft.refreshRate},0x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
|
||||
"${displayRight.input},${displayRight.resolution}@${displayRight.refreshRate},3840x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.5,sdrsaturation,0.98"
|
||||
];
|
||||
|
||||
|
||||
workspace = [
|
||||
"name:firefox, monitor:${displayRight.input}, default:false, special, class:(.*firefox.*)"
|
||||
"name:discord, monitor:${displayRight.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
|
||||
|
||||
@@ -6,7 +6,7 @@ let
|
||||
in
|
||||
{
|
||||
mjallen = {
|
||||
desktop.hyprland = {
|
||||
desktop.hyprland = {
|
||||
enable = true;
|
||||
defaultApps = {
|
||||
browser = pkgs.firefox;
|
||||
@@ -60,7 +60,7 @@ in
|
||||
tooltip = false;
|
||||
exec = "waybar-hass --get_light light.living_room_lights";
|
||||
interval = "once";
|
||||
format = "{text}";#"";
|
||||
format = "{text}"; # "";
|
||||
on-click = "waybar-hass --toggle_light light.living_room_lights";
|
||||
return-type = "json";
|
||||
};
|
||||
@@ -83,4 +83,4 @@ in
|
||||
wofi.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,14 @@
|
||||
{ config, namespace, lib, ... }:
|
||||
{
|
||||
config,
|
||||
namespace,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
passwordFile = config.sops.secrets."desktop/matt_password".path;
|
||||
in
|
||||
in
|
||||
{
|
||||
${namespace}.user = {
|
||||
passwordFile = lib.mkForce passwordFile;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, pkgs, ... }:
|
||||
let
|
||||
let
|
||||
fixWifiScript = pkgs.writeScriptBin "fix-wifi" ''
|
||||
#!/usr/bin/env python3
|
||||
|
||||
@@ -75,7 +75,7 @@ let
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
'';
|
||||
pkgsVersion = pkgs; #.unstable;
|
||||
pkgsVersion = pkgs; # .unstable;
|
||||
in
|
||||
{
|
||||
systemd = {
|
||||
@@ -98,4 +98,4 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user