From 488a66f3e4ba40b0f1a9eed0bba2e80d9c3a1dfc Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Fri, 22 Mar 2024 00:19:15 +0530 Subject: [PATCH] [feat] Added stuff --- common/home.nix | 35 +++++++++++++++++++---------------- common/nvim.nix | 14 ++++++++++++++ flake.nix | 5 +++++ nixos/ryu.nix | 10 +++++++++- overlays.nix | 9 +++++++++ 5 files changed, 56 insertions(+), 17 deletions(-) diff --git a/common/home.nix b/common/home.nix index 756a49a6..6ac0d7b4 100644 --- a/common/home.nix +++ b/common/home.nix @@ -14,34 +14,35 @@ ./nvim.nix ./goread.nix ./ncmpcpp.nix - # ./neomutt.nix ] ++ lib.optionals device.isLinux [../linux]; home.packages = with pkgs; [ - sony-headphones-client + spotify-player + sd go - p7zip - picat - spotdl - davis pandoc - gnupg - gpg-tui - slack - yarn - spotify-player - qmk nodejs neovide sqls vcpkg - file - yt-dlp gh just + yarn + + # Misc + qmk + p7zip + yt-dlp + spotdl + picat + davis + gnupg + gpg-tui + + file jq tldr bottom @@ -61,9 +62,11 @@ (nerdfonts.override {fonts = ["Hasklig"];}) pfetch-rs psst - abaddon ] ++ lib.optionals device.isLinux [ + sony-headphones-client + abaddon + rr mpv catppuccinThemes.gtk catppuccinThemes.papirus-folders @@ -97,7 +100,7 @@ programs = { direnv = { enable = true; - # enableFishIntegration = true; + # enableFishIntegration = true; // Auto enabled enableNushellIntegration = true; nix-direnv.enable = true; }; diff --git a/common/nvim.nix b/common/nvim.nix index 10e5cc20..1ddf6e2a 100644 --- a/common/nvim.nix +++ b/common/nvim.nix @@ -26,6 +26,9 @@ telescope-dap-nvim octo-nvim + # Debuggging + nvim-dap-rr + # Treesitter stuff outline-nvim @@ -451,6 +454,17 @@ enable_builtin = false, default_remote = {"upstream", "origin"}; }) + + local rr_dap = require('nvim-dap-rr') + rr_dap.setup({ + mappings = { + continue = "" + }, + }) + + local dap = require'dap'; + dap.configurations.rust = { rr_dap.get_rust_config() } + dap.configurations.cpp = { rr_dap.get_config() } ''; package = pkgs.neovim-nightly; }; diff --git a/flake.nix b/flake.nix index b772e978..7ef326b7 100644 --- a/flake.nix +++ b/flake.nix @@ -100,6 +100,11 @@ system = "aarch64-darwin"; user = "fs0c131y"; } + { + name = "Serviuss-iMac-Pro"; + system = "x86_64-darwin"; + user = "servius"; + } { name = "SteamDeck"; system = "x86_64-linux"; diff --git a/nixos/ryu.nix b/nixos/ryu.nix index 5113f29e..13ea3e02 100644 --- a/nixos/ryu.nix +++ b/nixos/ryu.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: { @@ -16,6 +15,15 @@ driSupport32Bit = true; }; + virtualisation.libvirtd.enable = true; + users.extraUsers.servius.extraGroups = ["libvirtd"]; + + boot.extraModprobeConfig = '' + options kvm_intel nested=1 + options kvm_intel emulate_invalid_guest_state=0 + options kvm ignore_msrs=1 + ''; + services.xserver.videoDrivers = ["nvidia"]; # or "nvidiaLegacy470 etc. hardware.nvidia = { # Modesetting is required. diff --git a/overlays.nix b/overlays.nix index a718f0ec..3fea429f 100644 --- a/overlays.nix +++ b/overlays.nix @@ -130,6 +130,15 @@ sha256 = "sha256-S1LJXmShhpCJIg/FEPx3jFbmPpS/1U4MAQN2RY/nkI0"; }; }; + nvim-dap-rr = final.pkgs.vimUtils.buildVimPlugin { + name = "nvim-dap-rr"; + src = final.pkgs.fetchFromGitHub { + owner = "jonboh"; + repo = "nvim-dap-rr"; + rev = "master"; + sha256 = "sha256-JNztLTSyHmEmh3xT4WR0cpP25vjZ4A6aQbnU49U6+Ss"; + }; + }; sqls-nvim = final.pkgs.vimUtils.buildVimPlugin { name = "sqls-nvim"; src = final.pkgs.fetchFromGitHub {