fixed formating
This commit is contained in:
parent
1acf673ead
commit
52c6b012ca
19 changed files with 142 additions and 134 deletions
|
@ -28,7 +28,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{ self, utils, home-manager, nixpkgs, agenix, ...}:
|
outputs = inputs@{ self, utils, home-manager, nixpkgs, agenix, ... }:
|
||||||
utils.lib.mkFlake {
|
utils.lib.mkFlake {
|
||||||
inherit self inputs;
|
inherit self inputs;
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,8 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ # Include the results of the hardware scan.
|
[
|
||||||
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -14,13 +15,13 @@
|
||||||
boot = {
|
boot = {
|
||||||
supportedFilesystems = [ "btrfs" ];
|
supportedFilesystems = [ "btrfs" ];
|
||||||
loader = {
|
loader = {
|
||||||
grub = {
|
grub = {
|
||||||
enable = true;
|
enable = true;
|
||||||
version = 2;
|
version = 2;
|
||||||
device = "nodev";
|
device = "nodev";
|
||||||
efiSupport = true;
|
efiSupport = true;
|
||||||
};
|
};
|
||||||
efi.canTouchEfiVariables = true;
|
efi.canTouchEfiVariables = true;
|
||||||
};
|
};
|
||||||
kernelPackages = pkgs.linuxPackages_zen;
|
kernelPackages = pkgs.linuxPackages_zen;
|
||||||
};
|
};
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
[
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||||
|
@ -14,7 +15,8 @@
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=root" ];
|
options = [ "subvol=root" ];
|
||||||
};
|
};
|
||||||
|
@ -22,37 +24,41 @@
|
||||||
boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/078b81ba-238e-471d-9951-b743588532b8";
|
boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/078b81ba-238e-471d-9951-b743588532b8";
|
||||||
|
|
||||||
fileSystems."/home" =
|
fileSystems."/home" =
|
||||||
{ device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=home" ];
|
options = [ "subvol=home" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/nix" =
|
fileSystems."/nix" =
|
||||||
{ device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=nix" ];
|
options = [ "subvol=nix" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/persist" =
|
fileSystems."/persist" =
|
||||||
{ device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=persist" ];
|
options = [ "subvol=persist" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/log" =
|
fileSystems."/log" =
|
||||||
{ device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=log" ];
|
options = [ "subvol=log" ];
|
||||||
neededForBoot = true;
|
neededForBoot = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/938D-F813";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/938D-F813";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices =
|
||||||
[ { device = "/dev/disk/by-uuid/29ebf65f-e6ca-4625-9f72-a9321152be1b"; }
|
[{ device = "/dev/disk/by-uuid/29ebf65f-e6ca-4625-9f72-a9321152be1b"; }];
|
||||||
];
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,56 +11,56 @@ let
|
||||||
window_padding_width = 3;
|
window_padding_width = 3;
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
foreground #f8f8f2
|
foreground #f8f8f2
|
||||||
background #282a36
|
background #282a36
|
||||||
#background #000000
|
#background #000000
|
||||||
selection_foreground #44475a
|
selection_foreground #44475a
|
||||||
selection_background #f8f8f2
|
selection_background #f8f8f2
|
||||||
|
|
||||||
url_color #ffb86c
|
url_color #ffb86c
|
||||||
|
|
||||||
# black
|
# black
|
||||||
color0 #21222c
|
color0 #21222c
|
||||||
color8 #6272a4
|
color8 #6272a4
|
||||||
|
|
||||||
# red
|
# red
|
||||||
color1 #ff5555
|
color1 #ff5555
|
||||||
color9 #ff6e6e
|
color9 #ff6e6e
|
||||||
|
|
||||||
# green
|
# green
|
||||||
color2 #50fa7b
|
color2 #50fa7b
|
||||||
color10 #69ff94
|
color10 #69ff94
|
||||||
|
|
||||||
# yellow
|
# yellow
|
||||||
color3 #f1fa8c
|
color3 #f1fa8c
|
||||||
color11 #ffffa5
|
color11 #ffffa5
|
||||||
|
|
||||||
# blue
|
# blue
|
||||||
color4 #bd93f9
|
color4 #bd93f9
|
||||||
color12 #d6acff
|
color12 #d6acff
|
||||||
|
|
||||||
# magenta
|
# magenta
|
||||||
color5 #ff79c6
|
color5 #ff79c6
|
||||||
color13 #ff92df
|
color13 #ff92df
|
||||||
|
|
||||||
# cyan
|
# cyan
|
||||||
color6 #8be9fd
|
color6 #8be9fd
|
||||||
color14 #a4ffff
|
color14 #a4ffff
|
||||||
|
|
||||||
# white
|
# white
|
||||||
color7 #f8f8f2
|
color7 #f8f8f2
|
||||||
color15 #ffffff
|
color15 #ffffff
|
||||||
|
|
||||||
# Cursor colors
|
# Cursor colors
|
||||||
cursor #6272a4
|
cursor #6272a4
|
||||||
cursor_text_color background
|
cursor_text_color background
|
||||||
|
|
||||||
# Tab bar colors
|
# Tab bar colors
|
||||||
active_tab_foreground #44475a
|
active_tab_foreground #44475a
|
||||||
active_tab_background #f8f8f2
|
active_tab_background #f8f8f2
|
||||||
inactive_tab_foreground #282a36
|
inactive_tab_foreground #282a36
|
||||||
inactive_tab_background #6272a4
|
inactive_tab_background #6272a4
|
||||||
'';
|
'';
|
||||||
font = {
|
font = {
|
||||||
name = "FiraCode Nerd Font";
|
name = "FiraCode Nerd Font";
|
||||||
size = 10;
|
size = 10;
|
||||||
|
@ -69,5 +69,5 @@ let
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
home-manager.users.moritz = {...}: (base);
|
home-manager.users.moritz = { ... }: (base);
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,5 +10,5 @@ let
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
home-manager.users.moritz = {...}: (base "/home/moritz/");
|
home-manager.users.moritz = { ... }: (base "/home/moritz/");
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,5 +22,5 @@ let
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
home-manager.users.moritz = {...}: (base);
|
home-manager.users.moritz = { ... }: (base);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./git.nix
|
./git.nix
|
||||||
./nix.nix
|
./nix.nix
|
||||||
./zsh.nix
|
./zsh.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,5 +10,5 @@ let
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
home-manager.users.moritz = {...}: (base "/home/moritz");
|
home-manager.users.moritz = { ... }: (base "/home/moritz");
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,10 +14,10 @@ let
|
||||||
cat = "bat";
|
cat = "bat";
|
||||||
};
|
};
|
||||||
plugins = [
|
plugins = [
|
||||||
{
|
{
|
||||||
name = "zsh-syntax-highlighting";
|
name = "zsh-syntax-highlighting";
|
||||||
src = inputs.zsh-syntax-highlighting;
|
src = inputs.zsh-syntax-highlighting;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
enableAutosuggestions = true;
|
enableAutosuggestions = true;
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
|
@ -34,5 +34,5 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
environment.pathsToLink = [ "/share/zsh" ];
|
environment.pathsToLink = [ "/share/zsh" ];
|
||||||
home-manager.users.moritz = {...}: (base "/home/moritz");
|
home-manager.users.moritz = { ... }: (base "/home/moritz");
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
fonts.fonts = with pkgs; [
|
fonts.fonts = with pkgs; [
|
||||||
(nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "JetBrainsMono"];})
|
(nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "JetBrainsMono" ]; })
|
||||||
];
|
];
|
||||||
|
|
||||||
# PACKAGES
|
# PACKAGES
|
||||||
|
|
|
@ -31,9 +31,9 @@
|
||||||
onChange = "bspc wm -r";
|
onChange = "bspc wm -r";
|
||||||
};
|
};
|
||||||
"sxhkd/sxhkdrc" = {
|
"sxhkd/sxhkdrc" = {
|
||||||
source = ./sxhkdrc;
|
source = ./sxhkdrc;
|
||||||
onChange = "pkill -USR1 -x sxhkd";
|
onChange = "pkill -USR1 -x sxhkd";
|
||||||
};
|
};
|
||||||
"wallpaper/dracula.png" = {
|
"wallpaper/dracula.png" = {
|
||||||
source = ./dracula.png;
|
source = ./dracula.png;
|
||||||
};
|
};
|
||||||
|
|
|
@ -5,18 +5,18 @@ let
|
||||||
services.polybar = {
|
services.polybar = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.polybar.override {
|
package = pkgs.polybar.override {
|
||||||
pulseSupport = true;
|
pulseSupport = true;
|
||||||
};
|
};
|
||||||
script = ''for m in $(polybar --list-monitors | ${pkgs.coreutils}/bin/cut -d":" -f1); do
|
script = ''for m in $(polybar --list-monitors | ${pkgs.coreutils}/bin/cut -d":" -f1); do
|
||||||
MONITOR=$m polybar --reload bottom &
|
MONITOR=$m polybar --reload bottom &
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
config = ./config.ini;
|
config = ./config.ini;
|
||||||
extraConfig = builtins.readFile ./modules.ini +
|
extraConfig = builtins.readFile ./modules.ini +
|
||||||
builtins.readFile ./colors.ini;
|
builtins.readFile ./colors.ini;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
home-manager.users.moritz = {...}: (base);
|
home-manager.users.moritz = { ... }: (base);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
hardware.opengl.enable = true;
|
programs.steam.enable = true;
|
||||||
home-manager.users.moritz = {
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
steam
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,6 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
home-manager.users.moritz.services = {
|
home-manager.users.moritz.services = {
|
||||||
kdeconnect.enable = true;
|
kdeconnect.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,9 +14,9 @@
|
||||||
diskstation -fstype=davfs,uid=1000 :https\://192.168.0.2\:5006/home/Drive/
|
diskstation -fstype=davfs,uid=1000 :https\://192.168.0.2\:5006/home/Drive/
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
''
|
''
|
||||||
/auto file:${mapConf}
|
/auto file:${mapConf}
|
||||||
'';
|
'';
|
||||||
debug = true;
|
debug = true;
|
||||||
};
|
};
|
||||||
environment.etc."davfs2/certs/diskstation.pem" = {
|
environment.etc."davfs2/certs/diskstation.pem" = {
|
||||||
|
|
|
@ -12,5 +12,5 @@ let
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
home-manager.users.moritz = {...}: (base);
|
home-manager.users.moritz = { ... }: (base);
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,22 +14,22 @@ let
|
||||||
source = ./doom;
|
source = ./doom;
|
||||||
recursive = true;
|
recursive = true;
|
||||||
onChange = ''
|
onChange = ''
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
DOOM="$HOME/.emacs.d"
|
DOOM="$HOME/.emacs.d"
|
||||||
if [ ! -d "$DOOM" ]; then
|
if [ ! -d "$DOOM" ]; then
|
||||||
git clone https://github.com/hlissner/doom-emacs.git "$DOOM"
|
git clone https://github.com/hlissner/doom-emacs.git "$DOOM"
|
||||||
"$DOOM/bin/doom" -y install
|
"$DOOM/bin/doom" -y install
|
||||||
fi
|
fi
|
||||||
|
|
||||||
"$DOOM/bin/doom" sync
|
"$DOOM/bin/doom" sync
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
## Emacs itself
|
## Emacs itself
|
||||||
binutils # native-comp needs 'as', provided by this
|
binutils # native-comp needs 'as', provided by this
|
||||||
# emacsPgtkGcc # 28 + pgtk + native-comp
|
# emacsPgtkGcc # 28 + pgtk + native-comp
|
||||||
# ((emacsPackagesNgGen emacsPgtkGcc).emacsWithPackages (epkgs: [
|
# ((emacsPackagesNgGen emacsPgtkGcc).emacsWithPackages (epkgs: [
|
||||||
# epkgs.vterm
|
# epkgs.vterm
|
||||||
|
@ -37,18 +37,21 @@ let
|
||||||
|
|
||||||
## Doom dependencies
|
## Doom dependencies
|
||||||
git
|
git
|
||||||
(ripgrep.override {withPCRE2 = true;})
|
(ripgrep.override { withPCRE2 = true; })
|
||||||
gnutls # for TLS connectivity
|
gnutls # for TLS connectivity
|
||||||
|
|
||||||
## Optional dependencies
|
## Optional dependencies
|
||||||
fd # faster projectile indexing
|
fd # faster projectile indexing
|
||||||
imagemagick # for image-dired
|
imagemagick # for image-dired
|
||||||
zstd # for undo-fu-session/undo-tree compression
|
zstd # for undo-fu-session/undo-tree compression
|
||||||
|
|
||||||
## Module dependencies
|
## Module dependencies
|
||||||
# :checkers spell
|
# :checkers spell
|
||||||
(aspellWithDicts (ds: with ds; [
|
(aspellWithDicts (ds: with ds; [
|
||||||
en en-computers en-science de
|
en
|
||||||
|
en-computers
|
||||||
|
en-science
|
||||||
|
de
|
||||||
]))
|
]))
|
||||||
# :checkers grammar
|
# :checkers grammar
|
||||||
languagetool
|
languagetool
|
||||||
|
@ -64,5 +67,5 @@ in
|
||||||
|
|
||||||
fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ];
|
fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ];
|
||||||
|
|
||||||
home-manager.users.moritz = {...}: (base);
|
home-manager.users.moritz = { ... }: (base);
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,40 +13,40 @@ let
|
||||||
# inactiveDim = "0.1";
|
# inactiveDim = "0.1";
|
||||||
experimentalBackends = true;
|
experimentalBackends = true;
|
||||||
extraOptions = ''
|
extraOptions = ''
|
||||||
corner-radius = 10;
|
corner-radius = 10;
|
||||||
rounded-cornes-exclude = [
|
rounded-cornes-exclude = [
|
||||||
"class_g = 'Polybar'",
|
"class_g = 'Polybar'",
|
||||||
"class_g = 'Rofi'"
|
"class_g = 'Rofi'"
|
||||||
]
|
]
|
||||||
round-borders = 1;
|
round-borders = 1;
|
||||||
|
|
||||||
# improve performance
|
# improve performance
|
||||||
glx-no-rebind-pixmap = true;
|
glx-no-rebind-pixmap = true;
|
||||||
glx-no-stencil = true;
|
glx-no-stencil = true;
|
||||||
|
|
||||||
# fastest swap method
|
# fastest swap method
|
||||||
glx-swap-method = 1;
|
glx-swap-method = 1;
|
||||||
|
|
||||||
# dual kawase blur
|
# dual kawase blur
|
||||||
blur-background-fixed = false;
|
blur-background-fixed = false;
|
||||||
blur-method = "dual_kawase";
|
blur-method = "dual_kawase";
|
||||||
blur-strength = 5;
|
blur-strength = 5;
|
||||||
use-ewmh-active-win = true;
|
use-ewmh-active-win = true;
|
||||||
detect-rounded-corners = true;
|
detect-rounded-corners = true;
|
||||||
|
|
||||||
# stop compositing if there's a fullscreen program
|
# stop compositing if there's a fullscreen program
|
||||||
unredir-if-possible = true;
|
unredir-if-possible = true;
|
||||||
|
|
||||||
# group wintypes and don't focus a menu (Telegram)
|
# group wintypes and don't focus a menu (Telegram)
|
||||||
detect-transient = true;
|
detect-transient = true;
|
||||||
detect-client-leader = true;
|
detect-client-leader = true;
|
||||||
|
|
||||||
# needed for nvidia with glx backend
|
# needed for nvidia with glx backend
|
||||||
xrender-sync-fence = true;
|
xrender-sync-fence = true;
|
||||||
'';
|
'';
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
home-manager.users.moritz = {...}: (base);
|
home-manager.users.moritz = { ... }: (base);
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,4 +8,7 @@ final: prev: {
|
||||||
system = prev.system;
|
system = prev.system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
|
nur = import inputs.nur {
|
||||||
|
system = prev.system;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue