back to 555 drivers
This commit is contained in:
parent
c6760f06bc
commit
96abbb54bf
11 changed files with 29 additions and 262 deletions
26
flake.nix
26
flake.nix
|
@ -8,7 +8,6 @@
|
|||
];
|
||||
imports = [
|
||||
inputs.treefmt-nix.flakeModule
|
||||
# #./flake/pre-commit
|
||||
./parts/shell.nix
|
||||
./parts/fmt.nix
|
||||
];
|
||||
|
@ -24,17 +23,22 @@
|
|||
|
||||
# Unstable nixpkgs baby!
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
|
||||
# nixpkgs for wayland
|
||||
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
|
||||
|
||||
# Sandboxing
|
||||
nixpak = {
|
||||
url = "github:nixpak/nixpak";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# Lix because fast rebuild times are cool
|
||||
lix-module = {
|
||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
|
||||
|
@ -49,11 +53,13 @@
|
|||
|
||||
# Hyprland, my main compositor
|
||||
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
|
||||
|
||||
# Plugins for hyprland
|
||||
hyprland-plugins = {
|
||||
url = "github:hyprwm/hyprland-plugins";
|
||||
inputs.hyprland.follows = "hyprland";
|
||||
};
|
||||
|
||||
# Plugin to get split monitor workspaces
|
||||
split-monitor-workspaces = {
|
||||
url = "github:Duckonaut/split-monitor-workspaces";
|
||||
|
@ -71,30 +77,23 @@
|
|||
url = "github:notashelf/nvf";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixvim = {
|
||||
url = "github:nix-community/nixvim";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
|
||||
|
||||
doomemacs = {
|
||||
url = "github:doomemacs/doomemacs";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
emacs-overlay.url = "github:nix-community/emacs-overlay";
|
||||
doom-emacs-config = {
|
||||
url = "github:bloxx12/doom-emacs-config";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
anyrun = {
|
||||
url = "github:Kirottu/anyrun";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# Stylix my beloved
|
||||
stylix.url = "github:danth/stylix";
|
||||
|
||||
# Aylur's gtk shell. Nice but I hate JS.
|
||||
ags.url = "github:Aylur/ags";
|
||||
|
||||
quickshell = {
|
||||
url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
@ -107,6 +106,7 @@
|
|||
nixpak.follows = "nixpak";
|
||||
};
|
||||
};
|
||||
|
||||
spicetify-nix.url = "github:the-argus/spicetify-nix";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,7 +4,6 @@ _: {
|
|||
../../../options/common/bluetooth.nix
|
||||
../../../options/desktop/fonts.nix
|
||||
../../../options/common/networking.nix
|
||||
../../../options/common/docs.nix
|
||||
../../../options/common/gpu/nvidia.nix
|
||||
../../../options/desktop/monitors.nix
|
||||
];
|
||||
|
|
|
@ -90,7 +90,7 @@ in {
|
|||
signal-desktop-beta
|
||||
smartmontools
|
||||
telegram-desktop
|
||||
texliveFull
|
||||
temurin-jre-bin-17
|
||||
tldr
|
||||
thunderbird
|
||||
tor-browser-bundle-bin
|
||||
|
|
|
@ -87,6 +87,7 @@ in {
|
|||
smartmontools
|
||||
teamspeak_client
|
||||
telegram-desktop
|
||||
temurin-bin-17
|
||||
tldr
|
||||
thunderbird
|
||||
tor-browser
|
||||
|
|
|
@ -90,11 +90,9 @@
|
|||
all-the-icons-dired
|
||||
avy
|
||||
beacon
|
||||
#better-jumper
|
||||
catppuccin-theme
|
||||
company
|
||||
crux
|
||||
#cmake-font-lock
|
||||
dimmer
|
||||
dired-du
|
||||
dired-open
|
||||
|
@ -107,15 +105,10 @@
|
|||
evil-goggles
|
||||
erc
|
||||
erc-hl-nicks
|
||||
# face-explorer
|
||||
flycheck
|
||||
form-feed
|
||||
general
|
||||
# frames-only-mode
|
||||
# fussy
|
||||
# groovy-mode
|
||||
hl-todo
|
||||
# just-mode
|
||||
kotlin-mode
|
||||
ligature
|
||||
lsp-mode
|
||||
|
|
|
@ -14,15 +14,7 @@
|
|||
|
||||
cfg = config.modules.system.programs.editors.neovim;
|
||||
nvf = inputs.neovim-flake;
|
||||
inherit (nvf.lib.nvim.dag) entryBefore entryAnywhere;
|
||||
|
||||
mkRuntimeDir = name: let
|
||||
finalPath = ./runtime + /${name};
|
||||
in
|
||||
path {
|
||||
name = "nvim-runtime-${name}";
|
||||
path = toString finalPath;
|
||||
};
|
||||
inherit (nvf.lib.nvim.dag) entryBefore;
|
||||
in {
|
||||
config = mkIf cfg.enable {
|
||||
programs.neovim-flake = {
|
||||
|
|
10
modules/system/boot/grub-boot.nix
Normal file
10
modules/system/boot/grub-boot.nix
Normal file
|
@ -0,0 +1,10 @@
|
|||
{pkgs, ...}: {
|
||||
boot.loader = {
|
||||
efi.canTouchEfiVariables = true;
|
||||
grub = {
|
||||
enable = true;
|
||||
efiSupport = true;
|
||||
device = "nodev";
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,194 +0,0 @@
|
|||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.modules.programs.neovim-old;
|
||||
inherit (config.modules.other.system) username;
|
||||
in {
|
||||
options.modules.programs.neovim-old.enable = mkEnableOption "neovim-old";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home-manager.users.${username} = {
|
||||
imports = [inputs.nixvim.homeManagerModules.nixvim];
|
||||
programs.nixvim = {
|
||||
enable = true;
|
||||
enableMan = true;
|
||||
defaultEditor = true;
|
||||
|
||||
opts = {
|
||||
background = "dark";
|
||||
shiftwidth = 4;
|
||||
autoread = true;
|
||||
cmdheight = 1;
|
||||
encoding = "utf8";
|
||||
expandtab = true;
|
||||
hidden = true;
|
||||
ignorecase = true;
|
||||
linebreak = true;
|
||||
mousemoveevent = true;
|
||||
number = true;
|
||||
relativenumber = true;
|
||||
showmatch = true;
|
||||
smartcase = true;
|
||||
smartindent = true;
|
||||
smarttab = true;
|
||||
so = 7;
|
||||
timeoutlen = 500;
|
||||
tabstop = 4;
|
||||
updatetime = 50;
|
||||
};
|
||||
|
||||
globals.mapleader = " ";
|
||||
|
||||
plugins = {
|
||||
lualine = {
|
||||
enable = true;
|
||||
theme = "catppuccin";
|
||||
};
|
||||
treesitter = {
|
||||
enable = true;
|
||||
folding = false;
|
||||
indent = true;
|
||||
nixvimInjections = true;
|
||||
incrementalSelection.enable = true;
|
||||
};
|
||||
treesitter-context = {enable = true;};
|
||||
coq-nvim = {
|
||||
enable = true;
|
||||
installArtifacts = true;
|
||||
settings = {
|
||||
auto_start = "shut-up";
|
||||
keymap.recommended = true;
|
||||
completion.always = false;
|
||||
};
|
||||
};
|
||||
neo-tree = {enable = true;};
|
||||
# TODO laytan/cloak.nvim
|
||||
lsp = {
|
||||
enable = true;
|
||||
servers = {
|
||||
rust-analyzer = {
|
||||
enable = true;
|
||||
installCargo = false;
|
||||
installRustc = false;
|
||||
};
|
||||
lua-ls.enable = true;
|
||||
ccls.enable = true;
|
||||
nil_ls.enable = true;
|
||||
bashls.enable = true;
|
||||
tsserver.enable = true;
|
||||
java-language-server.enable = true;
|
||||
#pylyzer.enable = true;
|
||||
rnix-lsp.enable = true;
|
||||
pyright.enable = true;
|
||||
};
|
||||
#onAttach = ''
|
||||
# vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
|
||||
# local bufopts = { noremap = true, silent = true, buffer = bufnr }
|
||||
# vim.keymap.set('n', '<space>wl', function()
|
||||
# print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||
# end, bufopts)
|
||||
# vim.keymap.set('n', '<C-f>', function() vim.lsp.buf.format { async = true } end, bufopts)
|
||||
#'';
|
||||
keymaps = {
|
||||
lspBuf = {
|
||||
gD = "declaration";
|
||||
gd = "definition";
|
||||
K = "hover";
|
||||
gi = "implementation";
|
||||
"<C-k>" = "signature_help";
|
||||
"<leader>wa" = "add_workspace_folder";
|
||||
"<leader>wr" = "remove_workspace_folder";
|
||||
"<leader>wl" = "list_workspace_folders";
|
||||
"<leader>D" = "type_definition";
|
||||
"<leader>r" = "rename";
|
||||
"<leader>a" = "code_action";
|
||||
gr = "references";
|
||||
"<C-f>" = "format";
|
||||
};
|
||||
diagnostic = {
|
||||
"<leader>e" = "open_float";
|
||||
"<leader>j" = "goto_prev";
|
||||
"<leader>k" = "goto_next";
|
||||
"<leader>q" = "setloclist";
|
||||
};
|
||||
silent = true;
|
||||
};
|
||||
};
|
||||
rust-tools = {
|
||||
enable = true;
|
||||
crateGraph = {
|
||||
enabledGraphvizBackends = ["png" "svg"];
|
||||
backend = "x11";
|
||||
};
|
||||
inlayHints = {
|
||||
auto = true;
|
||||
onlyCurrentLine = true;
|
||||
showParameterHints = true;
|
||||
};
|
||||
};
|
||||
fidget.enable = true;
|
||||
telescope = {
|
||||
enable = true;
|
||||
keymaps = {
|
||||
"<leader>ff" = "find_files";
|
||||
"<leader>fg" = "git_files";
|
||||
"<leader>fs" = "live_grep";
|
||||
"<leader>fb" = "buffers";
|
||||
"<leader>fh" = "help_tags";
|
||||
};
|
||||
keymapsSilent = true;
|
||||
};
|
||||
comment.enable = true;
|
||||
harpoon = {
|
||||
enable = true;
|
||||
package = pkgs.vimPlugins.harpoon.overrideAttrs {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "ThePrimeagen";
|
||||
repo = "harpoon";
|
||||
rev = "a38be6e0dd4c6db66997deab71fc4453ace97f9c";
|
||||
hash = "sha256-RjwNUuKQpLkRBX3F9o25Vqvpu3Ah1TCFQ5Dk4jXhsbI=";
|
||||
};
|
||||
};
|
||||
enableTelescope = true;
|
||||
keymapsSilent = false;
|
||||
};
|
||||
markdown-preview = {
|
||||
enable = true;
|
||||
settings.theme = "dark";
|
||||
};
|
||||
};
|
||||
|
||||
extraPlugins = with pkgs.vimPlugins; [zen-mode-nvim lazygit-nvim];
|
||||
|
||||
keymaps = [
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>pv";
|
||||
action = "<cmd>Explore<CR>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>w";
|
||||
action = "<cmd>w<CR>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>qw";
|
||||
action = "<cmd>q<CR>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>gg";
|
||||
action = "<cmd>LazyGit<CR>";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -341,7 +341,7 @@ in {
|
|||
|
||||
"[workspace special:keepassxc; silent;tile] ${pkgs.keepassxc}/bin/keepassxc"
|
||||
|
||||
#"${swww}/bin/swww-daemon"
|
||||
"${swww}/bin/swww-daemon"
|
||||
|
||||
"${wlsunset}/bin/wlsunset -S 06:00 -s 20:00"
|
||||
];
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
documentation = {
|
||||
enable = true;
|
||||
dev.enable = true;
|
||||
doc.enable = false;
|
||||
info.enable = false;
|
||||
man = {
|
||||
enable = true;
|
||||
generateCaches = false;
|
||||
man-db.enable = false;
|
||||
mandoc.enable = true;
|
||||
};
|
||||
nixos = {
|
||||
includeAllModules = false;
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
man-pages
|
||||
man-pages-posix
|
||||
];
|
||||
}
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
{config, ...}: {
|
||||
services.xserver.videoDrivers = ["nvidia"];
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
|
@ -13,14 +9,6 @@
|
|||
powerManagement.enable = false;
|
||||
powerManagement.finegrained = false;
|
||||
nvidiaSettings = false;
|
||||
# package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
|
||||
version = "560.28.03";
|
||||
sha256_64bit = "sha256-martv18vngYBJw1IFUCAaYr+uc65KtlHAMdLMdtQJ+Y=";
|
||||
sha256_aarch64 = "sha256-+u0ZolZcZoej4nqPGmZn5qpyynLvu2QSm9Rd3wLdDmM=";
|
||||
openSha256 = "sha256-asGpqOpU0tIO9QqceA8XRn5L27OiBFuI9RZ1NjSVwaM=";
|
||||
settingsSha256 = "sha256-b4nhUMCzZc3VANnNb0rmcEH6H7SK2D5eZIplgPV59c8=";
|
||||
persistencedSha256 = "sha256-MhITuC8tH/IPhCOUm60SrPOldOpitk78mH0rg+egkTE=";
|
||||
};
|
||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue