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

6
flake.nix
View File

@ -30,11 +30,9 @@
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.extraSpecialArgs = {inherit inputs;};
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.crony = {
imports = [
./home-manager/home.nix
];
imports = [ ./home-manager/home.nix ];
};
}
];

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

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

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

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

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

@ -1,12 +1,12 @@
{ inputs, pkgs, ... }:
{
home.packages = with pkgs; [
# My custom dmenu build
(dmenu.overrideAttrs (oldAttrs: rec {
src = builtins.fetchGit {
url = "https://code.cronyakatsuki.xyz/crony/dmenu";
rev = "10dcddf14b38cfd965ab27f084139513baed70bf";
};
}))
];
{ inputs, pkgs, ... }: {
home.packages = with pkgs;
[
# My custom dmenu build
(dmenu.overrideAttrs (oldAttrs: rec {
src = builtins.fetchGit {
url = "https://code.cronyakatsuki.xyz/crony/dmenu";
rev = "10dcddf14b38cfd965ab27f084139513baed70bf";
};
}))
];
}

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

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

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

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

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

@ -1,18 +1,24 @@
{ inputs, pkgs, ... }:
{
{ inputs, pkgs, ... }: {
# Mpv settings
programs.mpv = {
enable = true;
config = {
ytdl-format="bestvideo[height<=?1080][fps<=?60][vcodec!=?vp9]+bestaudio/best";
ytdl-raw-options="extractor-args=youtube:player-client=android";
fs=true;
force-window="immediate";
screenshot-template="%F - [%P]v%#01n";
sub-file-paths="Subs;subs";
sub-auto="all";
slang="english,eng,en";
ytdl-format =
"bestvideo[height<=?1080][fps<=?60][vcodec!=?vp9]+bestaudio/best";
ytdl-raw-options = "extractor-args=youtube:player-client=android";
fs = true;
force-window = "immediate";
screenshot-template = "%F - [%P]v%#01n";
sub-file-paths = "Subs;subs";
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
home.packages = [
pkgs.newsboat
];
home.packages = [ pkgs.newsboat ];
# Setup my config file
home.file = {
".config/newsboat/config".source = ./confs/newsboat;
};
home.file = { ".config/newsboat/config".source = ./confs/newsboat; };
}

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

@ -1,12 +1,38 @@
{ inputs, pkgs, ... }:
{
{ inputs, pkgs, ... }: {
# NNN Settings
programs.nnn = {
enable = true;
package = pkgs.nnn.override ({ withNerdIcons = true; });
bookmarks = { d = "~/Documents"; D = "~/Downloads"; 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";
bookmarks = {
d = "~/Documents";
D = "~/Downloads";
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 = [
pkgs.catppuccin-cursors.frappeRosewater
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 backup
@ -8,14 +7,12 @@
Unit.Description = "Restic backup service";
Service = {
Type = "oneshot";
ExecStart = toString (
pkgs.writeShellScript "restic-backup" ''
. /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
. /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
''
);
ExecStart = toString (pkgs.writeShellScript "restic-backup" ''
. /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
. /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
'');
};
};
};
@ -36,23 +33,19 @@
Unit.Description = "Restic check service";
Service = {
Type = "oneshot";
ExecStart = toString (
pkgs.writeShellScript "restic-check" ''
. /etc/restic/local
restic check --read-data-subset=10%
. /etc/restic/online
restic check --read-data-subset=10%
''
);
ExecStart = toString (pkgs.writeShellScript "restic-check" ''
. /etc/restic/local
restic check --read-data-subset=10%
. /etc/restic/online
restic check --read-data-subset=10%
'');
};
};
};
systemd.user.timers = {
restic_check = {
Unit.Description = "Restic check timer";
Timer = {
OnCalendar="Thu *-*-* 18:00:00";
};
Timer = { OnCalendar = "Thu *-*-* 18:00:00"; };
Install.WantedBy = [ "timers.target" ];
};
};
@ -63,23 +56,19 @@
Unit.Description = "Restic prune service";
Service = {
Type = "oneshot";
ExecStart = toString (
pkgs.writeShellScript "restic-prune" ''
. /etc/restic/local
restic prune
. /etc/restic/online
restic prune
''
);
ExecStart = toString (pkgs.writeShellScript "restic-prune" ''
. /etc/restic/local
restic prune
. /etc/restic/online
restic prune
'');
};
};
};
systemd.user.timers = {
restic_prune = {
Unit.Description = "Restic prune timer";
Timer = {
OnCalendar="Fri *-*-* 18:00:00";
};
Timer = { OnCalendar = "Fri *-*-* 18:00:00"; };
Install.WantedBy = [ "timers.target" ];
};
};

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

@ -1,5 +1,4 @@
{ inputs, config, ... }:
{
{ inputs, config, ... }: {
# But we all know I love zsh
programs.zsh = {
enable = true;
@ -22,7 +21,7 @@
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_FCOLORS="$BLK$CHR$DIR$EXE$REG$HARDLINK$SYMLINK$MISSING$ORPHAN$FIFO$SOCK$UNKNOWN"
'';
'';
initExtra = ''
# VI Mode escape timeout fix
export KEYTIMEOUT=1
@ -32,20 +31,20 @@
export HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=red,fg=black,bold'
bindkey -M vicmd 'k' history-substring-search-up
bindkey -M vicmd 'j' history-substring-search-down
'';
'';
initExtraFirst = ''
nitch
'';
'';
zplug = {
enable = true;
plugins = [
{ name = "zap-zsh/supercharge"; }
{ name = "zap-zsh/completions"; }
{ name = "zap-zsh/vim"; }
{ name = "chivalryq/git-alias"; }
{ name = "zdharma-continuum/fast-syntax-highlighting"; }
{ name = "MichaelAquilina/zsh-you-should-use"; }
{ name = "zsh-users/zsh-history-substring-search"; }
{ name = "zap-zsh/completions"; }
{ name = "zap-zsh/vim"; }
{ name = "chivalryq/git-alias"; }
{ name = "zdharma-continuum/fast-syntax-highlighting"; }
{ name = "MichaelAquilina/zsh-you-should-use"; }
{ name = "zsh-users/zsh-history-substring-search"; }
];
};
};

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

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{ pkgs, ... }: {
# Enable qt
qt.enable = true;
@ -21,7 +20,10 @@
gtk.theme.name = "Catppuccin-Frappe-Standard-Blue-Dark";
# 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";
# Font name

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

@ -1,5 +1,4 @@
{ inputs, pkgs, ... }:
{
{ inputs, pkgs, ... }: {
programs.tmux = {
enable = true;
disableConfirmationPrompt = true;

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

@ -1,15 +1,12 @@
{ inputs, pkgs, ... }:
{
{ inputs, pkgs, ... }: {
# Install tofi
home.packages = with pkgs; [
tofi
(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
home.file = {
".config/tofi/config".source = ./confs/tofi;
};
home.file = { ".config/tofi/config".source = ./confs/tofi; };
}

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

@ -1,8 +1,5 @@
{ inputs, pkgs, ... }:
{
home.packages = with pkgs; [
vkbasalt
];
{ inputs, pkgs, ... }: {
home.packages = with pkgs; [ vkbasalt ];
home.file = {
".config/vkBasalt/vkBasalt.conf".source = ./confs/vkBasalt.conf;

8
nixos/configuration.nix
View File

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

26
nixos/hardware-configuration.nix
View File

@ -4,24 +4,23 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (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.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/35fda926-38bd-4da4-984e-054f768e2e95";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/35fda926-38bd-4da4-984e-054f768e2e95";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/7BBE-9699";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/7BBE-9699";
fsType = "vfat";
};
swapDevices = [ ];
@ -34,5 +33,6 @@
# networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
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
systemd.targets = {
sleep = {

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

@ -1,5 +1,4 @@
{ ... }:
{
{ ... }: {
### --- Enabling DNS Over HTTPS --- ###
# make network manager not set a default dns
@ -20,7 +19,8 @@
"https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
];
cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
minisign_key =
"RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
};
# use mullvad dns server
server_names = [ "mullvad-doh" ];

3
nixos/modules/nvidia.nix
View File

@ -1,5 +1,4 @@
{ config, ... }:
{
{ config, ... }: {
services.xserver.videoDrivers = [ "nvidia" ];
# 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.
boot.blacklistedKernelModules = [ "rtl8xxxu" "iwlwifi" ];
boot.extraModulePackages = with config.boot.kernelPackages; [
rtl8192eu
];
boot.extraModulePackages = with config.boot.kernelPackages; [ rtl8192eu ];
}