From 93d98e30017e735a3945350b145ff994544e1fee Mon Sep 17 00:00:00 2001 From: Nico Date: Fri, 28 Nov 2025 13:30:56 +0100 Subject: [PATCH] dunno tbh --- configuration.nix | 28 ++--- flake.lock | 114 ++++++++++----------- packages/default.nix | 2 +- packages/niri/config.kdl | 1 + packages/nvim/default.nix | 2 +- packages/nvim/init.lua | 7 -- packages/nvim/lua/plugins/lsp.lua | 1 + packages/nvim/lua/plugins/rustaceanvim.lua | 30 +++++- packages/other/default.nix | 6 +- packages/terminal/default.nix | 3 + packages/zed-editor/default.nix | 6 +- packages/zed-editor/settings.json | 5 +- 12 files changed, 116 insertions(+), 89 deletions(-) diff --git a/configuration.nix b/configuration.nix index 311d362..66fbc66 100644 --- a/configuration.nix +++ b/configuration.nix @@ -32,10 +32,11 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.loader.grub.useOSProber = true; -# fileSystems."mnt/win" = { -# device = "/dev/sdb1"; -# fsType = "ntfs"; -# }; +fileSystems."mnt/win" = { + device = "/dev/disk/by-partuuid/8d0a8dd9-7a4c-4d3e-a5eb-98c0aed35db5"; + fsType = "ntfs-3g"; + options = ["rw" "uid=1000"]; +}; # Flakes nix.settings.experimental-features = [ "nix-command" "flakes" ]; @@ -53,14 +54,14 @@ boot.loader.grub.useOSProber = true; networking.enableIPv6 = false; # VM - virtualisation.virtualbox.host.enable = true; - virtualisation.virtualbox.host.enableExtensionPack = true; - virtualisation.virtualbox.host.enableKvm = true; - virtualisation.virtualbox.host.addNetworkInterface = false; - users.extraGroups.vboxusers.members = [ "nico" ]; - # virtualisation.virtualbox.guest.enable = true; - # virtualisation.virtualbox.guest.dragAndDrop = true; - virtualisation.docker.enable = true; +# virtualisation.virtualbox.host.enable = true; +# virtualisation.virtualbox.host.enableExtensionPack = true; +# virtualisation.virtualbox.host.enableKvm = true; +# virtualisation.virtualbox.host.addNetworkInterface = false; +# users.extraGroups.vboxusers.members = [ "nico" ]; +# # virtualisation.virtualbox.guest.enable = true; +# # virtualisation.virtualbox.guest.dragAndDrop = true; +# virtualisation.docker.enable = true; # Set your time zone. time.timeZone = "Europe/Berlin"; @@ -127,6 +128,7 @@ boot.loader.grub.useOSProber = true; #media-session.enable = true; }; + systemd.user.services.orca.enable = false; # Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.enable # = true; services.mullvad-vpn.enable = true; @@ -136,7 +138,6 @@ services.mullvad-vpn.enable = true; "wheel" "adbusers" "docker" "input" "dialout"]; packages = with pkgs; [ ]; }; - users.defaultUserShell = pkgs.zsh; environment.shells = with pkgs; [ zsh nushell ]; programs.zsh.enable = true; @@ -150,6 +151,7 @@ services.mullvad-vpn.enable = true; ]; # services.flatpak.enable = true; +programs.nix-ld.enable = true; # List packages installed in system profile. To search, run: $ nix search wget environment.systemPackages = with pkgs; [ diff --git a/flake.lock b/flake.lock index a4be8e5..eebcab7 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759227262, - "narHash": "sha256-ibKJckw+KWH6n+pscOA7DWImanr988zKB7R2Z6ZEMLM=", + "lastModified": 1763165251, + "narHash": "sha256-HqprJ5e5+tLVbk3EuWnyiBkVfKTA149eHh+u2VzUrY0=", "owner": "Aylur", "repo": "ags", - "rev": "f68a0d03fbb94f4beacedd922ffaa0bf0f10397a", + "rev": "0cbca42b11d23aad8c0689fc7385e517bde94c61", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1756474652, - "narHash": "sha256-iiBU6itpEqE0spXeNJ3uJTfioSyKYjt5bNepykpDXTE=", + "lastModified": 1762012522, + "narHash": "sha256-ncEN4OVFM5M9VFc4oR3gOI5K8r99GcYxtU+Cf4Z8pbs=", "owner": "aylur", "repo": "astal", - "rev": "20bd8318e4136fbd3d4eb2d64dbabc3acbc915dd", + "rev": "671d4229c798834190a50fb8b8d8addd19b529e9", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "crane": { "locked": { - "lastModified": 1758215636, - "narHash": "sha256-8nkzkPbdxze8CxWhKWlcLbJEU1vfLM/nVqRlTy17V54=", + "lastModified": 1762538466, + "narHash": "sha256-8zrIPl6J+wLm9MH5ksHcW7BUHo7jSNOu0/hA0ohOOaM=", "owner": "ipetkov", "repo": "crane", - "rev": "a669fe77a8b0cd6f11419d89ea45a16691ca5121", + "rev": "0cea393fffb39575c46b7a0318386467272182fe", "type": "github" }, "original": { @@ -73,11 +73,11 @@ }, "flake-compat_2": { "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1759337100, - "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", + "lastModified": 1763416652, + "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", + "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", "type": "github" }, "original": { @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", + "lastModified": 1762964643, + "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "rev": "827f2a23373a774a8805f84ca5344654c31f354b", "type": "github" }, "original": { @@ -150,11 +150,11 @@ }, "mnw": { "locked": { - "lastModified": 1756659871, - "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=", + "lastModified": 1758834834, + "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", "owner": "Gerg-L", "repo": "mnw", - "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16", + "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", "type": "github" }, "original": { @@ -165,11 +165,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1761907660, + "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "type": "github" }, "original": { @@ -181,11 +181,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -197,11 +197,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1756696532, - "narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=", + "lastModified": 1761880412, + "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "58dcbf1ec551914c3756c267b8b9c8c86baa1b2f", + "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", "type": "github" }, "original": { @@ -213,11 +213,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -230,10 +230,10 @@ "nixpkgs_5": { "locked": { "lastModified": 315532800, - "narHash": "sha256-YPoFUJMpbuPvIS4FJBn2Sv/iWsui9S26gu2ufFWEY0g=", - "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", + "narHash": "sha256-5CwQ80ucRHiqVbMEEbTFnjz70/axSJ0aliyzSaFSkmY=", + "rev": "f6b44b2401525650256b977063dbcf830f762369", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre864673.a1f79a1770d0/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre891648.f6b44b240152/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -242,11 +242,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -265,11 +265,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1758271661, - "narHash": "sha256-ENqd2/33uP5vB44ClDjjAV+J78oF8q1er4QUZuT8Z7g=", + "lastModified": 1762622004, + "narHash": "sha256-NpzzgaoMK8aRHnndHWbYNKLcZN0r1y6icCoJvGoBsoE=", "owner": "notashelf", "repo": "nvf", - "rev": "b7571df4d6e9ac08506a738ddceeec0b141751b0", + "rev": "09470524a214ed26633ddc2b6ec0c9bf31a8b909", "type": "github" }, "original": { @@ -297,11 +297,11 @@ ] }, "locked": { - "lastModified": 1758508617, - "narHash": "sha256-kx2uELmVnAbiekj/YFfWR26OXqXedImkhe2ocnbumTA=", + "lastModified": 1762915112, + "narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d2bac276ac7e669a1f09c48614538a37e3eb6d0f", + "rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1759033744, - "narHash": "sha256-fQovpddotIEsvdJzpQhtb3wYZYGIg4I/QUX5rJJQTi4=", + "lastModified": 1763267524, + "narHash": "sha256-CywB4iCpGr4CYZAD+WboFwBQ7Wnc7LdfSemFWuH/1Ro=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "f102312235c3628fc3eddfb8cc6d7d0922427f46", + "rev": "cf33e39bd1a21993a28ffee8be433e212ecf346a", "type": "github" }, "original": { @@ -367,11 +367,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1759344846, - "narHash": "sha256-WIhSRa4m8I5Epl3Ajpaxodl22EwWit0bC2Y1/sv1HGM=", + "lastModified": 1763568568, + "narHash": "sha256-PP4h13/BhOnqagvJUtILvnGIylQFm9EmIKeW6vzpWhY=", "owner": "zed-industries", "repo": "zed", - "rev": "3314de81755d7ef949007f6b804f4496092b0cc8", + "rev": "f05eef58c46be2d6617847494b444ac442780367", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1759292536, - "narHash": "sha256-fWTojLEpXgqwtKZb+qJ5gn9y8N6MAKM35yu0k+4yWmo=", + "lastModified": 1763521945, + "narHash": "sha256-Zcrafbe4niRJMbzaVOwg7+iedJhwBFttre2DpyCC6qA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d11cff279fb1d879cd72d6fb3bbd1ae7b584674b", + "rev": "24d7381b9231c23daceec5d372cc28e877f7785d", "type": "github" }, "original": { diff --git a/packages/default.nix b/packages/default.nix index 0776256..0a8d281 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -9,7 +9,7 @@ ./waybar ./wpaperd ./nvim - ./emacs + # ./emacs ./terminal ./rofi ./fuzzel diff --git a/packages/niri/config.kdl b/packages/niri/config.kdl index 001f9e9..e9a9e74 100644 --- a/packages/niri/config.kdl +++ b/packages/niri/config.kdl @@ -374,6 +374,7 @@ binds { // Mod+M hotkey-overlay-title="Run an Application: rofi" { spawn "rofi" "-show" "drun"; } Super+Alt+L hotkey-overlay-title="Power menu" { spawn "rofi" "-show" "power-menu" "-modi" "power-menu:rofi-power-menu"; } Super+V hotkey-overlay-title="Clipboard history" { spawn "bash" "-c" "cliphist list | fuzzel -d | cliphist decode | wl-copy"; } + Super+E hotkey-overlay-title="Umlaute" { spawn "bash" "-c" "echo 'ä\nö\nü\nß\nÄ\nÖ\nÜ' | fuzzel -d | wl-copy"; } // You can also use a shell. Do this if you need pipes, multiple commands, etc. // Note: the entire command goes as a single argument in the end. diff --git a/packages/nvim/default.nix b/packages/nvim/default.nix index cc14ec5..ba6e32f 100644 --- a/packages/nvim/default.nix +++ b/packages/nvim/default.nix @@ -45,7 +45,7 @@ programs.neovim.plugins = [ ".config/nvim/lua/plugins/trouble.lua".source = ./lua/plugins/trouble.lua; ".config/nvim/lua/plugins/dap.lua".source = ./lua/plugins/dap.lua; ".config/nvim/lua/plugins/blankline.lua".source = ./lua/plugins/blankline.lua; - ".config/nvim/lua/plugins/rustaceanvim.lua".source = ./lua/plugins/rustaceanvim.lua; + # ".config/nvim/lua/plugins/rustaceanvim.lua".source = ./lua/plugins/rustaceanvim.lua; ".config/nvim/lua/plugins/lazygit.lua".source = ./lua/plugins/lazygit.lua; ".config/nvim/lua/plugins/toggleterm.lua".source = ./lua/plugins/toggleterm.lua; ".config/nvim/lua/plugins/love.lua".source = ./lua/plugins/love.lua; diff --git a/packages/nvim/init.lua b/packages/nvim/init.lua index 9062fc0..47d58cb 100644 --- a/packages/nvim/init.lua +++ b/packages/nvim/init.lua @@ -112,13 +112,6 @@ dap.configurations.rust = dap.configurations.gdb -------------------------------------------- local builtin = require("telescope.builtin") local conform = require("conform") --- Rust binds -vim.keymap.set("n", "rrr", ":RustRun", { desc = "Run rust program" }) -vim.keymap.set("n", "rd", ":RustLsp debug", { desc = "Debug rust program" }) -vim.keymap.set("n", "rh", ":RustLsp hover actions", { desc = "rust hover actions" }) -vim.keymap.set("n", "re", ":RustLsp explainError", { desc = "explain rust error" }) -vim.keymap.set("n", "rs", ":RustLsp openDocs", { desc = "open rust docs for symbol under cursor" }) -vim.keymap.set("n", "rrn", ":RustLsp ssr ", { desc = "rust rename" }) -- Love binds vim.keymap.set("n", "lr", ":LoveRun", { desc = "Love run" }) -- Telescope binds diff --git a/packages/nvim/lua/plugins/lsp.lua b/packages/nvim/lua/plugins/lsp.lua index ac40b51..50ee281 100644 --- a/packages/nvim/lua/plugins/lsp.lua +++ b/packages/nvim/lua/plugins/lsp.lua @@ -40,6 +40,7 @@ return { vim.lsp.config('vtsls', vtsls_config) vim.lsp.config('vue_ls', vue_ls_config) vim.lsp.config('lua_ls', {}) + -- vim.lsp.config('rust_analyzer', {}) vim.lsp.enable({'vtsls', 'vue_ls', 'lua_ls'}) end diff --git a/packages/nvim/lua/plugins/rustaceanvim.lua b/packages/nvim/lua/plugins/rustaceanvim.lua index eb83332..7f4356d 100644 --- a/packages/nvim/lua/plugins/rustaceanvim.lua +++ b/packages/nvim/lua/plugins/rustaceanvim.lua @@ -1,5 +1,29 @@ return { - 'mrcjkb/rustaceanvim', - version = '^6', -- Recommended - lazy = false, -- This plugin is already lazy + "mrcjkb/rustaceanvim", + version = "^6", -- Recommended + lazy = false, -- This plugin is already lazy + + keys = { + { "rrr", ":RustRun", desc = "Rust run" }, + {"rd", ":RustLsp debug", desc = "Debug rust program" }, + {"rh", ":RustLsp hover actions", desc = "rust hover actions" }, + {"re", ":RustLsp explainError", desc = "explain rust error" }, + {"rs", ":RustLsp openDocs",desc = "open rust docs for symbol under cursor" }, + {"rrn", ":RustLsp ssr ", desc = "rust rename" } + }, + -- opts = { + -- function() + -- vim.keymap.set("n", "rrr", ":RustRun", { desc = "Run rust program" }) + -- vim.keymap.set("n", "rd", ":RustLsp debug", { desc = "Debug rust program" }) + -- vim.keymap.set("n", "rh", ":RustLsp hover actions", { desc = "rust hover actions" }) + -- vim.keymap.set("n", "re", ":RustLsp explainError", { desc = "explain rust error" }) + -- vim.keymap.set( + -- "n", + -- "rs", + -- ":RustLsp openDocs", + -- { desc = "open rust docs for symbol under cursor" } + -- ) + -- vim.keymap.set("n", "rrn", ":RustLsp ssr ", { desc = "rust rename" }) + -- end, + -- }, } diff --git a/packages/other/default.nix b/packages/other/default.nix index dbb7648..56eea38 100644 --- a/packages/other/default.nix +++ b/packages/other/default.nix @@ -15,9 +15,9 @@ set preview_images_method kitty programs.git = { enable = true; - userName = "Nico"; - userEmail = "nicovessen@gmail.com"; - extraConfig = { + settings.user.name = "Nico"; + settings.user.email = "nico@getmemy.coffee"; + settings.extraConfig = { safe.directory = "/etc/nixos"; }; }; diff --git a/packages/terminal/default.nix b/packages/terminal/default.nix index b831707..edcc149 100644 --- a/packages/terminal/default.nix +++ b/packages/terminal/default.nix @@ -48,8 +48,11 @@ programs.zsh = { initContent = '' eval "$(starship init zsh)" + + export NIX_LD=$(nix eval --impure --raw --expr 'let pkgs = import {}; NIX_LD = pkgs.lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker"; in NIX_LD') ''; + zplug = { enable = false; plugins = [ diff --git a/packages/zed-editor/default.nix b/packages/zed-editor/default.nix index 6fa87f0..fb6c7f7 100644 --- a/packages/zed-editor/default.nix +++ b/packages/zed-editor/default.nix @@ -4,9 +4,9 @@ home.file."/home/nico/.config/zed/settings.json" = { source = ./settings.json; }; - # programs.zed-editor = { - # enable = true; - # + programs.zed-editor = { + enable = true; + }; # ## This populates the userSettings "auto_install_extensions" # extensions = ["nix" "Catppuccin"]; # diff --git a/packages/zed-editor/settings.json b/packages/zed-editor/settings.json index b2a7c04..2e3835d 100644 --- a/packages/zed-editor/settings.json +++ b/packages/zed-editor/settings.json @@ -23,7 +23,7 @@ } ], "agent": { - "enabled": false + "enabled": true }, "auto_update": false, "base_keymap": "VSCode", @@ -49,6 +49,9 @@ "light": "Catppuccin frappe", "mode": "system" }, + "features": { + "edit_prediction_provider": "none" + }, "ui_font_size": 16, "vim_mode": true }