diff options
| author | Patryk Niedźwiedziński <pniedzwiedzinski19@gmail.com> | 2020-11-14 14:45:38 +0100 |
|---|---|---|
| committer | Patryk Niedźwiedziński <pniedzwiedzinski19@gmail.com> | 2020-11-14 14:45:38 +0100 |
| commit | 9f4077d3579b9837fff78b8f36661c7abc41cd10 (patch) | |
| tree | b66cd8352cf09ea173c08cd8f9d687334fc2014e | |
| parent | 4ae8d686cd6db49120a6f307b07b2ce03938af42 (diff) | |
| download | dots-9f4077d3579b9837fff78b8f36661c7abc41cd10.tar.gz dots-9f4077d3579b9837fff78b8f36661c7abc41cd10.zip | |
Update
| -rw-r--r-- | home.nix | 6 | ||||
| -rw-r--r-- | platforms/linux/configuration.nix | 9 | ||||
| -rw-r--r-- | platforms/linux/xorg/config.h | 2 | ||||
| -rw-r--r-- | programs/mpv.nix | 8 | ||||
| -rw-r--r-- | programs/newsboat/urls | 1 | ||||
| -rw-r--r-- | programs/zsh/default.nix | 2 | ||||
| -rw-r--r-- | programs/zsh/zprofile | 4 |
7 files changed, 26 insertions, 6 deletions
diff --git a/home.nix b/home.nix index 017bc7d..2ccf390 100644 --- a/home.nix +++ b/home.nix @@ -29,6 +29,10 @@ in # Let Home Manager install and manage itself. programs.home-manager.enable = true; + programs.obs-studio = { + enable = true; + plugins = with pkgs; [ obs-wlrobs obs-v4l2sink ]; + }; # Home Manager needs a bit of information about you and the # paths it should manage. @@ -41,6 +45,7 @@ in ./programs/zsh ./programs/newsboat ./programs/git.nix + ./programs/mpv.nix ./programs/sent ] ++ platformSetup; @@ -66,6 +71,7 @@ in browserpass minecraft spotify-tui + spotifyd # gimp slack-dark signal-desktop diff --git a/platforms/linux/configuration.nix b/platforms/linux/configuration.nix index ec64b83..dcf2e1b 100644 --- a/platforms/linux/configuration.nix +++ b/platforms/linux/configuration.nix @@ -53,6 +53,15 @@ in boot.plymouth.enable = true; boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; + boot.extraModulePackages = with pkgs.linuxPackages; [ + v4l2loopback + ]; + + boot.kernelModules = [ "v4l2loopback" ]; + boot.extraModprobeConfig = '' + options v4l2loopback exclusive_caps=1 video_nr=9 card_label="obs" + ''; + fileSystems = { "/home" = { device = "/dev/disk/by-label/home"; diff --git a/platforms/linux/xorg/config.h b/platforms/linux/xorg/config.h index b8d1bab..a3287dd 100644 --- a/platforms/linux/xorg/config.h +++ b/platforms/linux/xorg/config.h @@ -190,7 +190,7 @@ static Key keys[] = { /* { MODKEY|ShiftMask, XK_z, spawn, SHCMD("") }, */ { MODKEY, XK_x, incrgaps, {.i = -3 } }, /* { MODKEY|ShiftMask, XK_x, spawn, SHCMD("") }, */ - /* { MODKEY, XK_c, spawn, SHCMD("") }, */ + { MODKEY, XK_c, spawn, SHCMD("Discord") }, /* { MODKEY|ShiftMask, XK_c, spawn, SHCMD("") }, */ /* V is automatically bound above in STACKKEYS */ { MODKEY, XK_b, togglebar, {0} }, diff --git a/programs/mpv.nix b/programs/mpv.nix new file mode 100644 index 0000000..ba3dc0b --- /dev/null +++ b/programs/mpv.nix @@ -0,0 +1,8 @@ +{ + programs.mpv = { + enable = true; + config = { + ytdl-format = "bestvideo[height<=?1080][fps<=?30]+bestaudio/best"; + }; + }; +} diff --git a/programs/newsboat/urls b/programs/newsboat/urls index be83b34..8b2c797 100644 --- a/programs/newsboat/urls +++ b/programs/newsboat/urls @@ -8,6 +8,7 @@ https://puszcza.netlify.app/rss.xml "~19PDH Puszcza (www)" ## Personal personal "~## PERSONAL ##" +https://proxy.vulpes.one/gemini/niedzwiedzinski.cyou/feed.xml #https://bridge.suumitsu.eu/?action=display&bridge=Facebook&context=Group&g=EarthshipPolska&limit=-1&format=Atom "~Earthship Polska (FB)" "personal" https://www.poznan.pl/mim/feeds/rss.xml "~Poznań" #https://tvn24.pl/najwazniejsze.xml "~Polska" diff --git a/programs/zsh/default.nix b/programs/zsh/default.nix index 9b4677c..7083043 100644 --- a/programs/zsh/default.nix +++ b/programs/zsh/default.nix @@ -36,8 +36,6 @@ in VISUAL = EDITOR; GIT_EDITOR = EDITOR; - GOPATH = "$HOME"; - PATH = "$HOME/.emacs.d/bin:$HOME/bin:$PATH"; }; # envExtra diff --git a/programs/zsh/zprofile b/programs/zsh/zprofile index bc409d3..38288a1 100644 --- a/programs/zsh/zprofile +++ b/programs/zsh/zprofile @@ -6,9 +6,7 @@ # to clean up. # Adds `~/.local/bin` to $PATH -export PATH="$PATH:$(du "$HOME/.local/bin/" | cut -f2 | paste -sd ':')" -# Adds /apps to $PATH -export PATH=$PATH:/apps +export PATH="$(du "$HOME/.local/bin/" | cut -f2 | paste -sd ':'):$PATH" # Adds gopath to $PATH export PATH=$PATH:~/.local/share/go/bin # Adds scripts to $PATH |