diff --git a/.bashrc b/.bashrc index e6e877d..44434f7 100644 --- a/.bashrc +++ b/.bashrc @@ -6,7 +6,7 @@ esac alias l='ls -a' - +alias vi='nvim' function nixclean(){ @@ -39,3 +39,6 @@ function nrs(){ function tvn(){ tv nix } + +# Generated for envman. Do not edit. +[ -s "$HOME/.config/envman/load.sh" ] && source "$HOME/.config/envman/load.sh" diff --git a/nixos/configuration.nix b/nixos/configuration.nix index e915048..0b069d4 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -14,16 +14,23 @@ }) ]; nix.package = pkgs.lixPackageSets.stable.lix; - - imports = [ ./hardware-configuration.nix ./pkg.nix ./services.nix ]; + programs.nix-ld.libraries = with pkgs; [ + fontconfig + wayland + libx11 + libxcursor + libxext + libxi + + + ]; - boot.loader.systemd-boot.enable = true; networking.hostName = "f1ndm3"; @@ -34,7 +41,7 @@ users.users.supa = { isNormalUser = true; - extraGroups = [ "wheel" ]; + extraGroups = [ "wheel" "libvirtd" ]; }; users.defaultUserShell = pkgs.bash; @@ -45,12 +52,18 @@ hardware.graphics.enable = true; hardware.nvidia.open = true; - + # firewall networking.firewall.allowedTCPPorts = [ ]; networking.firewall.allowedUDPPorts = [ ]; networking.firewall.enable = true; + + # virtualisation + + virtualisation.libvirtd.enable = true; + virtualisation.spiceUSBRedirection.enable = true; + # Copy the NixOS configuration file and link it from the resulting system # (/run/current-system/configuration.nix). This is useful in case you diff --git a/nixos/pkg.nix b/nixos/pkg.nix index 42ae2e4..3a33c0a 100644 --- a/nixos/pkg.nix +++ b/nixos/pkg.nix @@ -35,6 +35,10 @@ tmux zip fastfetch + rar + winetricks + iftop + mise # gui #kitty @@ -43,7 +47,7 @@ firefox gimp vscodium.fhs - vesktop +# vesktop steam heroic protonup-qt @@ -53,14 +57,17 @@ xwininfo rewaita rpi-imager + calibre + audacity + thunderbird # lib + icu wmctrl git p7zip unzip - wine - wine64Packages.waylandFull + wineWow64Packages.stable jdk8 jdk11 jdk17 @@ -78,6 +85,9 @@ ripgrep wl-clipboard linuxPackages.rtl8821ce + zig + zls + go # misc gamemode @@ -99,4 +109,27 @@ programs.neovim.enable = true; programs.nix-ld.enable = true; + + programs.virt-manager.enable = true; + + programs.obs-studio = { + enable = true; + enableVirtualCamera = true; + + # optional Nvidia hardware acceleration + package = ( + pkgs.obs-studio.override { + cudaSupport = true; + } + ); + + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-backgroundremoval + obs-pipewire-audio-capture + obs-vaapi #optional AMD hardware acceleration + obs-gstreamer + obs-vkcapture + ]; + }; } diff --git a/nvim/init.lua b/nvim/init.lua index bef9876..ce03dfc 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -22,13 +22,14 @@ require('pckr').add{ 'https://github.com/neovim/nvim-lspconfig', 'neovim/nvim-lspconfig', 'nmac427/guess-indent.nvim', --- 'windwp/nvim-autopairs' + 'windwp/nvim-autopairs' } require('guess-indent').setup {} ---require('nvim-autopairs').setup {} +require('nvim-autopairs').setup {} vim.wo.number = true + vim.lsp.enable('lua_ls','bashls','pylsp','nixd','markdown_oxide') vim.opt.clipboard:append('unnamedplus')