crony/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update formatting.

Browse Source
This commit is contained in:
CronyAkatsuki 2024-03-16 19:03:53 +01:00
parent 4f978540de
commit 49cacd8d9c
22 changed files with 146 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@ -24,17 +24,15 @@
nixosConfigurations = { nixosConfigurations = {
default = nixpkgs.lib.nixosSystem { default = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./nixos/configuration.nix ./nixos/configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
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
];
}; };
} }
]; ];

3
home-manager/modules/alacritty.nix
View File

@ -1,5 +1,4 @@
{ inputs, ... }: { inputs, ... }: {
{
# Install alacritty # Install alacritty
programs.alacritty.enable = true; programs.alacritty.enable = true;

3
home-manager/modules/btop.nix
View File

@ -1,5 +1,4 @@
{ inputs, ... }: { inputs, ... }: {
{
# Btop settings # Btop settings
programs.btop = { programs.btop = {
enable = true; enable = true;

22
home-manager/modules/dmenu.nix
View File

@ -1,12 +1,12 @@
{ 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 {
url = "https://code.cronyakatsuki.xyz/crony/dmenu"; url = "https://code.cronyakatsuki.xyz/crony/dmenu";
rev = "10dcddf14b38cfd965ab27f084139513baed70bf"; rev = "10dcddf14b38cfd965ab27f084139513baed70bf";
}; };
})) }))
]; ];
} }

2
home-manager/modules/gpg.nix
View File

@ -1,4 +1,4 @@
{ inputs, config, pkgs, ...}: { inputs, config, pkgs, ... }:
{ {
# gpg settings # gpg settings

3
home-manager/modules/mangohud.nix
View File

@ -1,5 +1,4 @@
{ inputs, ... }: { inputs, ... }: {
{
# Mangohud settings # Mangohud settings
programs.mangohud = { programs.mangohud = {
enable = true; enable = true;

28
home-manager/modules/mpv.nix
View File

@ -1,18 +1,24 @@
{ 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 =
ytdl-raw-options="extractor-args=youtube:player-client=android"; "bestvideo[height<=?1080][fps<=?60][vcodec!=?vp9]+bestaudio/best";
fs=true; ytdl-raw-options = "extractor-args=youtube:player-client=android";
force-window="immediate"; fs = true;
screenshot-template="%F - [%P]v%#01n"; force-window = "immediate";
sub-file-paths="Subs;subs"; screenshot-template = "%F - [%P]v%#01n";
sub-auto="all"; sub-file-paths = "Subs;subs";
slang="english,eng,en"; sub-auto = "all";
slang = "english,eng,en";
}; };
scripts = with pkgs.mpvScripts; [ mpris sponsorblock uosc thumbfast quality-menu ]; scripts = with pkgs.mpvScripts; [
mpris
sponsorblock
uosc
thumbfast
quality-menu
];
}; };
} }

11
home-manager/modules/newsboat.nix
View File

@ -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;
};
} }

38
home-manager/modules/nnn.nix
View File

@ -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";
}; };
} }

8
home-manager/modules/plasma.nix
View File

@ -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";
})
]; ];
} }

53
home-manager/modules/restic.nix
View File

@ -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" ];
}; };
}; };

23
home-manager/modules/shell.nix
View File

@ -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;
@ -22,30 +21,30 @@
BLK="03" CHR="03" DIR="04" EXE="02" REG="07" HARDLINK="05" SYMLINK="05" MISSING="08" ORPHAN="01" FIFO="06" SOCK="03" UNKNOWN="01" BLK="03" CHR="03" DIR="04" EXE="02" REG="07" HARDLINK="05" SYMLINK="05" MISSING="08" ORPHAN="01" FIFO="06" SOCK="03" UNKNOWN="01"
export NNN_COLORS="#04020301;4231" export NNN_COLORS="#04020301;4231"
export NNN_FCOLORS="$BLK$CHR$DIR$EXE$REG$HARDLINK$SYMLINK$MISSING$ORPHAN$FIFO$SOCK$UNKNOWN" export NNN_FCOLORS="$BLK$CHR$DIR$EXE$REG$HARDLINK$SYMLINK$MISSING$ORPHAN$FIFO$SOCK$UNKNOWN"
''; '';
initExtra = '' initExtra = ''
# VI Mode escape timeout fix # VI Mode escape timeout fix
export KEYTIMEOUT=1 export KEYTIMEOUT=1
# Substring search settings # Substring search settings
export HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND="bg=blue,fg=black,bold" export HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND="bg=blue,fg=black,bold"
export HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=red,fg=black,bold' export HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=red,fg=black,bold'
bindkey -M vicmd 'k' history-substring-search-up bindkey -M vicmd 'k' history-substring-search-up
bindkey -M vicmd 'j' history-substring-search-down bindkey -M vicmd 'j' history-substring-search-down
''; '';
initExtraFirst = '' initExtraFirst = ''
nitch nitch
''; '';
zplug = { zplug = {
enable = true; enable = true;
plugins = [ plugins = [
{ name = "zap-zsh/supercharge"; } { name = "zap-zsh/supercharge"; }
{ name = "zap-zsh/completions"; } { name = "zap-zsh/completions"; }
{ name = "zap-zsh/vim"; } { name = "zap-zsh/vim"; }
{ name = "chivalryq/git-alias"; } { name = "chivalryq/git-alias"; }
{ name = "zdharma-continuum/fast-syntax-highlighting"; } { name = "zdharma-continuum/fast-syntax-highlighting"; }
{ name = "MichaelAquilina/zsh-you-should-use"; } { name = "MichaelAquilina/zsh-you-should-use"; }
{ name = "zsh-users/zsh-history-substring-search"; } { name = "zsh-users/zsh-history-substring-search"; }
]; ];
}; };
}; };

8
home-manager/modules/theming.nix
View File

@ -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

11
home-manager/modules/tmux.nix
View File

@ -1,5 +1,4 @@
{ inputs, pkgs, ... }: { inputs, pkgs, ... }: {
{
programs.tmux = { programs.tmux = {
enable = true; enable = true;
disableConfirmationPrompt = true; disableConfirmationPrompt = true;
@ -16,11 +15,11 @@
set -g @catppuccin_window_right_separator "█ " set -g @catppuccin_window_right_separator "█ "
set -g @catppuccin_window_number_position "right" set -g @catppuccin_window_number_position "right"
set -g @catppuccin_window_middle_separator " | " set -g @catppuccin_window_middle_separator " | "
set -g @catppuccin_window_default_fill "none" set -g @catppuccin_window_default_fill "none"
set -g @catppuccin_window_current_fill "all" set -g @catppuccin_window_current_fill "all"
set -g @catppuccin_status_modules_right "application session date_time" set -g @catppuccin_status_modules_right "application session date_time"
set -g @catppuccin_status_left_separator "█" set -g @catppuccin_status_left_separator "█"
set -g @catppuccin_status_right_separator "█" set -g @catppuccin_status_right_separator "█"
@ -60,7 +59,7 @@
# Status bar border # Status bar border
setw -g pane-border-status top setw -g pane-border-status top
setw -g pane-border-format '─' setw -g pane-border-format '─'
# Bar to top # Bar to top
set-option -g status-position top set-option -g status-position top
''; '';

9
home-manager/modules/tofi.nix
View File

@ -1,15 +1,12 @@
{ inputs, pkgs, ... }: { inputs, pkgs, ... }: {
{
# Install tofi # Install tofi
home.packages = with pkgs; [ home.packages = with pkgs; [
tofi tofi
(writeShellScriptBin "tofi-pass" '' (writeShellScriptBin "tofi-pass" ''
tofi --hide-input true --prompt-text 'Password: ' --require-match false --hidden-character '.' < /dev/null tofi --hide-input true --prompt-text 'Password: ' --require-match false --hidden-character '.' < /dev/null
'') '')
]; ];
# Setup my config file # Setup my config file
home.file = { home.file = { ".config/tofi/config".source = ./confs/tofi; };
".config/tofi/config".source = ./confs/tofi;
};
} }

7
home-manager/modules/vkbasalt.nix
View File

@ -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;

8
nixos/configuration.nix
View File

@ -18,10 +18,10 @@
boot.kernelPackages = pkgs.linuxPackages; boot.kernelPackages = pkgs.linuxPackages;
# Enable gsp # Enable gsp
# boot.kernelParams = [ # boot.kernelParams = [
# "nouveau.config=NvGspRM=1" # "nouveau.config=NvGspRM=1"
# "nouveau.debug=info,VBIOS=info,gsp=debug" # "nouveau.debug=info,VBIOS=info,gsp=debug"
# ]; # ];
# load amdgpu and nouveau at boot # load amdgpu and nouveau at boot
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];

26
nixos/hardware-configuration.nix
View File

@ -4,24 +4,23 @@
{ 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";
}; };
swapDevices = [ ]; swapDevices = [ ];
@ -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;
} }

3
nixos/modules/disable-hibernation.nix
View File

@ -1,5 +1,4 @@
{ ... }: { ... }: {
{
# Disable hibernation, sleep and other friends # Disable hibernation, sleep and other friends
systemd.targets = { systemd.targets = {
sleep = { sleep = {

6
nixos/modules/dns-over-https.nix
View File

@ -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" ];

3
nixos/modules/nvidia.nix
View File

@ -1,5 +1,4 @@
{ config, ... }: { config, ... }: {
{
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
# Nvidia settings # Nvidia settings

7
nixos/modules/wifi-dongle.nix
View File

@ -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
];
} }