From: Patrick Date: Wed, 26 Nov 2025 09:09:40 +0000 (+0100) Subject: update X-Git-Url: https://gitweb.ps.run/flake_thinkpad/commitdiff_plain/0f3e430dea3955609d5bafeffa13370110397007 update --- diff --git a/configuration.nix b/configuration.nix index 5ab6712..a5eda85 100644 --- a/configuration.nix +++ b/configuration.nix @@ -22,6 +22,7 @@ in inputs.home-manager.nixosModules.default inputs.extra-container.nixosModules.default inputs.microvm.nixosModules.host + inputs.fakwin.nixosModules.default ]; # Bootloader. @@ -151,6 +152,7 @@ in desktopManager = { xterm.enable = false; + wallpaper.mode = "center"; xfce = { enable = true; noDesktop = true; @@ -173,6 +175,7 @@ in }; systemd.user.services.plasma-kwin_x11.enable = false; + services.fakwin.enable = true; services.autorandr = { enable = true; @@ -379,6 +382,7 @@ in deno typst jdt-language-server + google-java-format scrcpy @@ -407,6 +411,8 @@ in programs.xfconf.enable = true; programs.nix-ld.enable = true; + programs.direnv.enable = true; + programs.direnv.nix-direnv.enable = true; services.fwupd.enable = true; diff --git a/flake.lock b/flake.lock index 7b6868e..e1cc79c 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,27 @@ "type": "github" } }, + "fakwin": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1756584983, + "narHash": "sha256-TObjSQhtqbdrQhYHSQxHL8sopgXrBF449eO+eVNbZgI=", + "owner": "DMaroo", + "repo": "fakwin", + "rev": "0cbbbbf7009d83c3cdd325e20c429b37d89fcef6", + "type": "github" + }, + "original": { + "owner": "DMaroo", + "repo": "fakwin", + "type": "github" + } + }, "firefox-addons": { "inputs": { "nixpkgs": [ @@ -59,6 +80,24 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -226,6 +265,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1753579242, + "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1758427187, @@ -266,6 +320,7 @@ "root": { "inputs": { "extra-container": "extra-container", + "fakwin": "fakwin", "firefox-addons": "firefox-addons", "home-manager": "home-manager", "impermanence": "impermanence", diff --git a/flake.nix b/flake.nix index 4996186..f3b1fc1 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + fakwin = { + url = "github:DMaroo/fakwin"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + microvm.url = "github:astro/microvm.nix"; microvm.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home-common.nix b/home-common.nix index 1a40609..0269560 100644 --- a/home-common.nix +++ b/home-common.nix @@ -85,23 +85,26 @@ vim.lsp.enable('zuban') vim.lsp.enable('jdtls') require('guess-indent').setup {} - local actions = require("telescope.actions") + local tl_actions = require("telescope.actions") + local tl_builtin = require("telescope.actions") require('telescope').setup { - defaults = { - mappings = { - i = { [""] = actions.close }, - } - } + defaults = { + mappings = { + i = { [""] = tl_actions.close }, + } + } } + tl_builtins.buffers { sort_lastused = true, ignore_current_buffer = true } require('formatter').setup { - logging = true, - log_level = vim.log.levels.WARN, - filetype = { - c = { require("formatter.filetypes.c").clangformat }, - cpp = { require("formatter.filetypes.cpp").clangformat }, - zig = { require("formatter.filetypes.zig").zigfmt }, - markdown = { require("formatter.filetypes.markdown").denofmt }, - } + logging = true, + log_level = vim.log.levels.WARN, + filetype = { + c = { require("formatter.filetypes.c").clangformat }, + cpp = { require("formatter.filetypes.cpp").clangformat }, + zig = { require("formatter.filetypes.zig").zigfmt }, + markdown = { require("formatter.filetypes.markdown").denofmt }, + java = { require("formatter.filetypes.java").google_java_format }, + } } require('blink.cmp').setup { keymap = { @@ -130,4 +133,32 @@ } ''; }; + programs.helix = { + enable = true; + settings = { + theme = "base16_terminal"; + editor.cursor-shape = { + insert = "bar"; + normal = "block"; + select = "underline"; + }; + editor.soft-wrap = { + enable = true; + }; + editor.file-picker = { + hidden = false; + }; + keys.normal."space" = { + "space" = "goto_word"; + }; + }; + languages = { + language = [{ + name = "c"; + auto-format = true; + formatter = { command = "clang-format"; args = ["--style=microsoft"]; }; + }]; + }; + }; + } diff --git a/home-ps.nix b/home-ps.nix index 9ee81ad..48cfe3c 100644 --- a/home-ps.nix +++ b/home-ps.nix @@ -311,34 +311,6 @@ in }; }; - programs.helix = { - enable = true; - settings = { - theme = "base16_terminal"; - editor.cursor-shape = { - insert = "bar"; - normal = "block"; - select = "underline"; - }; - editor.soft-wrap = { - enable = true; - }; - editor.file-picker = { - hidden = false; - }; - keys.normal."space" = { - "space" = "goto_word"; - }; - }; - languages = { - language = [{ - name = "c"; - auto-format = true; - formatter = { command = "clang-format"; args = ["--style=microsoft"]; }; - }]; - }; - }; - home.file.".config/zls.json".text = '' { "enable_build_on_save": true, @@ -743,6 +715,7 @@ in # org.gradle.console=verbose # org.gradle.daemon.idletimeout=3600000 # ''; + ".background-image".source = wallpaper; }; # Home Manager can also manage your environment variables through