pagedmov/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated flake inputs

Browse Source
This commit is contained in:
pagedmov
2025-01-06 16:26:44 -05:00
parent 92e4ded24e
commit 3857e144e6
77 changed files with 10748 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/home/environment/stylixhome.nix
View File

@@ -1,7 +1,7 @@
{ lib, self, config, host, pkgs, ... }:
let
scheme = "tokyo-night-dark";
scheme = "ayu-dark";
wallpaper = "${self}/assets/wallpapers/dark-waves.jpg";
server = (host == "xenon");
in {
@@ -16,10 +16,11 @@ in {
image = wallpaper;
polarity = "dark";
autoEnable = true;
opacity.terminal = 0.5;
opacity.terminal = 1.0;
targets = {
waybar.enable = false;
btop.enable = false;
nixvim.enable = false;
nixvim.transparentBackground = {
main = false;
signColumn = false;

10
modules/home/environment/userpkgs.nix
View File

@@ -49,6 +49,16 @@ in {
wf-recorder
toilet
vkbasalt
firefox
dust
porsmo
rustup
w3m
neovide
python3
ghostty
fd
delta
] ++ scripts;
};
}

5
modules/home/environment/zsh/aliases.nix
View File

@@ -4,7 +4,9 @@
config = lib.mkIf config.movOpts.envConfig.zshConfig.shellAliases.enable {
programs.zsh = {
shellAliases = {
grep = "grep --color=auto";
grep = "rg";
find = "fd";
cat = "bat";
yazi = "y";
mv = "mv -v";
cp = "cp -vr";
@@ -28,6 +30,7 @@
gpush = "gitpush_sfx";
gpull = "gitpull_sfx";
greb = "gitrebase_sfx";
rsh = "$HOME/Coding/projects/rust/rsh/target/debug/rsh";
};
};
};

9
modules/home/environment/zsh/extraconfig.nix
View File

@@ -37,7 +37,12 @@ in
${shellsound} ${sndpath}/nvim.wav
command nvim "$@"
}
neovide() {
${shellsound} ${sndpath}/nvim.wav
command neovide "$@"
}
alias vi="nvim"
alias vide="neovide"
kitty_theme() {
if [ $TERM = "xterm-kitty" ]; then
if [ -n "$SSH_CONNECTION" ]; then
@@ -135,6 +140,10 @@ in
touch $HOME/.zsh_history
chmod 600 $HOME/.zsh_history
fi
if [ "$TERM" = "linux" ]; then
echo -en "\e]P0101010"
setfont ter-v32b
fi
setopt APPEND_HISTORY # Append history to the history file (don't overwrite)
setopt INC_APPEND_HISTORY # Append to the history file incrementally
setopt SHARE_HISTORY # Share history between all zsh sessions

18
modules/home/programs/git.nix
View File

@@ -13,20 +13,12 @@
};
userEmail = "kylerclay@proton.me";
userName = "${username}";
diff-so-fancy = {
enable = true;
markEmptyLines = false;
stripLeadingSymbols = false;
};
extraConfig = {
color.diff = {
# meta = "black yellow bold";
# frag = "white blue bold";
old = "#A9B1D6 #301A1F";
new = "#A9B1D6 #12261E";
# plain = "normal";
# whitespace = "reverse red";
};
core.pager = "delta";
interactive.diffFilter = "delta --color-only";
delta.navigate = "true";
delta.dark = "true";
merge.conflictstyle = "zdiff3";
};
};
};

5
modules/home/programs/kitty.nix
View File

@@ -6,6 +6,11 @@
config = lib.mkIf config.movOpts.programConfigs.kittyConfig.enable {
programs.kitty = {
enable = true;
font = {
package = lib.mkForce pkgs.fira-code;
name = lib.mkForce "Fira Code";
size = lib.mkForce 20;
};
settings = {
confirm_os_window_close = 0;

6
modules/home/programs/nixvim/autocmd.nix
View File

@@ -15,6 +15,12 @@
desc =
"Load previous session window settings for the opened file (folds, cursor pos, etc)";
}
{
command = "silent! FloatermNew --name=def_term --width=0.8 --height=0.8 --wintype=topright --silent";
event = [ "VimEnter" ];
pattern = [ "*" ];
desc = "Start the floaterm window";
}
];
};
}

36
modules/home/programs/nixvim/keymaps.nix
View File

@@ -6,24 +6,14 @@
key = "!fs";
mode = "n";
}
{
action = "<cmd>UndotreeToggle<CR>"; # select entire document
key = "!t";
mode = "n";
}
{
action = "gg<S-V>G"; # select entire document
key = "<C-a>";
mode = "n";
}
{
action = "<cmd>ChatGPTEditWithInstructions<CR>";
key = "!egpt";
mode = "n";
}
{
action = "<cmd>ChatGPTCompleteCode<CR>";
key = "!cgpt";
mode = "n";
}
{
action = "<cmd>ChatGPT<CR>";
key = "!gpt";
key = "!a";
mode = "n";
}
{
@@ -31,11 +21,6 @@
key = "!ca";
mode = "n";
}
{
action = "<cmd>Telescope<CR>";
key = "!t";
mode = "n";
}
{
action = "<cmd>lua vim.lsp.buf.format()<CR>";
key = "!fmt";
@@ -57,20 +42,15 @@
mode = "n";
}
{
action = "<cmd>FloatermToggle shadeterm<CR>";
action = "<cmd>FloatermToggle def_term<CR>";
key = "<F2>";
mode = "n";
mode = [ "n" "t" ];
}
{
action = "<cmd>NvimTreeToggle<CR>";
key = "<F3>";
mode = "n";
}
{
action = "<cmd>FloatermToggle shadeterm<CR>";
key = "<F2>";
mode = "t";
}
{
action = "<cmd>COQnow<CR>";
key = "!cq";

3
modules/home/programs/nixvim/options.nix
View File

@@ -5,6 +5,7 @@ in {
programs.nixvim = {
colorschemes.base16 = {
enable = true;
colorscheme = "ayu-dark";
#colorscheme = {
# base00 = "#${scheme.base00}";
# base01 = "#${scheme.base01}";
@@ -51,8 +52,10 @@ in {
vim.opt.linebreak = true
vim.opt.textwidth = 0
vim.opt.breakat = " \t!@*-+;:,./?"
vim.opt.guifont = "Fira Code:h18"
vim.g.mapleader = "!"
vim.g.rust_recommended_style = 0
'';
};
}

16
modules/home/programs/nixvim/plugins/airline.nix Normal file
View File

@@ -0,0 +1,16 @@
{
programs.nixvim = {
plugins.airline = {
enable = true;
settings = {
left_sep = "";
right_sep = "";
powerline_fonts = 1;
theme = "dark";
section_x = "";
section_y = "";
skip_empty_sections = 1;
};
};
};
}

5
modules/home/programs/nixvim/plugins/default.nix
View File

@@ -12,12 +12,15 @@
./lsp.nix
./rustaceanvim.nix
./fidget.nix
./lualine.nix
# ./lualine.nix
./airline.nix
./nvim-lightbulb.nix
./neocord.nix
./plugins.nix
./nvim-tree.nix
./telescope.nix
./indent-blankline.nix
./gitsigns.nix
./extra_plugins.nix
];
}

14
modules/home/programs/nixvim/plugins/gitsigns.nix Normal file
View File

@@ -0,0 +1,14 @@
{
programs.nixvim = {
plugins.gitsigns = {
enable = true;
settings.signs = {
add.text = "│";
change.text = "/";
delete.text = "-";
topdelete.text = "-";
changedelete.text = "\\";
};
};
};
}

24
modules/home/programs/nixvim/plugins/haskell.nix
View File

@@ -1,16 +1,16 @@
{ pkgs, ... }: {
programs.nixvim = {
extraPlugins = [
(pkgs.vimUtils.buildVimPlugin {
name = "haskell-tools.nvim";
src = pkgs.fetchFromGitHub {
owner = "mrcjkb";
repo = "haskell-tools.nvim";
rev = "39c4ced6f1bff1abc8d4df5027efd11ac38c6e6c";
hash = "sha256-f+M35EwAlHwjJ2Xs2u9FLnyH0FJT22D0LLShDXCbEEs=";
};
})
];
plugins = { haskell-scope-highlighting.enable = true; };
#extraPlugins = [
#(pkgs.vimUtils.buildVimPlugin {
#name = "haskell-tools.nvim";
#src = pkgs.fetchFromGitHub {
#owner = "mrcjkb";
#repo = "haskell-tools.nvim";
#rev = "39c4ced6f1bff1abc8d4df5027efd11ac38c6e6c";
#hash = "sha256-f+M35EwAlHwjJ2Xs2u9FLnyH0FJT22D0LLShDXCbEEs=";
#};
#})
#];
#plugins = { haskell-scope-highlighting.enable = true; };
};
}

10
modules/home/programs/nixvim/plugins/indent-blankline.nix Normal file
View File

@@ -0,0 +1,10 @@
{
programs.nixvim = {
plugins.indent-blankline = {
enable = true;
#settings = {
#indent.char = "│";
#};
};
};
}

2
modules/home/programs/nixvim/plugins/lualine.nix
View File

@@ -1,7 +1,7 @@
{
programs.nixvim = {
plugins.lualine = {
enable = true;
enable = false;
settings = {
options = {
icons_enabled = true;

2
modules/home/programs/nixvim/plugins/plugins.nix
View File

@@ -7,11 +7,11 @@
};
nix.enable = true;
endwise.enable = true;
undotree.enable = true;
firenvim.enable = true;
helpview.enable = true;
floaterm.enable = true;
fugitive.enable = true;
gitsigns.enable = true;
indent-blankline.enable = true;
lastplace.enable = true;
markdown-preview.enable = true;

1
modules/home/programs/nixvim/plugins/scrollview.nix
View File

@@ -6,6 +6,7 @@
settings.diagnostics_warn_symbol = "■";
settings.diagnostics_hint_symbol = "■";
settings.diagnostics_info_symbol = "■";
settings.character = "│";
};
};
}

24
modules/home/programs/nixvim/plugins/vim-matchup.nix
View File

@@ -2,19 +2,17 @@
programs.nixvim = {
plugins.vim-matchup = {
enable = true;
enableSurround = true;
textObj.enable = true;
motion = {
enable = true;
cursorEnd = true;
};
matchParen = {
hiSurroundAlways = true;
offscreen = { method = "popup"; };
};
treesitterIntegration = {
enable = true;
includeMatchWords = true;
settings = {
surround_enabled = 1;
text_obj_enabled = 1;
motion_enabled = 1;
motion_cursor_end = 1;
matchparen_deferred_hi_surround_always = true;
matchparen_offscreen = { method = "popup"; };
treesitter = {
enable = true;
include_match_words = true;
};
};
};
};

5
modules/sys/hardware/bootloader.nix
View File

@@ -8,6 +8,11 @@
loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
loader.systemd-boot.configurationLimit = 10;
loader.grub.gfxmodeEfi = "1024x768";
loader.grub.extraConfig = ''
GRUB_CMDLINE_LINUX_DEFAULT="nomodeset"
GRUB_GFXPAYLOAD_LINUX=1024x768
'';
kernelPackages = pkgs.linuxPackages_latest;
};
};

2
modules/sys/software/packages.nix
View File

@@ -13,6 +13,8 @@
cliphist
fail2ban
git
gcc
lldb
hyprland-workspaces
hyprpaper
hyprpicker

15
modules/sys/software/programs.nix
View File

@@ -4,6 +4,21 @@
lib.mkEnableOption "enables default system programs";
};
config = lib.mkIf config.movOpts.softwareCfg.sysProgs.enable {
environment.etc."shells" = {
enable = true;
text = ''
/run/current-system/sw/bin/zsh
/run/current-system/sw/bin/bash
/run/current-system/sw/bin/zsh
/nix/store/m7l6yzmflrf9hjs8707lk9nkhi6f73n1-zsh-5.9/bin/zsh
/run/current-system/sw/bin/bash
/run/current-system/sw/bin/sh
/nix/store/f33kh08pa7pmy4kvsmsibda46sh46s66-bash-interactive-5.2p37/bin/bash
/nix/store/f33kh08pa7pmy4kvsmsibda46sh46s66-bash-interactive-5.2p37/bin/sh
/bin/sh
/home/pagedmov/Coding/projects/rust/rsh/target/debug/rsh
'';
};
programs = {
hyprland.enable = lib.mkDefault true;
zsh.enable = lib.mkDefault true;

9
modules/sys/software/services.nix
View File

@@ -19,15 +19,16 @@
alsa.enable = true;
alsa.support32Bit = true;
};
openssh = {
enable = true;
allowSFTP = true;
};
ratbagd.enable = true;
pcscd.enable = true;
udev.enable = true;
dbus.enable = true;
mullvad-vpn.enable = true;
blueman.enable = true;
openssh = {
enable = true;
allowSFTP = true;
};
};
};
}

14
modules/sys/sysenv/console.nix Normal file
View File

@@ -0,0 +1,14 @@
{ lib, config, pkgs, ... }: {
options = {
movOpts.sysEnv.consoleSettings.enable =
lib.mkEnableOption "enables my console settings";
};
config = lib.mkIf config.movOpts.sysEnv.consoleSettings.enable {
i18n.defaultLocale = "en_US.UTF-8";
console = {
earlySetup = true;
font = "Lat2-Terminus32";
packages = with pkgs; [ terminus_font ];
};
};
}

3
modules/sys/sysenv/default.nix
View File

@@ -1,4 +1,5 @@
{ inputs, nixpkgs, nixvim, config, self, username, host, ... }: {
imports = [ (import ./sddm.nix) ] ++ [ (import ./issue.nix) ]
++ [ (import ./nix.nix) ] ++ [ (import ./stylix.nix) ];
++ [ (import ./nix.nix) ] ++ [ (import ./stylix.nix) ];
#++ [ (import ./console.nix) ];
}

8
modules/sys/sysenv/nix.nix
View File

@@ -4,12 +4,18 @@
lib.mkEnableOption "enables my nixos settings";
};
config = lib.mkIf config.movOpts.sysEnv.nixSettings.enable {
system.stateVersion = "25.05";
system.stateVersion = "24.05";
nix = {
settings = {
auto-optimise-store = true;
experimental-features = [ "nix-command" "flakes" ];
substituters = [ "https://nix-gaming.cachix.org" ];
};
gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 7d";
};
};
time.timeZone = "America/New_York";
i18n.defaultLocale = "en_US.UTF-8";

4
modules/sys/sysenv/stylix.nix
View File

@@ -19,9 +19,9 @@ in {
};
polarity = "dark";
autoEnable = true;
opacity.terminal = 0.5;
opacity.terminal = 0.8;
targets = {
console.enable = true;
console.enable = false;
feh.enable = true;
grub.enable = true;
gtk.enable = true;