Update formatting.
This commit is contained in:
parent
4f978540de
commit
49cacd8d9c
@ -32,9 +32,7 @@
|
|||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||||
home-manager.users.crony = {
|
home-manager.users.crony = {
|
||||||
imports = [
|
imports = [ ./home-manager/home.nix ];
|
||||||
./home-manager/home.nix
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ inputs, ... }:
|
{ inputs, ... }: {
|
||||||
{
|
|
||||||
# Install alacritty
|
# Install alacritty
|
||||||
programs.alacritty.enable = true;
|
programs.alacritty.enable = true;
|
||||||
|
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ inputs, ... }:
|
{ inputs, ... }: {
|
||||||
{
|
|
||||||
# Btop settings
|
# Btop settings
|
||||||
programs.btop = {
|
programs.btop = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{ inputs, pkgs, ... }:
|
{ inputs, pkgs, ... }: {
|
||||||
{
|
home.packages = with pkgs;
|
||||||
home.packages = with pkgs; [
|
[
|
||||||
# My custom dmenu build
|
# My custom dmenu build
|
||||||
(dmenu.overrideAttrs (oldAttrs: rec {
|
(dmenu.overrideAttrs (oldAttrs: rec {
|
||||||
src = builtins.fetchGit {
|
src = builtins.fetchGit {
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ inputs, ... }:
|
{ inputs, ... }: {
|
||||||
{
|
|
||||||
# Mangohud settings
|
# Mangohud settings
|
||||||
programs.mangohud = {
|
programs.mangohud = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
{ inputs, pkgs, ... }:
|
{ inputs, pkgs, ... }: {
|
||||||
{
|
|
||||||
# Mpv settings
|
# Mpv settings
|
||||||
programs.mpv = {
|
programs.mpv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
config = {
|
config = {
|
||||||
ytdl-format="bestvideo[height<=?1080][fps<=?60][vcodec!=?vp9]+bestaudio/best";
|
ytdl-format =
|
||||||
|
"bestvideo[height<=?1080][fps<=?60][vcodec!=?vp9]+bestaudio/best";
|
||||||
ytdl-raw-options = "extractor-args=youtube:player-client=android";
|
ytdl-raw-options = "extractor-args=youtube:player-client=android";
|
||||||
fs = true;
|
fs = true;
|
||||||
force-window = "immediate";
|
force-window = "immediate";
|
||||||
@ -13,6 +13,12 @@
|
|||||||
sub-auto = "all";
|
sub-auto = "all";
|
||||||
slang = "english,eng,en";
|
slang = "english,eng,en";
|
||||||
};
|
};
|
||||||
scripts = with pkgs.mpvScripts; [ mpris sponsorblock uosc thumbfast quality-menu ];
|
scripts = with pkgs.mpvScripts; [
|
||||||
|
mpris
|
||||||
|
sponsorblock
|
||||||
|
uosc
|
||||||
|
thumbfast
|
||||||
|
quality-menu
|
||||||
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,7 @@
|
|||||||
{ inputs, pkgs, ... }:
|
{ inputs, pkgs, ... }: {
|
||||||
{
|
|
||||||
# Install newsboat
|
# Install newsboat
|
||||||
home.packages = [
|
home.packages = [ pkgs.newsboat ];
|
||||||
pkgs.newsboat
|
|
||||||
];
|
|
||||||
|
|
||||||
# Setup my config file
|
# Setup my config file
|
||||||
home.file = {
|
home.file = { ".config/newsboat/config".source = ./confs/newsboat; };
|
||||||
".config/newsboat/config".source = ./confs/newsboat;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,38 @@
|
|||||||
{ inputs, pkgs, ... }:
|
{ inputs, pkgs, ... }: {
|
||||||
{
|
|
||||||
# NNN Settings
|
# NNN Settings
|
||||||
programs.nnn = {
|
programs.nnn = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.nnn.override ({ withNerdIcons = true; });
|
package = pkgs.nnn.override ({ withNerdIcons = true; });
|
||||||
bookmarks = { d = "~/Documents"; D = "~/Downloads"; p = "~/Pictures"; v = "~/Videos";};
|
bookmarks = {
|
||||||
extraPackages = with pkgs; [ pmount ffmpegthumbnailer mediainfo ueberzugpp poppler_utils gnome-epub-thumbnailer nsxiv ];
|
d = "~/Documents";
|
||||||
plugins.mappings = { u = "nmount"; c = "chksum"; r = "gitroot"; v = "imgview"; m = "mtpmount"; d = "xdgdefault"; x = "togglex"; p = "preview-tui"; };
|
D = "~/Downloads";
|
||||||
plugins.src = (pkgs.fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v4.9"; sha256 = "sha256-g19uI36HyzTF2YUQKFP4DE2ZBsArGryVHhX79Y0XzhU=";}) + "/plugins";
|
p = "~/Pictures";
|
||||||
|
v = "~/Videos";
|
||||||
|
};
|
||||||
|
extraPackages = with pkgs; [
|
||||||
|
pmount
|
||||||
|
ffmpegthumbnailer
|
||||||
|
mediainfo
|
||||||
|
ueberzugpp
|
||||||
|
poppler_utils
|
||||||
|
gnome-epub-thumbnailer
|
||||||
|
nsxiv
|
||||||
|
];
|
||||||
|
plugins.mappings = {
|
||||||
|
u = "nmount";
|
||||||
|
c = "chksum";
|
||||||
|
r = "gitroot";
|
||||||
|
v = "imgview";
|
||||||
|
m = "mtpmount";
|
||||||
|
d = "xdgdefault";
|
||||||
|
x = "togglex";
|
||||||
|
p = "preview-tui";
|
||||||
|
};
|
||||||
|
plugins.src = (pkgs.fetchFromGitHub {
|
||||||
|
owner = "jarun";
|
||||||
|
repo = "nnn";
|
||||||
|
rev = "v4.9";
|
||||||
|
sha256 = "sha256-g19uI36HyzTF2YUQKFP4DE2ZBsArGryVHhX79Y0XzhU=";
|
||||||
|
}) + "/plugins";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
home.packages = [
|
home.packages = [
|
||||||
pkgs.catppuccin-cursors.frappeRosewater
|
pkgs.catppuccin-cursors.frappeRosewater
|
||||||
pkgs.catppuccin-gtk
|
pkgs.catppuccin-gtk
|
||||||
(pkgs.catppuccin-papirus-folders.override { flavor = "frappe"; accent = "pink"; })
|
(pkgs.catppuccin-papirus-folders.override {
|
||||||
|
flavor = "frappe";
|
||||||
|
accent = "pink";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ inputs, pkgs, ... }:
|
{ inputs, pkgs, ... }: {
|
||||||
{
|
|
||||||
##-- Restic Timers And Services --##
|
##-- Restic Timers And Services --##
|
||||||
|
|
||||||
# Restic backup
|
# Restic backup
|
||||||
@ -8,14 +7,12 @@
|
|||||||
Unit.Description = "Restic backup service";
|
Unit.Description = "Restic backup service";
|
||||||
Service = {
|
Service = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
ExecStart = toString (
|
ExecStart = toString (pkgs.writeShellScript "restic-backup" ''
|
||||||
pkgs.writeShellScript "restic-backup" ''
|
|
||||||
. /etc/restic/local
|
. /etc/restic/local
|
||||||
restic backup --files-from /home/crony/.config/restic/list --verbose && restic forget --keep-last 10 --keep-daily 7 --keep-weekly 5 --keep-monthly 12
|
restic backup --files-from /home/crony/.config/restic/list --verbose && restic forget --keep-last 10 --keep-daily 7 --keep-weekly 5 --keep-monthly 12
|
||||||
. /etc/restic/online
|
. /etc/restic/online
|
||||||
restic backup --files-from /home/crony/.config/restic/list --verbose && restic forget --keep-last 10 --keep-daily 7 --keep-weekly 5 --keep-monthly 12
|
restic backup --files-from /home/crony/.config/restic/list --verbose && restic forget --keep-last 10 --keep-daily 7 --keep-weekly 5 --keep-monthly 12
|
||||||
''
|
'');
|
||||||
);
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@ -36,23 +33,19 @@
|
|||||||
Unit.Description = "Restic check service";
|
Unit.Description = "Restic check service";
|
||||||
Service = {
|
Service = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
ExecStart = toString (
|
ExecStart = toString (pkgs.writeShellScript "restic-check" ''
|
||||||
pkgs.writeShellScript "restic-check" ''
|
|
||||||
. /etc/restic/local
|
. /etc/restic/local
|
||||||
restic check --read-data-subset=10%
|
restic check --read-data-subset=10%
|
||||||
. /etc/restic/online
|
. /etc/restic/online
|
||||||
restic check --read-data-subset=10%
|
restic check --read-data-subset=10%
|
||||||
''
|
'');
|
||||||
);
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
systemd.user.timers = {
|
systemd.user.timers = {
|
||||||
restic_check = {
|
restic_check = {
|
||||||
Unit.Description = "Restic check timer";
|
Unit.Description = "Restic check timer";
|
||||||
Timer = {
|
Timer = { OnCalendar = "Thu *-*-* 18:00:00"; };
|
||||||
OnCalendar="Thu *-*-* 18:00:00";
|
|
||||||
};
|
|
||||||
Install.WantedBy = [ "timers.target" ];
|
Install.WantedBy = [ "timers.target" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@ -63,23 +56,19 @@
|
|||||||
Unit.Description = "Restic prune service";
|
Unit.Description = "Restic prune service";
|
||||||
Service = {
|
Service = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
ExecStart = toString (
|
ExecStart = toString (pkgs.writeShellScript "restic-prune" ''
|
||||||
pkgs.writeShellScript "restic-prune" ''
|
|
||||||
. /etc/restic/local
|
. /etc/restic/local
|
||||||
restic prune
|
restic prune
|
||||||
. /etc/restic/online
|
. /etc/restic/online
|
||||||
restic prune
|
restic prune
|
||||||
''
|
'');
|
||||||
);
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
systemd.user.timers = {
|
systemd.user.timers = {
|
||||||
restic_prune = {
|
restic_prune = {
|
||||||
Unit.Description = "Restic prune timer";
|
Unit.Description = "Restic prune timer";
|
||||||
Timer = {
|
Timer = { OnCalendar = "Fri *-*-* 18:00:00"; };
|
||||||
OnCalendar="Fri *-*-* 18:00:00";
|
|
||||||
};
|
|
||||||
Install.WantedBy = [ "timers.target" ];
|
Install.WantedBy = [ "timers.target" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ inputs, config, ... }:
|
{ inputs, config, ... }: {
|
||||||
{
|
|
||||||
# But we all know I love zsh
|
# But we all know I love zsh
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
# Enable qt
|
# Enable qt
|
||||||
qt.enable = true;
|
qt.enable = true;
|
||||||
|
|
||||||
@ -21,7 +20,10 @@
|
|||||||
gtk.theme.name = "Catppuccin-Frappe-Standard-Blue-Dark";
|
gtk.theme.name = "Catppuccin-Frappe-Standard-Blue-Dark";
|
||||||
|
|
||||||
# Gtk icon theme
|
# Gtk icon theme
|
||||||
gtk.iconTheme.package = (pkgs.catppuccin-papirus-folders.override { flavor = "frappe"; accent = "pink"; });
|
gtk.iconTheme.package = (pkgs.catppuccin-papirus-folders.override {
|
||||||
|
flavor = "frappe";
|
||||||
|
accent = "pink";
|
||||||
|
});
|
||||||
gtk.iconTheme.name = "Papirus-Dark";
|
gtk.iconTheme.name = "Papirus-Dark";
|
||||||
|
|
||||||
# Font name
|
# Font name
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ inputs, pkgs, ... }:
|
{ inputs, pkgs, ... }: {
|
||||||
{
|
|
||||||
programs.tmux = {
|
programs.tmux = {
|
||||||
enable = true;
|
enable = true;
|
||||||
disableConfirmationPrompt = true;
|
disableConfirmationPrompt = true;
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ inputs, pkgs, ... }:
|
{ inputs, pkgs, ... }: {
|
||||||
{
|
|
||||||
# Install tofi
|
# Install tofi
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
tofi
|
tofi
|
||||||
@ -9,7 +8,5 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
# Setup my config file
|
# Setup my config file
|
||||||
home.file = {
|
home.file = { ".config/tofi/config".source = ./confs/tofi; };
|
||||||
".config/tofi/config".source = ./confs/tofi;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
{ inputs, pkgs, ... }:
|
{ inputs, pkgs, ... }: {
|
||||||
{
|
home.packages = with pkgs; [ vkbasalt ];
|
||||||
home.packages = with pkgs; [
|
|
||||||
vkbasalt
|
|
||||||
];
|
|
||||||
|
|
||||||
home.file = {
|
home.file = {
|
||||||
".config/vkBasalt/vkBasalt.conf".source = ./confs/vkBasalt.conf;
|
".config/vkBasalt/vkBasalt.conf".source = ./confs/vkBasalt.conf;
|
||||||
|
@ -4,22 +4,21 @@
|
|||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
|
||||||
];
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules =
|
||||||
|
[ "nvme" "xhci_pci" "ahci" "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/35fda926-38bd-4da4-984e-054f768e2e95";
|
device = "/dev/disk/by-uuid/35fda926-38bd-4da4-984e-054f768e2e95";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-uuid/7BBE-9699";
|
device = "/dev/disk/by-uuid/7BBE-9699";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -34,5 +33,6 @@
|
|||||||
# networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.amd.updateMicrocode =
|
||||||
|
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ ... }:
|
{ ... }: {
|
||||||
{
|
|
||||||
# Disable hibernation, sleep and other friends
|
# Disable hibernation, sleep and other friends
|
||||||
systemd.targets = {
|
systemd.targets = {
|
||||||
sleep = {
|
sleep = {
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ ... }:
|
{ ... }: {
|
||||||
{
|
|
||||||
### --- Enabling DNS Over HTTPS --- ###
|
### --- Enabling DNS Over HTTPS --- ###
|
||||||
|
|
||||||
# make network manager not set a default dns
|
# make network manager not set a default dns
|
||||||
@ -20,7 +19,8 @@
|
|||||||
"https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
|
"https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
|
||||||
];
|
];
|
||||||
cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
|
cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
|
||||||
minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
|
minisign_key =
|
||||||
|
"RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
|
||||||
};
|
};
|
||||||
# use mullvad dns server
|
# use mullvad dns server
|
||||||
server_names = [ "mullvad-doh" ];
|
server_names = [ "mullvad-doh" ];
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ config, ... }:
|
{ config, ... }: {
|
||||||
{
|
|
||||||
|
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
# Nvidia settings
|
# Nvidia settings
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
{ config, ... }:
|
{ config, ... }: {
|
||||||
{
|
|
||||||
# Setup correct modules for tplink wifi dongle and disable builtin wifi card.
|
# Setup correct modules for tplink wifi dongle and disable builtin wifi card.
|
||||||
boot.blacklistedKernelModules = [ "rtl8xxxu" "iwlwifi" ];
|
boot.blacklistedKernelModules = [ "rtl8xxxu" "iwlwifi" ];
|
||||||
boot.extraModulePackages = with config.boot.kernelPackages; [
|
boot.extraModulePackages = with config.boot.kernelPackages; [ rtl8192eu ];
|
||||||
rtl8192eu
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user