diff --git a/flake.lock b/flake.lock index 912fdce..f66e5e8 100644 --- a/flake.lock +++ b/flake.lock @@ -71,29 +71,6 @@ "type": "github" } }, - "codeium-nvim": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1701196468, - "narHash": "sha256-xZ1S+8NgxOurbYqh7n3wR3cw+FTP8DyCdb5lg7X+8kw=", - "owner": "jcdickinson", - "repo": "codeium.nvim", - "rev": "fd9c9030d402baf2a01cc9db08c39772c0a60324", - "type": "github" - }, - "original": { - "owner": "jcdickinson", - "repo": "codeium.nvim", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -1054,7 +1031,6 @@ "agenix": "agenix", "arkenfox-userjs": "arkenfox-userjs", "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver", - "codeium-nvim": "codeium-nvim", "devshell": "devshell", "disko": "disko", "flake-parts": "flake-parts", diff --git a/flake.nix b/flake.nix index c1ced19..b5fd476 100644 --- a/flake.nix +++ b/flake.nix @@ -29,11 +29,6 @@ # Neovim actions-preview-nvim.flake = false; actions-preview-nvim.url = "github:aznhe21/actions-preview.nvim"; - codeium-nvim = { - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - url = "github:jcdickinson/codeium.nvim"; - }; hmts-nvim.flake = false; hmts-nvim.url = "github:calops/hmts.nvim"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index 60e71f4..6d87909 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -32,6 +32,7 @@ home-manager.users.moritz.home.packages = with pkgs; [ anki + calibre ]; hardware = { diff --git a/modules/config/wallpapers/wallpapers/a_short_walk.jpg b/modules/config/wallpapers/wallpapers/a_short_walk.jpg new file mode 100644 index 0000000..4a0479a Binary files /dev/null and b/modules/config/wallpapers/wallpapers/a_short_walk.jpg differ diff --git a/modules/config/wallpapers/wallpapers/a_short_walk.png b/modules/config/wallpapers/wallpapers/a_short_walk.png deleted file mode 100644 index eac75b9..0000000 Binary files a/modules/config/wallpapers/wallpapers/a_short_walk.png and /dev/null differ diff --git a/modules/config/wallpapers/wallpapers/forest_road.jpg b/modules/config/wallpapers/wallpapers/forest_road.jpg index 8c7f15d..5b91521 100644 Binary files a/modules/config/wallpapers/wallpapers/forest_road.jpg and b/modules/config/wallpapers/wallpapers/forest_road.jpg differ diff --git a/modules/config/wallpapers/wallpapers/little-ships.jpg b/modules/config/wallpapers/wallpapers/little-ships.jpg new file mode 100644 index 0000000..4c6bf54 Binary files /dev/null and b/modules/config/wallpapers/wallpapers/little-ships.jpg differ diff --git a/modules/config/wallpapers/wallpapers/little-ships.png b/modules/config/wallpapers/wallpapers/little-ships.png deleted file mode 100644 index 739e71b..0000000 Binary files a/modules/config/wallpapers/wallpapers/little-ships.png and /dev/null differ diff --git a/modules/config/wallpapers/wallpapers/red_beetle.jpg b/modules/config/wallpapers/wallpapers/red_beetle.jpg new file mode 100644 index 0000000..ded7944 Binary files /dev/null and b/modules/config/wallpapers/wallpapers/red_beetle.jpg differ diff --git a/modules/profiles/impermanence.nix b/modules/profiles/impermanence.nix index 89bfacd..b017327 100644 --- a/modules/profiles/impermanence.nix +++ b/modules/profiles/impermanence.nix @@ -25,7 +25,7 @@ in "/var/lib/NetworkManager/" "/var/lib/bluetooth" "/var/lib/nixos" - "/var/lib/systemd/coredump" + "/var/lib/systemd" "/var/log" ]; files = [ @@ -49,6 +49,7 @@ in ".local/share/zoxide" ".local/share/JetBrains" ".config/JetBrains" + ".config/calibre" ".local/state/nvim" ".config/kdeconnect" ".cat_installer" # eduroam diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix index ffdd778..041a1a4 100644 --- a/modules/programs/firefox.nix +++ b/modules/programs/firefox.nix @@ -29,9 +29,7 @@ in ); }; }; - setSearchEngines = mkEnableOption "firefox search engines" // { - default = true; - }; + setSearchEngines = mkEnableOption "firefox search engines"; }; config = mkIf cfg.enable { diff --git a/modules/programs/nvim/plugins/coding.nix b/modules/programs/nvim/plugins/coding.nix index 4b2526c..358f578 100644 --- a/modules/programs/nvim/plugins/coding.nix +++ b/modules/programs/nvim/plugins/coding.nix @@ -21,8 +21,16 @@ with builtins; plugin = trouble-nvim; cmd = [ "TodoTelescope" ]; keys = [ - { key = "cD"; cmd = "TroubleToggle document_diagnostics"; desc = "Document Diagnostics (Trouble)"; } - { key = "cW"; cmd = "TroubleToggle workspace_diagnostics"; desc = "Workspace Diagnostics (Trouble)"; } + { + key = "cD"; + cmd = "TroubleToggle document_diagnostics"; + desc = "Document Diagnostics (Trouble)"; + } + { + key = "cW"; + cmd = "TroubleToggle workspace_diagnostics"; + desc = "Workspace Diagnostics (Trouble)"; + } { key = "cl"; cmd = "TroubleToggle loclist"; desc = "Location List (Trouble)"; } { key = "cq"; cmd = "TroubleToggle quickfix"; desc = "Quickfix List (Trouble)"; } { key = "ft"; cmd = "TodoTelescope"; desc = "Todo"; } @@ -76,8 +84,21 @@ with builtins; { plugin = cmp-nvim-lsp; } { plugin = cmp_luasnip; } { - plugin = codeium-nvim; + plugin = copilot-cmp; opts = { }; + dependencies = [ + { + plugin = copilot-lua; + opts = { + suggestion = { enabled = false; }; + panel = { enabled = false; }; + }; + conf = /* lua */ '' + require("copilot").setup(opts) + vim.cmd("Copilot disable") + ''; + } + ]; } { plugin = friendly-snippets; } { plugin = lspkind-nvim; } @@ -175,8 +196,21 @@ with builtins; { key = "ff"; cmd = "Telescope find_files"; desc = "Find files"; } { key = "fb"; cmd = "Telescope buffers"; desc = "Find buffers"; } { key = "fl"; cmd = "Telescope current_buffer_fuzzy_find"; desc = "Search lines"; } + { + key = "fl"; + cmd = "y:Telescope current_buffer_fuzzy_find default_text=0"; + desc = "Search lines (selection)"; + mode = [ "v" ]; + } { key = "fg"; cmd = "Telescope live_grep"; desc = "Live grep"; } + { + key = "fg"; + cmd = "y:Telescope live_grep default_text=0"; + desc = "Live grep (selection)"; + mode = [ "v" ]; + } { key = "fh"; cmd = "Telescope help_tags"; desc = "Help tags"; } + { key = "fr"; cmd = "Telescope oldfiles"; desc = "Recent files"; } ]; dependencies = [ { plugin = plenary-nvim; } diff --git a/modules/programs/nvim/plugins/lua/nvim-cmp.lua b/modules/programs/nvim/plugins/lua/nvim-cmp.lua index 516c869..abe86bb 100644 --- a/modules/programs/nvim/plugins/lua/nvim-cmp.lua +++ b/modules/programs/nvim/plugins/lua/nvim-cmp.lua @@ -17,7 +17,7 @@ cmp.setup({ maxwidth = 50, -- prevent the popup from showing more than provided characters ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead symbol_map = { - Codeium = "", + Copilot = "", }, }), }, @@ -56,7 +56,7 @@ cmp.setup({ { name = "async_path", priority = 1 }, { name = "buffer", priority = 1 }, { name = "luasnip", priority = 2 }, - { name = "codeium", priority = 3 }, + { name = "copilot", priority = 3 }, { name = "nvim_lsp", priority = 3 }, }, }) @@ -213,4 +213,4 @@ end vim.api.nvim_create_user_command("CmpToggle", sources_picker, {}) -- disable sources by default -disable_source("codeium") +-- disable_source("codeium") diff --git a/overlays/vimPlugins.nix b/overlays/vimPlugins.nix index 1a4f6c8..2f4c01f 100644 --- a/overlays/vimPlugins.nix +++ b/overlays/vimPlugins.nix @@ -4,8 +4,6 @@ _: prev: with lib.my; { vimPlugins = prev.vimPlugins // { - inherit (inputs.codeium-nvim.packages.${prev.system}.vimPlugins) codeium-nvim; - smartcolumn-nvim = prev.vimUtils.buildVimPlugin { pname = "smartcolumn-nvim"; version = mkVersionInput inputs.smartcolumn-nvim;