diff --git a/flake.lock b/flake.lock index 7d0f532..b130b97 100644 --- a/flake.lock +++ b/flake.lock @@ -1183,11 +1183,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1712774101, - "narHash": "sha256-t58qLvRLjrekfnHWS5Un5LXQJCrLeycKcuPRtoVqJbw=", + "lastModified": 1712851738, + "narHash": "sha256-3Hxz4ORxF2QSbRUt3YPK1MN6xbVQjRjSxSEAJ8lePz8=", "owner": "oddlama", "repo": "nixos-extra-modules", - "rev": "0f4e5f7391532ddf105020a5be75421ea2e4fdc7", + "rev": "3ade74f7616458c38f00ee6fed73794e1a79bbf3", "type": "github" }, "original": { diff --git a/img/wallpaper.png.age b/img/wallpaper.png.age new file mode 100644 index 0000000..2f2cdd4 Binary files /dev/null and b/img/wallpaper.png.age differ diff --git a/users/common/graphical/Xorg/i3.nix b/users/common/graphical/Xorg/i3.nix index 900fd1f..2e84091 100644 --- a/users/common/graphical/Xorg/i3.nix +++ b/users/common/graphical/Xorg/i3.nix @@ -25,6 +25,7 @@ maim = "${pkgs.maim}/bin/maim -qs -b 1 --hidecursor"; in { "Menu" = "exec ${cfg.menu}"; + "Ctrl+F9" = "exec ${config.xsession.wallpapers.script}"; "${cfg.modifier}+F12" = "exec " + toString ( diff --git a/users/common/programs/nvim/nixvim/options.nix b/users/common/programs/nvim/nixvim/options.nix index 0bd2b30..b771c6a 100644 --- a/users/common/programs/nvim/nixvim/options.nix +++ b/users/common/programs/nvim/nixvim/options.nix @@ -1,5 +1,5 @@ { - programs.nixvim.options = { + programs.nixvim.opts = { # Set maximum undo levels undolevels = 1000000; # Persistent Undo diff --git a/users/common/programs/nvim/nixvim/plugins.nix b/users/common/programs/nvim/nixvim/plugins.nix index 887cc13..3b680f3 100644 --- a/users/common/programs/nvim/nixvim/plugins.nix +++ b/users/common/programs/nvim/nixvim/plugins.nix @@ -40,7 +40,7 @@ }; indent-blankline = { enable = true; - extraOptions = { + settings = { exclude.buftypes = ["help" "terminal" "nofile"]; exclude.filetypes = ["terminal" "lsp-info"]; }; @@ -56,7 +56,7 @@ }; treesitter-context.enable = true; vim-matchup.enable = true; - comment-nvim.enable = true; + comment.enable = true; # Fzf picker for arbitrary stuff telescope = { enable = true; diff --git a/users/common/shells/pager.nix b/users/common/shells/pager.nix index e430657..3cf3f09 100644 --- a/users/common/shells/pager.nix +++ b/users/common/shells/pager.nix @@ -6,7 +6,7 @@ exe = lib.getExe (pkgs.nixvim.makeNixvim { package = pkgs.neovim-clean; - options = { + opts = { buftype = "nowrite"; backup = false; modeline = false; diff --git a/users/patrick/streamdeck.nix b/users/patrick/streamdeck.nix index f364db3..898d98c 100644 --- a/users/patrick/streamdeck.nix +++ b/users/patrick/streamdeck.nix @@ -10,7 +10,7 @@ # button number "5" = { # keyInput to press - keys = "F7"; + keys = "ctrl+F7"; # Text shown on button #text = "mute"; icon = config.images.images."mic.png"; @@ -18,8 +18,13 @@ text_vertical_align = "middle-bottom"; background_color = "#7289DA"; }; + "0" = { + keys = "ctrl+F9"; + icon = config.images.images."wallpaper.png"; + background_color = "#7289DA"; + }; "6" = { - keys = "F8"; + keys = "ctrl+F8"; icon = config.images.images."heads.png"; background_color = "#7289DA"; };