diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | home.nix | 37 | ||||
| m--------- | home/dwm | 0 | ||||
| -rw-r--r-- | home/mpv.nix | 45 | ||||
| -rw-r--r-- | home/newsboat.nix | 1 | ||||
| -rw-r--r-- | home/st.nix | 53 |
8 files changed, 109 insertions, 43 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..22b5c65 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "home/dwm"] + path = home/dwm + url = https://github.com/mvinkio/dwm @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1686724286, - "narHash": "sha256-TREhlFfPlaOisADxKotzVqHpHwQE1JLeDBqgw7ke5PM=", + "lastModified": 1687647343, + "narHash": "sha256-1/o/i9KEFOBdlF9Cs04kBcqDFbYMt6W4SMqGa+QnnaI=", "owner": "nix-community", "repo": "home-manager", - "rev": "75b24cc557d4947ab46691142863e5a5db5c3f78", + "rev": "0ee5ab611dc1fbb5180bd7d88d2aeb7841a4d179", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1686592866, - "narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=", + "lastModified": 1687502512, + "narHash": "sha256-dBL/01TayOSZYxtY4cMXuNCBk8UMLoqRZA+94xiFpJA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05", + "rev": "3ae20aa58a6c0d1ca95c9b11f59a2d12eebc511f", "type": "github" }, "original": { @@ -52,6 +52,7 @@ ./home/packages.nix ./home/newsboat.nix ./home/kakoune.nix + ./home/mpv.nix ]; extraSpecialArgs = { inherit home-manager username email; @@ -137,41 +137,4 @@ enable = true; }; - xsession = { - enable = true; - initExtra = '' - wal -R & - ${pkgs.xorg.xmodmap}/bin/xmodmap -e "remove mod1 = Alt_R" - ${pkgs.xorg.xmodmap}/bin/xmodmap -e "add mod3 = Alt_R" - ''; - windowManager.spectrwm = { - enable = true; - programs = { - term = "st"; - search = "dmenu -ip -p 'Window name/id:'"; - browser = "firefox"; - lock = "slock"; - editor = "bash -c 'kakup'"; - projecteditor = "bash -c 'kakup .'"; - }; - bindings = { - lock = "Mod+s"; - browser = "Mod+w"; - term = "Mod+Return"; - restart = "Mod+Shift+r"; - quit = "Mod+Shift+q"; - editor = "Mod+e"; - projecteditor = "Mod+Shift+e"; - }; - settings = { - modkey = "Mod4"; - workspace_limit = 5; - focus_mode = "manual"; - focus_close = "next"; - bar_action = "spectrwmbar"; - bar_action_expand = 1; - bar_font_color = "grey, white, rgb:00/00/ff, rgb:ee/82/ee, rgb:4b/00/82, rgb:00/80/00, rgb:ff/ff/00, rgb:ff/a5/00, rgb:eb/40/34"; - }; - }; - }; } diff --git a/home/dwm b/home/dwm new file mode 160000 +Subproject 71560451d171b4fce469d1e6f6c3d21a0900a3e diff --git a/home/mpv.nix b/home/mpv.nix new file mode 100644 index 0000000..c5f65eb --- /dev/null +++ b/home/mpv.nix @@ -0,0 +1,45 @@ + +{ + flake, + config, + pkgs, + home-manager, + ... +}: { + programs.mpv = { + enable = true; + scripts = [ + (with pkgs; stdenv.mkDerivation rec { + pname = "mpv-sockets"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "wis"; + repo = "mpvSockets"; + rev = "be9b7ca84456466e54331bab59441ac207659c1c"; + sha256 = "sha256-tcY+cHvkQpVNohZ9yHpVlq0bU7iiKMxeUsO/BRwGzAs="; + }; + + # installFlags = [ "SCRIPTS_DIR=$(out)/share/mpv/scripts" ]; + passthru.scriptName = "mpvSockets.lua"; + installPhase = '' + install -m755 -D mpvSockets.lua $out/share/mpv/scripts/mpvSockets.lua + ''; + + meta = with lib; { + description = "mpvSockets lua module for mpv"; + homepage = "https://github.com/wis/mpvSockets"; + license = licenses.mit; + platforms = platforms.linux; + }; + }) + ]; + bindings = { + l="seek 5"; + h="seek -5"; + j="seek -60"; + k="seek 60"; + S="cycle sub"; + }; + }; +} diff --git a/home/newsboat.nix b/home/newsboat.nix index 4b9b2fd..fc47060 100644 --- a/home/newsboat.nix +++ b/home/newsboat.nix @@ -20,6 +20,7 @@ {url = "https://blog.alexellis.io/rss/";} {url = "https://www.openfaas.com/feed";} {url = "https://istio.io/latest/blog/feed.xml";} + {url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCUyeluBRhGPCW4rPe_UvBZQ";} ]; extraConfig = '' #show-read-feeds no diff --git a/home/st.nix b/home/st.nix index ca92789..bef8380 100644 --- a/home/st.nix +++ b/home/st.nix @@ -14,7 +14,60 @@ }; buildInputs = oldAttrs.buildInputs ++ [harfbuzz]; })); + + dwm-fork = with pkgs; (st.overrideAttrs (oldAttrs: rec { + src = ./dwm; + })); + + dwm-xsession = { + enable = true; + initExtra = '' + ${dwm-fork} + wal -R & + ${pkgs.xorg.xmodmap}/bin/xmodmap -e "remove mod1 = Alt_R" + ${pkgs.xorg.xmodmap}/bin/xmodmap -e "add mod3 = Alt_R" + ''; + }; + + spectrwm-xsession = { + enable = true; + initExtra = '' + wal -R & + ${pkgs.xorg.xmodmap}/bin/xmodmap -e "remove mod1 = Alt_R" + ${pkgs.xorg.xmodmap}/bin/xmodmap -e "add mod3 = Alt_R" + ''; + windowManager.spectrwm = { + enable = true; + programs = { + term = "st"; + search = "dmenu -ip -p 'Window name/id:'"; + browser = "firefox"; + lock = "slock"; + editor = "bash -c 'kakup'"; + projecteditor = "bash -c 'kakup .'"; + }; + bindings = { + lock = "Mod+s"; + browser = "Mod+w"; + term = "Mod+Return"; + restart = "Mod+Shift+r"; + quit = "Mod+Shift+q"; + editor = "Mod+e"; + projecteditor = "Mod+Shift+e"; + }; + settings = { + modkey = "Mod4"; + workspace_limit = 5; + focus_mode = "manual"; + focus_close = "next"; + bar_action = "spectrwmbar"; + bar_action_expand = 1; + bar_font_color = "grey, white, rgb:00/00/ff, rgb:ee/82/ee, rgb:4b/00/82, rgb:00/80/00, rgb:ff/ff/00, rgb:ff/a5/00, rgb:eb/40/34"; + }; + }; + }; in { + xsession = if (true) then dwm-xsession else spectrwm-xsession; home.packages = [ st-fork ]; |