mirror of
https://github.com/sadan4/dotfiles.git
synced 2025-06-20 19:27:03 -04:00
nvim added
This commit is contained in:
sadanslargehole
parent
f915112ce5
commit
c3c790052f
9 changed files with 210 additions and 150 deletions
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
[submodule "dotfiles/nvim"]
|
||||
path = dotfiles/nvim
|
||||
url = git@github.com:sadanslargehole/nvim.git
|
||||
|
|
@ -7,7 +7,8 @@
|
|||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
[
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
|
|
@ -16,8 +17,8 @@
|
|||
boot.loader.grub.efiSupport = true;
|
||||
boot.loader.grub.useOSProber = true;
|
||||
boot.loader.grub.efiInstallAsRemovable = true;
|
||||
boot.kernelModules = ["i2c_dev"];
|
||||
hardware.bluetooth.enable = true;
|
||||
boot.kernelModules = [ "i2c_dev" ];
|
||||
hardware.bluetooth.enable = true;
|
||||
|
||||
networking.hostName = "nix-desktop-evo4b5"; # Define your hostname.
|
||||
# Pick only one of the below networking options.
|
||||
|
|
@ -34,13 +35,13 @@ hardware.bluetooth.enable = true;
|
|||
# keyMap = "us";
|
||||
# useXkbConfig = true; # use xkb.options in tty.
|
||||
# };
|
||||
services.xserver = {
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
displayManager.sddm = {
|
||||
enable = true;
|
||||
};
|
||||
desktopManager.plasma6.enable = true;
|
||||
};
|
||||
};
|
||||
# Enable the X11 windowing system.
|
||||
# servives.desktopManager.plasma6.enable = true;
|
||||
# services.desktopManager.plasma6.enable = true;
|
||||
|
|
@ -53,7 +54,7 @@ services.xserver = {
|
|||
|
||||
# Enable CUPS to print documents.
|
||||
services.printing.enable = true;
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
# Enable sound.
|
||||
sound.enable = true;
|
||||
services.pipewire = {
|
||||
|
|
@ -72,32 +73,35 @@ services.xserver = {
|
|||
isNormalUser = true;
|
||||
extraGroups = [
|
||||
"wheel" # Enable ‘sudo’ for the user.
|
||||
"audio" "sound" "video"
|
||||
"audio"
|
||||
"sound"
|
||||
"video"
|
||||
"networkmanager"
|
||||
"input" "tty"
|
||||
"input"
|
||||
"tty"
|
||||
];
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
|
||||
|
||||
|
||||
programs.zsh.enable = true;
|
||||
programs.zsh.enable = true;
|
||||
programs.steam.enable = true;
|
||||
programs.steam.extraCompatPackages = with pkgs; [
|
||||
proton-ge-bin
|
||||
];
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
|
||||
|
||||
home-manager = {
|
||||
extraSpecialArgs = {inherit inputs;};
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
users = {
|
||||
"meyer" = import ./home.nix;
|
||||
};
|
||||
};
|
||||
# networking.nameservers = ["10.0.0.97" "1.1.1.1"];
|
||||
networking.nameservers = ["10.0.0.97"];
|
||||
# networking.nameservers = ["10.0.0.97" "1.1.1.1"];
|
||||
networking.nameservers = [ "10.0.0.97" ];
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
|
@ -120,18 +124,18 @@ networking.nameservers = ["10.0.0.97"];
|
|||
libnotify
|
||||
file
|
||||
];
|
||||
#LD fix
|
||||
programs.nix-ld.enable = true;
|
||||
programs.nix-ld.libraries = with pkgs; [
|
||||
pkgs.curlWithGnuTls
|
||||
];
|
||||
programs.ssh.startAgent = true;
|
||||
programs.ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass";
|
||||
#LD fix
|
||||
programs.nix-ld.enable = true;
|
||||
programs.nix-ld.libraries = with pkgs; [
|
||||
pkgs.curlWithGnuTls
|
||||
];
|
||||
programs.ssh.startAgent = true;
|
||||
programs.ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass";
|
||||
|
||||
programs.gnupg.agent = {
|
||||
enable = true;
|
||||
pinentryPackage = pkgs.pinentry-gnome3;
|
||||
};
|
||||
programs.gnupg.agent = {
|
||||
enable = true;
|
||||
pinentryPackage = pkgs.pinentry-gnome3;
|
||||
};
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
# started in user sessions.
|
||||
# programs.mtr.enable = true;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,8 @@
|
|||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
||||
|
|
@ -14,19 +15,20 @@
|
|||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/789aab6a-3f46-4023-9aab-0569bb06bcde";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/789aab6a-3f46-4023-9aab-0569bb06bcde";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/FA5C-26B6";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/FA5C-26B6";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/8d59260c-90c4-440e-8ac6-f0135e90451f"; }
|
||||
];
|
||||
[{ device = "/dev/disk/by-uuid/8d59260c-90c4-440e-8ac6-f0135e90451f"; }];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ config, pkgs, inputs, ... }:
|
||||
|
||||
let
|
||||
cpkg = import ../../customPackages {inherit pkgs;};
|
||||
let
|
||||
cpkg = import ../../customPackages { inherit pkgs; };
|
||||
|
||||
in
|
||||
{
|
||||
programs.zsh.enable = true;
|
||||
programs.zsh.enable = true;
|
||||
programs.zsh.oh-my-zsh.enable = true;
|
||||
programs.zsh.initExtra = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme" + "\n" + "source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" + "\n" + "[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh";
|
||||
programs.zsh.initExtra = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme" + "\n" + "source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" + "\n" + "[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh";
|
||||
nixpkgs.config.allowUnfreePredicate = (pkg: true);
|
||||
# Home Manager needs a bit of information about you and the paths it should
|
||||
# nixpkg.config.allowUnfree = true;
|
||||
|
|
@ -37,13 +37,13 @@ programs.zsh.initExtra = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel1
|
|||
zsh-syntax-highlighting
|
||||
hello
|
||||
gh
|
||||
(prismlauncher.override {
|
||||
jdks = [
|
||||
jdk8
|
||||
jdk17
|
||||
jdk19
|
||||
];
|
||||
})
|
||||
(prismlauncher.override {
|
||||
jdks = [
|
||||
jdk8
|
||||
jdk17
|
||||
jdk19
|
||||
];
|
||||
})
|
||||
ksshaskpass
|
||||
libsForQt5.kinit
|
||||
fzf
|
||||
|
|
@ -53,7 +53,7 @@ jdk19
|
|||
#C AND CXX END
|
||||
|
||||
#PYTHONSTART
|
||||
(python39.withPackages(ps: with ps;[
|
||||
(python39.withPackages (ps: with ps;[
|
||||
evdev
|
||||
xlib
|
||||
]))
|
||||
|
|
@ -161,10 +161,10 @@ jdk19
|
|||
EDITOR = "nvim";
|
||||
MANPAGER = "nvim +Man!";
|
||||
MANWIDTH = "999";
|
||||
SSH_ASKPASS_REQUIRE="prefer";
|
||||
PRISMA_QUERY_ENGINE_BINARY="${pkgs.prisma-engines}/bin/query-engine";
|
||||
PRISMA_SCHEMA_ENGINE_BINARY="${pkgs.prisma-engines}/bin/schema-engine";
|
||||
PRISMA_QUERY_ENGINE_LIBRARY="${pkgs.prisma-engines}/lib/libquery_engine.node";
|
||||
SSH_ASKPASS_REQUIRE = "prefer";
|
||||
PRISMA_QUERY_ENGINE_BINARY = "${pkgs.prisma-engines}/bin/query-engine";
|
||||
PRISMA_SCHEMA_ENGINE_BINARY = "${pkgs.prisma-engines}/bin/schema-engine";
|
||||
PRISMA_QUERY_ENGINE_LIBRARY = "${pkgs.prisma-engines}/lib/libquery_engine.node";
|
||||
};
|
||||
|
||||
# Let Home Manager install and manage itself.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{pkgs}:rec{
|
||||
# discord = nixpkgs.callPackage ./discord { };
|
||||
discord = pkgs.callPackage ./discord/default.nix {};
|
||||
vesktop = pkgs.callPackage ./vesktop/default.nix {inherit vencord;};
|
||||
vencord = pkgs.callPackage ./vencord/default.nix {};
|
||||
{ pkgs }: rec{
|
||||
# discord = nixpkgs.callPackage ./discord { };
|
||||
discord = pkgs.callPackage ./discord/default.nix { };
|
||||
vesktop = pkgs.callPackage ./vesktop/default.nix { inherit vencord; };
|
||||
vencord = pkgs.callPackage ./vencord/default.nix { };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,67 @@
|
|||
{ pname, version, src, meta, binaryName, desktopName, autoPatchelfHook
|
||||
, makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk
|
||||
, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf
|
||||
, glib, gtk3, libcxx, libdrm, libglvnd, libnotify, libpulseaudio, libuuid, libX11
|
||||
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
|
||||
, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss
|
||||
, pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand
|
||||
{ pname
|
||||
, version
|
||||
, src
|
||||
, meta
|
||||
, binaryName
|
||||
, desktopName
|
||||
, autoPatchelfHook
|
||||
, makeDesktopItem
|
||||
, lib
|
||||
, stdenv
|
||||
, wrapGAppsHook
|
||||
, makeShellWrapper
|
||||
, alsa-lib
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
, atk
|
||||
, cairo
|
||||
, cups
|
||||
, dbus
|
||||
, expat
|
||||
, fontconfig
|
||||
, freetype
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gtk3
|
||||
, libcxx
|
||||
, libdrm
|
||||
, libglvnd
|
||||
, libnotify
|
||||
, libpulseaudio
|
||||
, libuuid
|
||||
, libX11
|
||||
, libXScrnSaver
|
||||
, libXcomposite
|
||||
, libXcursor
|
||||
, libXdamage
|
||||
, libXext
|
||||
, libXfixes
|
||||
, libXi
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, libXtst
|
||||
, libxcb
|
||||
, libxshmfence
|
||||
, mesa
|
||||
, nspr
|
||||
, nss
|
||||
, pango
|
||||
, systemd
|
||||
, libappindicator-gtk3
|
||||
, libdbusmenu
|
||||
, writeScript
|
||||
, python3
|
||||
, runCommand
|
||||
, libunity
|
||||
, speechd
|
||||
, wayland
|
||||
, branch
|
||||
, withOpenASAR ? false, openasar
|
||||
, withVencord ? true, vencord
|
||||
, withTTS ? true }:
|
||||
, withOpenASAR ? false
|
||||
, openasar
|
||||
, withVencord ? true
|
||||
, vencord
|
||||
, withTTS ? true
|
||||
}:
|
||||
|
||||
let
|
||||
disableBreakingUpdates = runCommand "disable-breaking-updates.py"
|
||||
|
|
|
|||
1
dotfiles/nvim
Submodule
1
dotfiles/nvim
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit e8190de318225a7f00b45bcddf97db5fb8e135b3
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
{
|
||||
nixosConfigurations = {
|
||||
default = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {inherit inputs;};
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./boxes/desktop/configuration.nix
|
||||
inputs.home-manager.nixosModules.default
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue