chore: run fmt

This commit is contained in:
installer
2025-02-06 18:25:39 +01:00
parent 9600761c92
commit 75281a05ea
20 changed files with 380 additions and 272 deletions

104
flake.nix
View File

@@ -14,59 +14,61 @@
};
};
outputs = {
self,
nixpkgs,
disko,
...
}@inputs: let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
in
{
nixosConfigurations = {
arcueid = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit system;
inherit inputs;
outputs =
{
self,
nixpkgs,
disko,
...
}@inputs:
let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
in
{
nixosConfigurations = {
arcueid = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit system;
inherit inputs;
};
modules = [
./modules/nixos/cli-environment.nix
./modules/nixos/desktop-apps.nix
./modules/nixos/dev-environment.nix
./modules/nixos/fonts.nix
./modules/nixos/gaming.nix
./modules/nixos/window-manager.nix
./hosts/home/configuration.nix
inputs.stylix.nixosModules.stylix
inputs.home-manager.nixosModules.default
];
};
work-laptop = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs system; };
modules = [
./modules/nixos/cli-environment.nix
./modules/nixos/dev-environment.nix
./modules/nixos/fonts.nix
./modules/nixos/window-manager.nix
disko.nixosModules.disko
inputs.stylix.nixosModules.stylix
inputs.home-manager.nixosModules.default
./hosts/work/configuration.nix
./hosts/work/hardware-configuration.nix
];
};
modules = [
./modules/nixos/cli-environment.nix
./modules/nixos/desktop-apps.nix
./modules/nixos/dev-environment.nix
./modules/nixos/fonts.nix
./modules/nixos/gaming.nix
./modules/nixos/window-manager.nix
./hosts/home/configuration.nix
inputs.stylix.nixosModules.stylix
inputs.home-manager.nixosModules.default
];
};
work-laptop = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs system;};
modules = [
./modules/nixos/cli-environment.nix
./modules/nixos/dev-environment.nix
./modules/nixos/fonts.nix
./modules/nixos/window-manager.nix
disko.nixosModules.disko
inputs.stylix.nixosModules.stylix
inputs.home-manager.nixosModules.default
./hosts/work/configuration.nix
./hosts/work/hardware-configuration.nix
];
homeConfigurations = {
"xmorel@work-laptop" = inputs.home-manager.lib.homeManagerConfiguration {
pkgs = pkgs;
extraSpecialArgs = { inherit inputs; };
modules = [
./hosts/work/home.nix
];
};
};
# homeManagerModules.default = ./modules/home-manager;
# nixosModules.default = ./modules/nixos;
};
homeConfigurations = {
"xmorel@work-laptop" = inputs.home-manager.lib.homeManagerConfiguration {
pkgs = pkgs;
extraSpecialArgs = {inherit inputs;};
modules = [
./hosts/work/home.nix
];
};
};
# homeManagerModules.default = ./modules/home-manager;
# nixosModules.default = ./modules/nixos;
};
}

View File

@@ -1,11 +1,15 @@
{ config, pkgs, inputs, ... }:
{
config,
pkgs,
inputs,
...
}:
{
imports =
[
./hardware-configuration.nix
inputs.home-manager.nixosModules.default
];
imports = [
./hardware-configuration.nix
inputs.home-manager.nixosModules.default
];
# Bootloader.
boot = {
@@ -22,19 +26,31 @@
fileSystems."/mnt/apps" = {
device = "/dev/disk/by-label/Apps";
fsType = "ntfs-3g";
options = [ "rw" "uid=1000" ];
options = [
"rw"
"uid=1000"
];
};
fileSystems."/mnt/photos" = {
device = "/dev/disk/by-label/Photos";
fsType = "ntfs-3g";
options = [ "rw" "uid=1000" ];
options = [
"rw"
"uid=1000"
];
};
fileSystems."/mnt/ext" = {
device = "/dev/disk/by-label/Externe";
fsType = "ntfs-3g";
options = [ "auto" "nofail" "noatime" "rw" "uid=1000" ];
options = [
"auto"
"nofail"
"noatime"
"rw"
"uid=1000"
];
};
networking.hostName = "arcueid"; # Define your hostname.
@@ -42,13 +58,17 @@
nix = {
settings = {
auto-optimise-store = true;
experimental-features = [ "nix-command" "flakes" ];
experimental-features = [
"nix-command"
"flakes"
];
};
gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 10d";
};
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
};
time.timeZone = "Europe/Paris";
@@ -78,13 +98,17 @@
security = {
rtkit.enable = true;
sudo.extraRules = [{
users = [ "yoru" ];
commands = [{
command = "ALL";
options = [ "NOPASSWD" ];
}];
}];
sudo.extraRules = [
{
users = [ "yoru" ];
commands = [
{
command = "ALL";
options = [ "NOPASSWD" ];
}
];
}
];
};
services = {
@@ -118,9 +142,11 @@
shell = pkgs.fish;
isNormalUser = true;
description = "Yoru";
extraGroups = [ "networkmanager" "wheel" "scanner" "lp"];
packages = with pkgs; [
extraGroups = [
"networkmanager"
"wheel"
"scanner"
"lp"
];
};
home-manager = {

View File

@@ -1,26 +1,41 @@
# 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, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "xhci_pci" "firewire_ohci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
boot.initrd.availableKernelModules = [
"ehci_pci"
"ahci"
"xhci_pci"
"firewire_ohci"
"usb_storage"
"usbhid"
"sd_mod"
"sr_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/78a2cf35-4b53-4277-9742-f3077e7d5b32";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/78a2cf35-4b53-4277-9742-f3077e7d5b32";
fsType = "ext4";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/59dd4af7-bb20-4b88-82fe-97010227bd06"; }
];
swapDevices = [
{ device = "/dev/disk/by-uuid/59dd4af7-bb20-4b88-82fe-97010227bd06"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

View File

@@ -1,4 +1,10 @@
{ config, pkgs, lib, outputs, ... }:
{
config,
pkgs,
lib,
outputs,
...
}:
{
home.username = "yoru";

View File

@@ -52,7 +52,10 @@
nix = {
settings = {
auto-optimise-store = true;
experimental-features = [ "nix-command" "flakes" ];
experimental-features = [
"nix-command"
"flakes"
];
};
# gc = {
# automatic = true;
@@ -78,7 +81,11 @@
xmorel = {
shell = pkgs.fish;
isNormalUser = true;
extraGroups = [ "networkmanager" "wheel" "docker" ];
extraGroups = [
"networkmanager"
"wheel"
"docker"
];
initialPassword = "toto";
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBd3US4tUcbWZQgcVOtZIcbHF5mHwzJzygrQuE/pGde6"
@@ -92,7 +99,7 @@
};
};
home-manager = {
extraSpecialArgs = {inherit inputs;};
extraSpecialArgs = { inherit inputs; };
users = {
"xmorel" = import ./home.nix;
};
@@ -128,8 +135,6 @@
};
};
nixpkgs.config.allowUnfree = true;
system.stateVersion = "24.05";
}

View File

@@ -1,4 +1,4 @@
{ lib, ...}:
{ lib, ... }:
{
disko.devices = {
disk.main = {
@@ -20,7 +20,7 @@
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = ["umask=0077"];
mountOptions = [ "umask=0077" ];
};
};
root = {

View File

@@ -1,14 +1,23 @@
# 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, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" ];
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];

View File

@@ -1,4 +1,10 @@
{ config, pkgs, lib, outputs, ... }:
{
config,
pkgs,
lib,
outputs,
...
}:
{
home.username = "xmorel";

View File

@@ -3,7 +3,8 @@
lib,
config,
...
}: {
}:
{
options = {
myHome.dotfiles.enable = lib.mkEnableOption "enables dotfiles";
};

View File

@@ -2,9 +2,11 @@
lib,
config,
...
}: let
}:
let
cfg = config.myHome.helix;
in {
in
{
options = {
myHome.helix.enable = lib.mkEnableOption "enables helix";
};
@@ -24,21 +26,20 @@ in {
# cursor-line = "warning"
};
# [[language]]
# name = "python"
# language-servers = ["pylsp"]
# [[language]]
# name = "python"
# language-servers = ["pylsp"]
# [language-server.pylsp.config.pylsp]
# plugins.pyls_mypy.enabled = true
# plugins.pyls_mypy.live_mode = true
# [language-server.pylsp.config.pylsp]
# plugins.pyls_mypy.enabled = true
# plugins.pyls_mypy.live_mode = true
# [[language]]
# name = "rust"
# language-servers = ["rust-analyzer"]
# [language-server.rust-analyzer.config]
# check.command = "clippy"
# [[language]]
# name = "rust"
# language-servers = ["rust-analyzer"]
# [language-server.rust-analyzer.config]
# check.command = "clippy"
};
};

View File

@@ -2,9 +2,11 @@
lib,
config,
...
}: let
}:
let
cfg = config.myHome.kitty;
in {
in
{
options = {
myHome.kitty.enable = lib.mkEnableOption "enables kitty";
};

View File

@@ -3,7 +3,8 @@
lib,
config,
...
}: {
}:
{
options = {
myHome.shell.enable = lib.mkEnableOption "enables shell stuff";
};

View File

@@ -3,9 +3,11 @@
lib,
config,
...
}: let
}:
let
betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)";
in {
in
{
options = {
myHome.waybar.enable = lib.mkEnableOption "enables waybar";
};
@@ -56,15 +58,15 @@ in {
format = "{icon}";
format-icons = {
"1" = "";
"2" = "";
"3" = "";
"4" = "";
"5" = "";
"6" = "";
"7" = "";
"8" = "";
"9" = "";
"10" = "";
"2" = "";
"3" = "";
"4" = "";
"5" = "";
"6" = "";
"7" = "";
"8" = "";
"9" = "";
"10" = "";
};
on-scroll-up = "hyprctl dispatch workspace e+1";
on-scroll-down = "hyprctl dispatch workspace e-1";
@@ -195,98 +197,98 @@ in {
tooltip = false;
};
}
];
style = ''
* {
font-family: JetBrainsMono Nerd Font Mono;
font-size: 16px;
border-radius: 0px;
border: none;
min-height: 0px;
}
window#waybar {
background: rgba(0,0,0,0);
}
#workspaces {
color: #${config.stylix.base16Scheme.base00};
background: #${config.stylix.base16Scheme.base01};
margin: 4px 4px;
padding: 5px 5px;
border-radius: 16px;
}
#workspaces button {
font-weight: bold;
padding: 0px 5px;
margin: 0px 3px;
border-radius: 16px;
color: #${config.stylix.base16Scheme.base00};
background: linear-gradient(45deg, #${config.stylix.base16Scheme.base08}, #${config.stylix.base16Scheme.base0D});
opacity: 0.5;
transition: ${betterTransition};
}
#workspaces button.active {
font-weight: bold;
padding: 0px 5px;
margin: 0px 3px;
border-radius: 16px;
color: #${config.stylix.base16Scheme.base00};
background: linear-gradient(45deg, #${config.stylix.base16Scheme.base08}, #${config.stylix.base16Scheme.base0D});
transition: ${betterTransition};
opacity: 1.0;
min-width: 40px;
}
#workspaces button:hover {
font-weight: bold;
border-radius: 16px;
color: #${config.stylix.base16Scheme.base00};
background: linear-gradient(45deg, #${config.stylix.base16Scheme.base08}, #${config.stylix.base16Scheme.base0D});
opacity: 0.8;
transition: ${betterTransition};
}
tooltip {
background: #${config.stylix.base16Scheme.base00};
border: 1px solid #${config.stylix.base16Scheme.base08};
border-radius: 12px;
}
tooltip label {
color: #${config.stylix.base16Scheme.base08};
}
#window, #pulseaudio, #cpu, #memory, #idle_inhibitor {
font-weight: bold;
margin: 4px 0px;
margin-left: 7px;
padding: 0px 18px;
background: #${config.stylix.base16Scheme.base04};
color: #${config.stylix.base16Scheme.base00};
border-radius: 24px 10px 24px 10px;
}
#custom-startmenu {
color: #${config.stylix.base16Scheme.base0B};
background: #${config.stylix.base16Scheme.base02};
font-size: 28px;
margin: 0px;
padding: 0px 30px 0px 15px;
border-radius: 0px 0px 40px 0px;
}
#custom-hyprbindings, #network, #battery,
#custom-notification, #tray, #custom-exit {
font-weight: bold;
background: #${config.stylix.base16Scheme.base0F};
color: #${config.stylix.base16Scheme.base00};
margin: 4px 0px;
margin-right: 7px;
border-radius: 10px 24px 10px 24px;
padding: 0px 18px;
}
#clock {
font-weight: bold;
color: #0D0E15;
background: linear-gradient(90deg, #${config.stylix.base16Scheme.base0E}, #${config.stylix.base16Scheme.base0C});
margin: 0px;
padding: 0px 15px 0px 30px;
border-radius: 0px 0px 0px 40px;
}
'';
];
style = ''
* {
font-family: JetBrainsMono Nerd Font Mono;
font-size: 16px;
border-radius: 0px;
border: none;
min-height: 0px;
}
window#waybar {
background: rgba(0,0,0,0);
}
#workspaces {
color: #${config.stylix.base16Scheme.base00};
background: #${config.stylix.base16Scheme.base01};
margin: 4px 4px;
padding: 5px 5px;
border-radius: 16px;
}
#workspaces button {
font-weight: bold;
padding: 0px 5px;
margin: 0px 3px;
border-radius: 16px;
color: #${config.stylix.base16Scheme.base00};
background: linear-gradient(45deg, #${config.stylix.base16Scheme.base08}, #${config.stylix.base16Scheme.base0D});
opacity: 0.5;
transition: ${betterTransition};
}
#workspaces button.active {
font-weight: bold;
padding: 0px 5px;
margin: 0px 3px;
border-radius: 16px;
color: #${config.stylix.base16Scheme.base00};
background: linear-gradient(45deg, #${config.stylix.base16Scheme.base08}, #${config.stylix.base16Scheme.base0D});
transition: ${betterTransition};
opacity: 1.0;
min-width: 40px;
}
#workspaces button:hover {
font-weight: bold;
border-radius: 16px;
color: #${config.stylix.base16Scheme.base00};
background: linear-gradient(45deg, #${config.stylix.base16Scheme.base08}, #${config.stylix.base16Scheme.base0D});
opacity: 0.8;
transition: ${betterTransition};
}
tooltip {
background: #${config.stylix.base16Scheme.base00};
border: 1px solid #${config.stylix.base16Scheme.base08};
border-radius: 12px;
}
tooltip label {
color: #${config.stylix.base16Scheme.base08};
}
#window, #pulseaudio, #cpu, #memory, #idle_inhibitor {
font-weight: bold;
margin: 4px 0px;
margin-left: 7px;
padding: 0px 18px;
background: #${config.stylix.base16Scheme.base04};
color: #${config.stylix.base16Scheme.base00};
border-radius: 24px 10px 24px 10px;
}
#custom-startmenu {
color: #${config.stylix.base16Scheme.base0B};
background: #${config.stylix.base16Scheme.base02};
font-size: 28px;
margin: 0px;
padding: 0px 30px 0px 15px;
border-radius: 0px 0px 40px 0px;
}
#custom-hyprbindings, #network, #battery,
#custom-notification, #tray, #custom-exit {
font-weight: bold;
background: #${config.stylix.base16Scheme.base0F};
color: #${config.stylix.base16Scheme.base00};
margin: 4px 0px;
margin-right: 7px;
border-radius: 10px 24px 10px 24px;
padding: 0px 18px;
}
#clock {
font-weight: bold;
color: #0D0E15;
background: linear-gradient(90deg, #${config.stylix.base16Scheme.base0E}, #${config.stylix.base16Scheme.base0C});
margin: 0px;
padding: 0px 15px 0px 30px;
border-radius: 0px 0px 0px 40px;
}
'';
};
};
}

View File

@@ -1,10 +1,15 @@
{ pkgs, lib, config, ... }:
{
pkgs,
lib,
config,
...
}:
with lib;
let
cfg = config.services.cli-environment;
in
{
imports = [];
imports = [ ];
options.services.cli-environment = {
enable = mkEnableOption "enable cli-environment";
@@ -25,10 +30,12 @@ in
bat
tree
imv
eza # ?
eza # ?
appimage-run
nh
openssl
nixfmt-rfc-style
nil
];
programs.fish.enable = true;
};

View File

@@ -1,10 +1,15 @@
{ pkgs, lib, config, ... }:
{
pkgs,
lib,
config,
...
}:
with lib;
let
cfg = config.services.desktop-apps;
in
{
imports = [];
imports = [ ];
options.services.desktop-apps = {
enable = mkEnableOption "enable desktop-apps";

View File

@@ -1,10 +1,15 @@
{ pkgs, lib, config, ... }:
{
pkgs,
lib,
config,
...
}:
with lib;
let
cfg = config.services.dev-environment;
in
{
imports = [];
imports = [ ];
options.services.dev-environment = {
enable = mkEnableOption "enable dev-environment";

View File

@@ -1,10 +1,15 @@
{ pkgs, lib, config, ... }:
{
pkgs,
lib,
config,
...
}:
with lib;
let
cfg = config.services.fonts;
in
{
imports = [];
imports = [ ];
options.services.fonts = {
enable = mkEnableOption "enable fonts";

View File

@@ -1,10 +1,15 @@
{ pkgs, lib, config, ... }:
{
pkgs,
lib,
config,
...
}:
with lib;
let
cfg = config.services.gaming;
in
{
imports = [];
imports = [ ];
options.services.gaming = {
enable = mkEnableOption "enable gaming";

View File

@@ -1,10 +1,15 @@
{ pkgs, lib, config, ... }:
{
pkgs,
lib,
config,
...
}:
with lib;
let
cfg = config.services.window-manager;
in
{
imports = [];
imports = [ ];
options.services.window-manager = {
enable = mkEnableOption "enable window-manager";
@@ -13,7 +18,7 @@ in
config = mkIf cfg.enable {
programs.hyprland.enable = true;
programs.hyprlock.enable = true;
security.pam.services.hyprlock = {};
security.pam.services.hyprlock = { };
environment.systemPackages = with pkgs; [
# wofi
dolphin

View File

@@ -1,15 +1,15 @@
{ pkgs }:
pkgs.writeShellScriptBin "rainbow-border" ''
#!/bin/bash
# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ##
# for rainbow borders animation
#!/bin/bash
# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ##
# for rainbow borders animation
function random_hex() {
random_hex=("0xff$(openssl rand -hex 3)")
echo $random_hex
}
function random_hex() {
random_hex=("0xff$(openssl rand -hex 3)")
echo $random_hex
}
# rainbow colors only for active window
hyprctl keyword general:col.active_border $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) 270deg
# rainbow colors only for active window
hyprctl keyword general:col.active_border $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) 270deg
''