diff --git a/flake.lock b/flake.lock index 2a79d9b..ca32395 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1697410455, - "narHash": "sha256-jCs/ffIP3tUPN7HWWuae4BB8+haAw2NI02z5BQvWMGM=", + "lastModified": 1701433070, + "narHash": "sha256-Gf9JStfENaUQ7YWFz3V7x/srIwr4nlnVteqaAxtwpgM=", "owner": "nix-community", "repo": "home-manager", - "rev": "78125bc681d12364cb65524eaa887354134053d0", + "rev": "4a8545f5e737a6338814a4676dc8e18c7f43fc57", "type": "github" }, "original": { @@ -22,16 +22,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697059129, - "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", + "lastModified": 1701389149, + "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", + "rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index ccc57a7..8802e33 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ # }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/default.nix b/home/default.nix index 2730cd6..31d9a42 100644 --- a/home/default.nix +++ b/home/default.nix @@ -92,6 +92,8 @@ gimp godot_4 inkscape + imagemagick + ghostscript scrcpy # web diff --git a/home/nvim/lsp.vim b/home/nvim/lsp.vim index 4cf28bd..e6cdc93 100644 --- a/home/nvim/lsp.vim +++ b/home/nvim/lsp.vim @@ -14,7 +14,7 @@ lua <'] = cmp.mapping.select_prev_item(), [''] = cmp.mapping.select_next_item(), [''] = cmp.mapping.abort(), - [''] = cmp.mapping.confirm({ select = true }), + -- [''] = cmp.mapping.confirm({ select = true }), [''] = cmp.mapping.confirm({ select = false }), }, sources = cmp.config.sources({ @@ -53,6 +53,7 @@ lua <rn', vim.lsp.buf.rename, {}) vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, {}) + vim.keymap.set('n', 'f', vim.lsp.buf.format, {}) vim.keymap.set('n', 'gd', vim.lsp.buf.definition, {}) vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, {}) vim.keymap.set('n', 'gr', vim.lsp.buf.references, {}) diff --git a/system/default.nix b/system/default.nix index 42f9331..8a005a7 100644 --- a/system/default.nix +++ b/system/default.nix @@ -21,7 +21,7 @@ time.timeZone = "Europe/Berlin"; i18n.extraLocaleSettings = { - LC_TIME = "de_DE.UTF-8"; + LC_TIME = "en_GB.UTF-8"; LC_CTYPE = "de_DE.UTF-8"; LC_PAPER = "de_DE.UTF-8"; };