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

update nixvim, create disks and fish with home manager

Browse Source
This commit is contained in:
KeksNino
2026-08-02 21:39:21 +02:00
parent 78eaa4674a
commit 535a3e6d6e
10 changed files with 193 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.nix
+1
View File
@@ -55,6 +55,7 @@
./hosts/desktop/configuration.nix
./hosts/desktop/hardware-configuration.nix
./modules/common.nix
./modules/desktop/xremap.nix
home-manager.nixosModules.home-manager
gsr-ui.nixosModules.default
{
hosts/desktop/configuration.nix
+8 -63
View File
@@ -15,54 +15,11 @@ in
imports = [
./hardware-configuration.nix
./packages.nix
./drives.nix
../../modules/scripts.nix
../../modules/desktop/xremap.nix
../../modules/programs/neovim/neovim.nix
];
# DISKS
fileSystems."/media/gamedisk4" = {
device = "/dev/disk/by-uuid/D290EB87C8A1E82A";
fsType = "ntfs3";
options = [
"uid=1000"
"gid=100"
"rw"
"user"
"exec"
"umask=000"
"nofail"
];
};
fileSystems."/media/gamedisk" = {
device = "/dev/disk/by-uuid/5C7C14707C1446E4";
fsType = "ntfs3";
options = [
"uid=1000"
"gid=100"
"rw"
"user"
"exec"
"umask=000"
"nofail"
];
};
fileSystems."/media/gamedisk2" = {
device = "/dev/disk/by-uuid/945A7421DAD8A3CE";
fsType = "ntfs3";
options = [
"uid=1000"
"gid=100"
"rw"
"user"
"exec"
"umask=000"
"nofail"
];
};
nix.settings.experimental-features = [
"nix-command"
"flakes"
@@ -157,24 +114,11 @@ in
xwayland.enable = true;
};
# environment.loginShellInit = ''
# if [ "$(tty)" = "/dev/tty1" ] && [ -z "$WAYLAND_DISPLAY" ]; then
# exec start-hyprland
# fi
# '';
# NFS / MPD
fileSystems."/media/music" = {
device = "192.168.132.149:/media/music";
fsType = "nfs4";
};
boot.supportedFilesystems = [ "nfs4" ];
qt = {
enable = true;
platformTheme = "qt5ct";
style = "breeze";
};
# qt = {
# enable = true;
# platformTheme = "qt5ct";
# style = "breeze";
# };
virtualisation.docker.enable = true;
services.gvfs.enable = true;
@@ -182,7 +126,7 @@ in
services.lact.enable = true;
services.rsync.enable = true;
programs.kdeconnect.enable = true;
programs.neovim.enable = true;
# programs.neovim.enable = true;
programs.tmux.enable = true;
programs.bat.enable = true;
programs.git = {
@@ -223,6 +167,7 @@ in
programs.steam = {
enable = true;
extraCompatPackages = with pkgs; [ proton-ge-bin ];
package = pkgs.millennium-steam.override {
extraEnv = {
LD_AUDIT = "${sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam}/library-inject.so:${
hosts/desktop/drives.nix
+67
View File
@@ -0,0 +1,67 @@
{
boot.supportedFilesystems = [
"ntfs"
"nfs4"
];
fileSystems."/media/music" = {
device = "192.168.132.149:/media/music";
fsType = "nfs4";
};
fileSystems."/media/gamedisk" = {
device = "/dev/disk/by-uuid/5C7C14707C1446E4";
fsType = "ntfs-3g";
options = [
"uid=1000"
"gid=100"
"rw"
"user"
"exec"
"umask=000"
"nofail"
];
};
fileSystems."/media/gamedisk2" = {
device = "/dev/disk/by-uuid/945A7421DAD8A3CE";
fsType = "ntfs-3g";
options = [
"uid=1000"
"gid=100"
"rw"
"user"
"exec"
"umask=000"
"nofail"
];
};
fileSystems."/media/gamedisk3" = {
device = "/dev/disk/by-uuid/420E457E60DE3935";
fsType = "ntfs-3g";
options = [
"uid=1000"
"gid=100"
"rw"
"user"
"exec"
"umask=000"
"nofail"
];
};
fileSystems."/media/gamedisk4" = {
device = "/dev/disk/by-uuid/D290EB87C8A1E82A";
fsType = "ntfs-3g";
options = [
"uid=1000"
"gid=100"
"rw"
"user"
"exec"
"umask=000"
"nofail"
];
};
}
hosts/desktop/hardware-configuration.nix
-11
View File
@@ -38,12 +38,6 @@
"dmask=0077"
];
};
fileSystems."/media/gamedisk4" = {
device = "/dev/disk/by-uuid/D290EB87C8A1E82A";
fsType = "ntfs3";
};
fileSystems."/media/music" = {
device = "192.168.132.149:/media/music";
fsType = "nfs4";
@@ -54,11 +48,6 @@
fsType = "ext4";
};
fileSystems."/media/gamedisk" = {
device = "/dev/disk/by-uuid/5C7C14707C1446E4";
fsType = "ntfs3";
};
swapDevices = [
{ device = "/dev/disk/by-uuid/5949c73f-30eb-4956-9e93-70301c88fad8"; }
];
hosts/desktop/home-manager/fish.nix
+28
View File
@@ -0,0 +1,28 @@
{
programs.fish = {
enable = true;
interactiveShellInit = ''
nitch
set -g fish_key_bindings fish_hybrid_key_bindings
set fish_greeting
'';
shellAliases = {
ls = "eza -al --no-time --no-user --no-permissions --no-filesize";
ll = "eza -la";
cat = "bat";
cd = "z";
cp = "cp -v";
ff = "fastfetch";
grep = "grep -i";
hyprland = "start-hyprland";
mv = "mv -v";
n = "nvim";
py = "uv run";
r = "rsync -avh --info=progress2";
rm = "gomi";
ssh = "kitty +kitten ssh";
nd = "nix develop";
df = "df -h -x tmpfs -x devtmpfs -x squashfs -x overlay -x efivarfs";
};
};
}
hosts/desktop/home-manager/home.nix
+2 -27
View File
@@ -8,6 +8,7 @@
imports = [
./mpd.nix
./programs.nix
./fish.nix
zen-browser.homeModules.beta
];
@@ -25,6 +26,7 @@
xdg.mimeApps = {
enable = true;
defaultApplications = {
"application/zip" = [ "org.gnome.FileRoller.desktop" ];
"inode/directory" = [ "nemo.desktop" ];
"image/*" = [ "imv-dir.desktop" ];
"image/gif" = [ "imv-dir.desktop" ];
@@ -105,33 +107,6 @@
EDITOR = "nvim";
};
programs.fish = {
enable = true;
interactiveShellInit = ''
nitch
set -g fish_key_bindings fish_hybrid_key_bindings
set fish_greeting
'';
shellAliases = {
ls = "eza -al --no-time --no-user --no-permissions --no-filesize";
ll = "eza -la";
cat = "bat";
cd = "z";
cp = "cp -v";
ff = "fastfetch";
grep = "grep -i";
hyprland = "start-hyprland";
mv = "mv -v";
n = "nvim";
py = "uv run";
r = "rsync -avh --info=progress2";
rm = "gomi";
ssh = "kitty +kitten ssh";
nd = "nix develop";
df = "df -h -x tmpfs -x devtmpfs -x squashfs -x overlay -x efivarfs";
};
};
home.file.".local/share/Steam/steam.cfg".text = ''
BootStrapperInhibitAll=enable
BootStrapperForceSelfUpdate=disable
hosts/desktop/home-manager/programs.nix
+1
View File
@@ -37,6 +37,7 @@
programs.mpv.enable = true;
programs.imv.enable = true;
programs.aria2.enable = true;
programs.ripgrep.enable = true;
programs.pywal = {
enable = true;
hosts/desktop/packages.nix
+3 -1
View File
@@ -30,7 +30,6 @@
spek
ffmpeg
# wine
ripgrep
nemo-with-extensions
papirus-icon-theme
rust-analyzer
@@ -61,6 +60,9 @@
stow
bluetui
file-roller
signal-desktop
file
ntfs3g
];
fonts.packages = with pkgs; [
modules/programs/neovim/keymaps.nix
+45
View File
@@ -30,6 +30,51 @@
action = "<cmd>BufferLineCyclePrev<CR>";
key = "<S-tab>";
}
{
mode = [ "x" ];
action = "<gv";
key = "<";
}
{
mode = [ "x" ];
action = ">gv";
key = ">";
}
{
mode = [ "n" ];
action = ''"_d'';
key = "d";
}
{
mode = [ "n" ];
action = ''"_dd'';
key = "dd";
}
{
mode = [ "v" ];
action = ''"_d'';
key = "d";
}
{
mode = [ "v" ];
action = ''"_p'';
key = "p";
}
{
mode = [ "n" ];
action = "<cmd>Telescope live_grep<CR>";
key = "<leader>rg";
}
{
mode = [ "n" ];
action = "<cmd>Telescope find_files<CR>";
key = "<leader>ff";
}
{
mode = [ "n" ];
action = "<cmd>:lua vim.diagnostic.open_float<CR>";
key = "<leader>k";
}
];
};
}
modules/programs/neovim/neovim.nix
+38 -69
View File
@@ -12,7 +12,7 @@
];
programs.nixvim = {
enable = false;
enable = true;
defaultEditor = true;
clipboard.register = "unnamedplus";
@@ -26,50 +26,18 @@
tabstop = 2;
softtabstop = 2;
showmode = false;
fillchars.eob = " ";
ignorecase = true;
smartcase = true;
mouse = "a";
};
# colorschemes.nightfox = {
# enable = true;
# settings = {
# # style = "moon";
# flavor = "carbonfox";
# options.transparent = true;
# styles = {
# sidebars = "transparent";
# floats = "transparent";
# };
# };
# };
colorschemes.base16 = {
enable = true;
settings = {
base00 = "11121d";
base01 = "282934";
base02 = "353747"; # slightly lighter than base01 (or reuse 282934)
base03 = "565b6b"; # comment color; you'll probably want to tweak this
base04 = "abb2bf";
base05 = "abb2bf";
base06 = "b2b9c6";
base07 = "ffffff";
base08 = "ee6d85";
base09 = "f3627a";
base0A = "dfae67";
base0B = "95c561";
base0C = "a485dd"; # no cyan in your palette, so purple works
base0D = "7199ee";
base0E = "a485dd";
base0F = "f3627a";
};
};
extraPlugins = [ pkgs.vimPlugins.boole-nvim ];
extraPlugins = with pkgs.vimPlugins; [
boole-nvim
tokyodark-nvim
];
extraConfigLua = ''
require('boole').setup({
mappings = {
@@ -81,6 +49,21 @@
{'true', 'false'}
}
})
require('tokyodark').setup({
gamma = 0.9,
transparent_background = true,
terminal_colors = false,
custom_highlights = function(_, palette)
return {
["@variable"] = {
fg = "#A0A8CD",
},
}
end,
})
vim.cmd.colorscheme("tokyodark")
'';
plugins = {
@@ -91,7 +74,19 @@
options = {
show_buffer_close_icons = false;
show_close_icon = false;
themable = true;
separator_style = "thin";
indicator.style = "none";
always_show_bufferline = false;
color_icons = true;
show_buffer_icons = true;
};
# highlights = {
# fill.bg = "NONE";
# separator.fg = "NONE";
# separator_selected.fg = "NONE";
# separator_visible.fg = "NONE";
# };
};
};
yazi.enable = true;
@@ -128,38 +123,12 @@
};
persisted.enable = true;
render-markdown.enable = true;
transparent = {
oil = {
enable = true;
autoLoad = true;
settings = {
groups = [
"Normal"
"NormalNC"
"Comment"
"Constant"
"Special"
"Identifier"
"Statement"
"PreProc"
"Type"
"Underlined"
"Todo"
"String"
"Function"
"Conditional"
"Repeat"
"Operator"
"Structure"
"LineNr"
"NonText"
"SignColumn"
"CursorLine"
"CursorLineNr"
"StatusLine"
"StatusLineNC"
"EndOfBuffer"
];
view_options = {
show_hidden = true;
};
};
};
};