feat: format
This commit is contained in:
parent
95f31e1d7a
commit
0844945c23
15 changed files with 1111 additions and 1080 deletions
|
|
@ -10,7 +10,12 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, ... }@inputs: {
|
outputs = {
|
||||||
|
self,
|
||||||
|
nixpkgs,
|
||||||
|
...
|
||||||
|
} @ inputs: {
|
||||||
|
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
|
||||||
nixosConfigurations.default = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.default = nixpkgs.lib.nixosSystem {
|
||||||
specialArgs = {inherit inputs;};
|
specialArgs = {inherit inputs;};
|
||||||
modules = [
|
modules = [
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,13 @@
|
||||||
# Edit this configuration file to define what should be installed on
|
# Edit this configuration file to define what should be installed on
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
|
|
||||||
{ config, pkgs, inputs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
config,
|
||||||
[
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [
|
||||||
../../modules/nixos/main-user.nix
|
../../modules/nixos/main-user.nix
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
inputs.home-manager.nixosModules.default
|
inputs.home-manager.nixosModules.default
|
||||||
|
|
@ -52,7 +53,7 @@
|
||||||
services.xserver.desktopManager.gnome.enable = true;
|
services.xserver.desktopManager.gnome.enable = true;
|
||||||
|
|
||||||
services.pcscd.enable = true;
|
services.pcscd.enable = true;
|
||||||
services.dbus.packages = [ pkgs.gcr ];
|
services.dbus.packages = [pkgs.gcr];
|
||||||
|
|
||||||
# Configure keymap in X11
|
# Configure keymap in X11
|
||||||
services.xserver.xkb = {
|
services.xserver.xkb = {
|
||||||
|
|
@ -82,7 +83,7 @@
|
||||||
# Enable touchpad support (enabled default in most desktopManager).
|
# Enable touchpad support (enabled default in most desktopManager).
|
||||||
# services.xserver.libinput.enable = true;
|
# services.xserver.libinput.enable = true;
|
||||||
|
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||||
|
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||||
main-user = {
|
main-user = {
|
||||||
|
|
@ -91,13 +92,12 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
extraSpecialArgs = { inherit inputs; };
|
extraSpecialArgs = {inherit inputs;};
|
||||||
users = {
|
users = {
|
||||||
"sprechtl" = import ./home.nix;
|
"sprechtl" = import ./home.nix;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
# Allow unfree packages
|
# Allow unfree packages
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
|
|
@ -160,7 +160,6 @@
|
||||||
# enableSSHSupport = true;
|
# enableSSHSupport = true;
|
||||||
# };
|
# };
|
||||||
|
|
||||||
|
|
||||||
services.fprintd.enable = true;
|
services.fprintd.enable = true;
|
||||||
|
|
||||||
# List services that you want to enable:
|
# List services that you want to enable:
|
||||||
|
|
@ -182,5 +181,4 @@
|
||||||
# Before changing this value read the documentation for this option
|
# Before changing this value read the documentation for this option
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
system.stateVersion = "24.05"; # Did you read the comment?
|
system.stateVersion = "24.05"; # Did you read the comment?
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,31 +1,35 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
config,
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod"];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [];
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot.kernelModules = ["kvm-amd"];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/disk/by-uuid/ed1afa26-1c26-4da6-a4b4-b5cb6e0b2222";
|
device = "/dev/disk/by-uuid/ed1afa26-1c26-4da6-a4b4-b5cb6e0b2222";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-uuid/1FDC-CD90";
|
device = "/dev/disk/by-uuid/1FDC-CD90";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
options = ["fmask=0077" "dmask=0077"];
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices = [
|
||||||
[ { device = "/dev/disk/by-uuid/cee4a6a9-f044-4258-9d4b-35c67cc59e2c"; }
|
{device = "/dev/disk/by-uuid/cee4a6a9-f044-4258-9d4b-35c67cc59e2c";}
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
../../modules/home-manager/hyprland.nix
|
../../modules/home-manager/hyprland.nix
|
||||||
../../modules/home-manager/pass.nix
|
../../modules/home-manager/pass.nix
|
||||||
|
|
@ -36,7 +38,6 @@
|
||||||
# '')
|
# '')
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
||||||
# plain files is through 'home.file'.
|
# plain files is through 'home.file'.
|
||||||
home.file = {
|
home.file = {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
programs.alacritty = {
|
programs.alacritty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
programs.btop = {
|
programs.btop = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
delta.enable = true;
|
delta.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
./hyprlock.nix
|
./hyprlock.nix
|
||||||
];
|
];
|
||||||
|
|
@ -11,7 +13,8 @@
|
||||||
settings = {
|
settings = {
|
||||||
# BINDS
|
# BINDS
|
||||||
"$mod" = "SUPER";
|
"$mod" = "SUPER";
|
||||||
bind = [
|
bind =
|
||||||
|
[
|
||||||
"SUPERSHIFT, E, exit"
|
"SUPERSHIFT, E, exit"
|
||||||
"$mod, Q, killactive"
|
"$mod, Q, killactive"
|
||||||
"$mod, B, exec, brave"
|
"$mod, B, exec, brave"
|
||||||
|
|
@ -50,8 +53,9 @@
|
||||||
++ (
|
++ (
|
||||||
# workspaces
|
# workspaces
|
||||||
# binds $mod + [shift +] {1..9} to [move to] workspace {1..9}
|
# binds $mod + [shift +] {1..9} to [move to] workspace {1..9}
|
||||||
builtins.concatLists (builtins.genList (i:
|
builtins.concatLists (builtins.genList (
|
||||||
let ws = i + 1;
|
i: let
|
||||||
|
ws = i + 1;
|
||||||
in [
|
in [
|
||||||
"$mod, code:1${toString i}, workspace, ${toString ws}"
|
"$mod, code:1${toString i}, workspace, ${toString ws}"
|
||||||
"$mod SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}"
|
"$mod SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}"
|
||||||
|
|
@ -86,44 +90,44 @@
|
||||||
# INPUT
|
# INPUT
|
||||||
|
|
||||||
input = {
|
input = {
|
||||||
kb_layout="us";
|
kb_layout = "us";
|
||||||
kb_options="compose:ralt,caps:escape";
|
kb_options = "compose:ralt,caps:escape";
|
||||||
follow_mouse=2;
|
follow_mouse = 2;
|
||||||
|
|
||||||
touchpad = {
|
touchpad = {
|
||||||
natural_scroll="yes";
|
natural_scroll = "yes";
|
||||||
};
|
};
|
||||||
|
|
||||||
sensitivity=0.0; # -1.0 - 1.0, 0 means no modification.
|
sensitivity = 0.0; # -1.0 - 1.0, 0 means no modification.
|
||||||
};
|
};
|
||||||
|
|
||||||
# GENERAL
|
# GENERAL
|
||||||
general = {
|
general = {
|
||||||
gaps_in=10;
|
gaps_in = 10;
|
||||||
gaps_out=20;
|
gaps_out = 20;
|
||||||
|
|
||||||
border_size=2;
|
border_size = 2;
|
||||||
"col.active_border"="0xffBF616A";
|
"col.active_border" = "0xffBF616A";
|
||||||
"col.inactive_border"="0xffebdbb2";
|
"col.inactive_border" = "0xffebdbb2";
|
||||||
};
|
};
|
||||||
|
|
||||||
# CURSOR
|
# CURSOR
|
||||||
cursor = {
|
cursor = {
|
||||||
no_warps=true;
|
no_warps = true;
|
||||||
inactive_timeout=3;
|
inactive_timeout = 3;
|
||||||
};
|
};
|
||||||
|
|
||||||
# DECORATION
|
# DECORATION
|
||||||
decoration = {
|
decoration = {
|
||||||
active_opacity=0.95;
|
active_opacity = 0.95;
|
||||||
inactive_opacity=0.95;
|
inactive_opacity = 0.95;
|
||||||
rounding=10;
|
rounding = 10;
|
||||||
};
|
};
|
||||||
|
|
||||||
# ANIMATION
|
# ANIMATION
|
||||||
animations = {
|
animations = {
|
||||||
enabled=1;
|
enabled = 1;
|
||||||
bezier="overshot,0.13,0.99,0.29,1.1";
|
bezier = "overshot,0.13,0.99,0.29,1.1";
|
||||||
animation = [
|
animation = [
|
||||||
"windows,1,4,overshot,slide"
|
"windows,1,4,overshot,slide"
|
||||||
"border,1,10,default"
|
"border,1,10,default"
|
||||||
|
|
@ -140,7 +144,6 @@
|
||||||
"whatpulse"
|
"whatpulse"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
# WINDOW RULES
|
# WINDOW RULES
|
||||||
windowrule = [
|
windowrule = [
|
||||||
"move 400 400, float, title:(jetbrains toolbox)"
|
"move 400 400, float, title:(jetbrains toolbox)"
|
||||||
|
|
@ -148,7 +151,7 @@
|
||||||
"opacity 1 override,title:^(.*)(Brave)(.*)$"
|
"opacity 1 override,title:^(.*)(Brave)(.*)$"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# Optional, hint Electron apps to use Wayland:
|
# Optional, hint Electron apps to use Wayland:
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
NIXOS_OZONE_WL = "1";
|
NIXOS_OZONE_WL = "1";
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
programs.hyprlock = {
|
programs.hyprlock = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
services.nextcloud-client = {
|
services.nextcloud-client = {
|
||||||
enable = true;
|
enable = true;
|
||||||
startInBackground = true;
|
startInBackground = true;
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,12 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
programs.password-store = {
|
programs.password-store = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
PASSWORD_STORE_DIR="$HOME/.password-store";
|
PASSWORD_STORE_DIR = "$HOME/.password-store";
|
||||||
PASSWORD_STORE_GENERATED_LENGTH = "20";
|
PASSWORD_STORE_GENERATED_LENGTH = "20";
|
||||||
PASSWORD_STORE_ENABLE_EXTENSIONS = "true";
|
PASSWORD_STORE_ENABLE_EXTENSIONS = "true";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
programs.waybar = {
|
programs.waybar = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
@ -692,6 +694,6 @@
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
padding: 0 0.6em;
|
padding: 0 0.6em;
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,19 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
programs.wofi = {
|
programs.wofi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
allow-images=true;
|
allow-images = true;
|
||||||
image-size="64px";
|
image-size = "64px";
|
||||||
gtk_dark=true;
|
gtk_dark = true;
|
||||||
insensitive=true;
|
insensitive = true;
|
||||||
halign=true;
|
halign = true;
|
||||||
location="center";
|
location = "center";
|
||||||
prompt="Search...";
|
prompt = "Search...";
|
||||||
orientation="vertical";
|
orientation = "vertical";
|
||||||
};
|
};
|
||||||
style = ''
|
style = ''
|
||||||
@define-color base00 #282828;
|
@define-color base00 #282828;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
programs.eza.enable = true;
|
programs.eza.enable = true;
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -18,7 +20,7 @@
|
||||||
|
|
||||||
oh-my-zsh = {
|
oh-my-zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
plugins = [ "git" "docker" ];
|
plugins = ["git" "docker"];
|
||||||
theme = "strug";
|
theme = "strug";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,14 @@
|
||||||
{ lib, config, pkgs, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
cfg = config.main-user;
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cfg = config.main-user;
|
||||||
|
in {
|
||||||
options.main-user = {
|
options.main-user = {
|
||||||
enable
|
enable =
|
||||||
= lib.mkEnableOption "enable user module";
|
lib.mkEnableOption "enable user module";
|
||||||
|
|
||||||
username = lib.mkOption {
|
username = lib.mkOption {
|
||||||
default = "mainuser";
|
default = "mainuser";
|
||||||
|
|
@ -21,7 +23,7 @@ in
|
||||||
users.users.${cfg.username} = {
|
users.users.${cfg.username} = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
initialPassword = "12345";
|
initialPassword = "12345";
|
||||||
extraGroups = [ "input" "networkmanager" "wheel" ];
|
extraGroups = ["input" "networkmanager" "wheel"];
|
||||||
description = "Stefan";
|
description = "Stefan";
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue