diff --git a/flake.lock b/flake.lock index 632b8e7..ab20067 100644 --- a/flake.lock +++ b/flake.lock @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1718526747, - "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", + "lastModified": 1718788307, + "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", + "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", "type": "github" }, "original": { @@ -258,11 +258,11 @@ ] }, "locked": { - "lastModified": 1718141734, - "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", + "lastModified": 1718526747, + "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", + "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1717976995, - "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=", + "lastModified": 1718662658, + "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "315aa649ba307704db0b16c92f097a08a65ec955", + "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", "type": "github" }, "original": { @@ -430,11 +430,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1718318537, - "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", + "lastModified": 1718530797, + "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", + "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "type": "github" }, "original": { @@ -446,11 +446,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718541509, - "narHash": "sha256-TmC5TxW5WPAfmovDzi1hLe1i4qqND79s9SH9UOKcSvo=", + "lastModified": 1718632497, + "narHash": "sha256-YtlyfqOdYMuu7gumZtK0Kg7jr4OKfHUhJkZfNUryw68=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba06293cdba1c94af9710024abf3b94cf8d76349", + "rev": "c58b4a9118498c1055c5908a5bbe666e56abe949", "type": "github" }, "original": { @@ -462,11 +462,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1718632497, - "narHash": "sha256-YtlyfqOdYMuu7gumZtK0Kg7jr4OKfHUhJkZfNUryw68=", + "lastModified": 1718770573, + "narHash": "sha256-tnNrZhmle3RE6DtLFADO+nRy0QuzQp4ztVK0R4tUHSA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58b4a9118498c1055c5908a5bbe666e56abe949", + "rev": "31a131649c0bcd9d7d9b87786b3fbb54b4dbe6e0", "type": "github" }, "original": { @@ -490,11 +490,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718614971, - "narHash": "sha256-ID/Fvvd9Bz01gpm36mIfjoqXIknb2WkacSukW75cRNw=", + "lastModified": 1718739916, + "narHash": "sha256-VgRcAEeS8/ZSZgcwg1hYltavagEo47ZsmR7cRZ6VbRY=", "owner": "nix-community", "repo": "nixvim", - "rev": "b822078ec1b2bbf666af767061e29575edc5ec05", + "rev": "0e93a59567d0850e54cea26b1b5c541a7182c7cf", "type": "github" }, "original": { @@ -505,11 +505,11 @@ }, "nur": { "locked": { - "lastModified": 1718649005, - "narHash": "sha256-1Aw+JgGQK6e9MZdV4cbO1d3GRvYRKbwOvmet5gSFwvE=", + "lastModified": 1718789152, + "narHash": "sha256-ttxaX71LiQyTrrFzTPff/ku7E/V2kA3/GwQ/G8G/X7E=", "owner": "nix-community", "repo": "NUR", - "rev": "d4bfad4cd8a5c44bb469f95f20e6eb4799145046", + "rev": "0b21cf66670516802886950379a292a34a797cbd", "type": "github" }, "original": { @@ -527,11 +527,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1718647444, - "narHash": "sha256-RzTDK86nI7yzSrOCYy+jPW+7LZigJm1WnFULNdOXblU=", + "lastModified": 1718745582, + "narHash": "sha256-TFlVP4YXg6n+MbP/Iv/RIwqvRKuV9KA1JAPihoFmPfo=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "d3e889d71b028f61ff6a587cfe437bde16cf8ac1", + "rev": "48e7ed4ef7832efa5a5558e573986c4128fc478f", "type": "github" }, "original": { @@ -552,11 +552,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1718647444, - "narHash": "sha256-RzTDK86nI7yzSrOCYy+jPW+7LZigJm1WnFULNdOXblU=", + "lastModified": 1718745582, + "narHash": "sha256-TFlVP4YXg6n+MbP/Iv/RIwqvRKuV9KA1JAPihoFmPfo=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "d3e889d71b028f61ff6a587cfe437bde16cf8ac1", + "rev": "48e7ed4ef7832efa5a5558e573986c4128fc478f", "type": "github" }, "original": { @@ -720,11 +720,11 @@ ] }, "locked": { - "lastModified": 1718139168, - "narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=", + "lastModified": 1718522839, + "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1", + "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", "type": "github" }, "original": { diff --git a/home/common/core/nixvim/plugins/default.nix b/home/common/core/nixvim/plugins/default.nix index 6aafbd2..ed3c980 100644 --- a/home/common/core/nixvim/plugins/default.nix +++ b/home/common/core/nixvim/plugins/default.nix @@ -23,8 +23,28 @@ pkgs.vimPlugins.vim-dadbod-ui pkgs.vimPlugins.vim-dadbod-completion - # Keep vim-devicons as last entry - pkgs.vimPlugins.vim-devicons + (pkgs.vimUtils.buildVimPlugin + { + name = "precognition.nvim"; + src = pkgs.fetchFromGitHub { + owner = "tris203"; + repo = "precognition.nvim"; + rev = "v1.0.0"; + sha256 = "sha256-AqWYV/59ugKyOWALOCdycWVm0bZ7qb981xnuw/mAVzM="; + }; + }) + + # (pkgs.vimUtils.buildVimPlugin + # { + # name = "hardtime"; + # src = pkgs.fetchFromGitHub { + # owner = "m4xshen"; + # repo = "hardtime.nvim "; + # rev = "9a4e24f"; + # #sha256 = "sha256-abe9ZGmL7U9rC+LxC3LO5/bOn8lHke1FCKO0V3TZGs0="; + # }; + # }) + # (pkgs.vimUtils.buildVimPlugin { name = "buffer_manager.nvim"; @@ -35,10 +55,19 @@ sha256 = "sha256-abe9ZGmL7U9rC+LxC3LO5/bOn8lHke1FCKO0V3TZGs0="; }; }) + + + # Keep vim-devicons as last entry + pkgs.vimPlugins.vim-devicons ]; programs.nixvim.extraConfigLua = '' -- buffer_manager.nvim local opts = {noremap = true} + + require("precognition").setup( + { + } + ) require("buffer_manager").setup( { diff --git a/home/common/optional/desktop/dwm/xinitrc.nix b/home/common/optional/desktop/dwm/xinitrc.nix index f8527fe..2035f3c 100644 --- a/home/common/optional/desktop/dwm/xinitrc.nix +++ b/home/common/optional/desktop/dwm/xinitrc.nix @@ -1,6 +1,10 @@ +{ config, ... }: +let + + monitor = "${toString (builtins.map (m: "xrandr --output ${ m.name } --mode ${ toString( m.width )}x${ toString( m.height )} --pos ${ toString( m.x)}x${ toString( m.y)}" ) config.monitors)}"; +in { # TODO configure x11 to look in .config/x11 - #home.file."${config.xdg.configHome}/x11/xinitrc" = { home.file.".xinitrc" = { recursive = true; text = '' @@ -8,6 +12,8 @@ picom -b --config ~/.config/picom/picom.conf xrdb ~/.Xresources + ${monitor} + autostart="dwmblocks feh-wallpaper-changer sxhkd" for program in $autostart; do diff --git a/home/semita.nix b/home/semita.nix index 311b890..f03d213 100644 --- a/home/semita.nix +++ b/home/semita.nix @@ -13,6 +13,27 @@ ./common/optional/desktop/dwm ]; + # ------ + # | DP-1 + # ------ + monitors = [ + { + name = "DP-1"; + width = 2560; + height = 1440; + x = 0; + y = 0; + workspace = "1"; + primary = true; + } + { + name = "DP-2"; + width = 2560; + height = 1440; + x = 2560; + y = 0; + } + ]; colorScheme = { slug = "serene";