From 7101cd0860b266355c671e90e8f799f01c8e164f Mon Sep 17 00:00:00 2001 From: Nico Date: Sun, 12 Apr 2026 01:10:24 +0200 Subject: [PATCH] update --- configuration.nix | 18 +-- flake.lock | 199 +++++++++++++++++++--------------- packages/hyprland/default.nix | 2 +- packages/nvim/default.nix | 2 + packages/nvim/default.nix~ | 31 ++++++ packages/nvim/init.lua~ | 113 +++++++++++++++++++ packages/other/default.nix | 7 +- 7 files changed, 269 insertions(+), 103 deletions(-) create mode 100644 packages/nvim/default.nix~ create mode 100644 packages/nvim/init.lua~ diff --git a/configuration.nix b/configuration.nix index 13a3f60..12f4873 100644 --- a/configuration.nix +++ b/configuration.nix @@ -40,7 +40,7 @@ fileSystems."mnt/win" = { swapDevices = [ { device = "/var/lib/swapfile"; - size = 16 * 1024; + size = 32 * 1024; } ]; @@ -71,7 +71,7 @@ powerManagement.enable = true; # users.extraGroups.vboxusers.members = [ "nico" ]; # # virtualisation.virtualbox.guest.enable = true; # # virtualisation.virtualbox.guest.dragAndDrop = true; -# virtualisation.docker.enable = true; + virtualisation.docker.enable = true; # Set your time zone. time.timeZone = "Europe/Berlin"; @@ -177,20 +177,19 @@ programs.nix-ld.enable = true; # grayjay signal-desktop obsidian - discord - anki + # anki grayjay lutris - qbittorrent vim wget git tree ntfs3g heroic - wineWowPackages.stable + wineWow64Packages.stable sshfs devenv + logiops # sway networkmanager @@ -238,7 +237,12 @@ hardware.amdgpu.opencl.enable = true; # List services that you want to enable: - services.openssh.enable = true; + services.openssh = { + enable = true; + settings = { + X11Forwarding = true; + }; + }; # Open ports in the firewall. networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; Or disable the firewall altogether. diff --git a/flake.lock b/flake.lock index 7812240..42b287f 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764289441, - "narHash": "sha256-ak+lgFiYE5PHByN1/BRkO5JP498hno6Ix24C1Qf/vec=", + "lastModified": 1775689345, + "narHash": "sha256-tM3s7CX+tgxlYW0Sk3nzVThg2MHn08foIuMxABupxIs=", "owner": "Aylur", "repo": "ags", - "rev": "e169694390548dfd38ff40f1ef2163d6c3ffe3ea", + "rev": "bbee2f18939f1ec7ff720e717cf305e73635628f", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1764173295, - "narHash": "sha256-Jh4VtPcK2Ov+RTcV9FtyQRsxiJmXFQGfqX6jjM7/mgc=", + "lastModified": 1773914523, + "narHash": "sha256-GOL+bR30FPImAzy4NNsTMY1gpoINMsLTXR0WJBRSq30=", "owner": "aylur", "repo": "astal", - "rev": "7d1fac8a4b2a14954843a978d2ddde86168c75ef", + "rev": "41b50290c6a1cdce7b482897c22fe49286912b9a", "type": "github" }, "original": { @@ -45,11 +45,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1767750947, - "narHash": "sha256-zqe9esphlAFu19TGL/nAyOHyOiR+Vu8M2IWWLg9cm4U=", + "lastModified": 1775938181, + "narHash": "sha256-3VRl7wTV2guWBI1kYT2OZEAMYU5nUZMo6um9UH+HYHE=", "owner": "catppuccin", "repo": "nix", - "rev": "e7135074fe2a3d17bee3c229b5a7d3da26f76ce8", + "rev": "8d8b4fd30aecbf30eef6b1d1977670a597d29494", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "crane": { "locked": { - "lastModified": 1765145449, - "narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=", + "lastModified": 1769737823, + "narHash": "sha256-DrBaNpZ+sJ4stXm+0nBX7zqZT9t9P22zbk6m5YhQxS4=", "owner": "ipetkov", "repo": "crane", - "rev": "69f538cdce5955fcd47abfed4395dc6d5194c1c5", + "rev": "b2f45c3830aa96b7456a4c4bc327d04d7a43e1ba", "type": "github" }, "original": { @@ -89,21 +89,6 @@ "url": "https://git.lix.systems/lix-project/flake-compat.git" } }, - "flake-compat_2": { - "locked": { - "lastModified": 1765121682, - "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -112,11 +97,29 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -132,11 +135,11 @@ ] }, "locked": { - "lastModified": 1767802041, - "narHash": "sha256-ZhgbFGQGeJaZ/xkwyHlgUCeHuIdEDqugYkObPL0NCyo=", + "lastModified": 1775900011, + "narHash": "sha256-QUGu6CJYFQ5AWVV0n3/FsJyV+1/gj7HSDx68/SX9pwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "bdaa3743831168787f528570f2b87963e72a2f23", + "rev": "b0569dc6ec1e6e7fefd8f6897184e4c191cd768e", "type": "github" }, "original": { @@ -153,11 +156,11 @@ ] }, "locked": { - "lastModified": 1767104570, - "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", + "lastModified": 1774991950, + "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", + "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", "type": "github" }, "original": { @@ -168,11 +171,11 @@ }, "mnw": { "locked": { - "lastModified": 1758834834, - "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", + "lastModified": 1770419553, + "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", + "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957", "type": "github" }, "original": { @@ -189,26 +192,27 @@ ] }, "locked": { - "lastModified": 1765720983, - "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=", + "lastModified": 1768214250, + "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", "owner": "feel-co", "repo": "ndg", - "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936", + "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", "type": "github" }, "original": { "owner": "feel-co", + "ref": "refs/tags/v2.6.0", "repo": "ndg", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -218,13 +222,28 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "72716169fe93074c333e8d0173151350670b824c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1767116409, - "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -236,11 +255,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1767640445, - "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=", + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", "type": "github" }, "original": { @@ -252,27 +271,40 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_5": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1775036866, + "narHash": "sha256-ByAX1LkhCwZ94+KnFAmnJSMAvui7kgCxjHgUHsWAbfI=", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre972949.6201e203d095/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1769789167, + "narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "62c8382960464ceb98ea593cb8321a2cf8f9e3e5", "type": "github" }, "original": { @@ -282,26 +314,13 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1765772535, - "narHash": "sha256-I715zWsdVZ+CipmLtoCAeNG0etQywiWRE5PaWntnaYk=", - "rev": "09b8fda8959d761445f12b55f380d90375a1d6bb", - "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre911985.09b8fda8959d/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" - } - }, "nixpkgs_7": { "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "lastModified": 1774709303, + "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", "type": "github" }, "original": { @@ -321,11 +340,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1767766515, - "narHash": "sha256-Hr87qJDIi4rL/d0njZYPyKDjtom6lDF3AV2UZL+K/fk=", + "lastModified": 1775892726, + "narHash": "sha256-1TK1pe33cEHNvGW41TP5xAzrbG1Gp7LfyFL6c3+xf+I=", "owner": "notashelf", "repo": "nvf", - "rev": "ceaae0eb2ece9e06159d6de80b0709e38d77f6a4", + "rev": "5ab359ee7dfd3fa09a5c6f863efaf810bb9a9436", "type": "github" }, "original": { @@ -354,11 +373,11 @@ ] }, "locked": { - "lastModified": 1765465581, - "narHash": "sha256-fCXT0aZXmTalM3NPCTedVs9xb0egBG5BOZkcrYo5PGE=", + "lastModified": 1775013181, + "narHash": "sha256-zPrt6oNM1r/RO5bWYaZ3hthfG9vzkr6kQdoqDd5x4Qw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "99cc5667eece98bb35dcf35f7e511031a8b7a125", + "rev": "e8046c1d9ccadd497c2344d8fa49dab62f22f7be", "type": "github" }, "original": { @@ -373,11 +392,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1767502559, - "narHash": "sha256-om0IPjW850vhhIrNZ5tiXjsYuqyoI44IdE+I9AwZ96I=", + "lastModified": 1775421933, + "narHash": "sha256-JkEbzFDFTsUlVtHEzA8Y4r3O9LInhb96eOCbtGjGnbM=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "806c1fdeb7af3e013215d14f5d9f06685fa6650f", + "rev": "ec8d73085fdf807d55765335dc8126e14e7b2096", "type": "github" }, "original": { @@ -419,16 +438,16 @@ "zed": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1767801498, - "narHash": "sha256-BKzeTqSo1hTnxmjQSiQzERg2+NOYAHCibUVsQ49Ztgg=", + "lastModified": 1775935959, + "narHash": "sha256-0dfWUEdfn/QEi3Myl0T75qkGfN92d9Bv0waHaWGH0Xc=", "owner": "zed-industries", "repo": "zed", - "rev": "69acab7f81950588ea0bb0ab73f4f28df1c05931", + "rev": "5a47e9825babb293a4e4aea3359fb860085ab63f", "type": "github" }, "original": { @@ -443,11 +462,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1767763594, - "narHash": "sha256-5ysv8EuVAgDoYmNuXEUNf7vBzdeRaFxeIlIndv5HMvs=", + "lastModified": 1775933978, + "narHash": "sha256-I1ju8FT1J9nNUSw8DDMGCLLUweDAkr45D2HQn3bW43o=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8b2302d8c10369c9135552cc892da75cff5ddb03", + "rev": "d1c71822cb8e861345c7ab6a9f841ac99d59d74a", "type": "github" }, "original": { diff --git a/packages/hyprland/default.nix b/packages/hyprland/default.nix index d4b7dc3..268b3bd 100644 --- a/packages/hyprland/default.nix +++ b/packages/hyprland/default.nix @@ -2,7 +2,7 @@ { home.packages = with pkgs; [ hyprland - swww + awww wl-clipboard pulseaudio ]; diff --git a/packages/nvim/default.nix b/packages/nvim/default.nix index 6741ccf..70edbc6 100644 --- a/packages/nvim/default.nix +++ b/packages/nvim/default.nix @@ -16,6 +16,8 @@ programs.neovim = { enable = true; vimAlias = true; + withRuby = false; + withPython3 = false; }; catppuccin.nvim.enable = false; diff --git a/packages/nvim/default.nix~ b/packages/nvim/default.nix~ new file mode 100644 index 0000000..8ff19b7 --- /dev/null +++ b/packages/nvim/default.nix~ @@ -0,0 +1,31 @@ +{ pkgs, config, lib,... }: +{ + + home.packages = with pkgs; [ + + ]; + +programs.neovim = { + enable = true; + vimAlias = true; +}; + + +programs.neovim.plugins = [ + pkgs.vimPlugins.lazy-nvim +]; + + home.file = + lib.mkMerge [ + { + ".config/nvim/init.lua".source = ./init.lua; + ".config/nvim/lua/config/lazy.lua".source = ./lua/config/lazy.lua; + ".config/nvim/lua/plugins/flutter.lua".source = ./lua/plugins/flutter.lua; + ".config/nvim/lua/plugins/coq.lua".source = ./lua/plugins/coq.lua; + ".config/nvim/lua/plugins/treesitter.lua".source = ./lua/plugins/treesitter.lua; + ".config/nvim/lua/plugins/catppuccin.lua".source = ./lua/plugins/catppuccin.lua; + ".config/nvim/lua/plugins/telescope.lua".source = ./lua/plugins/telescope.lua; + ".config/nvim/lua/plugins/highlight-colors.lua".source = ./lua/plugins/highlight-colors.lua; + } + ]; +} diff --git a/packages/nvim/init.lua~ b/packages/nvim/init.lua~ new file mode 100644 index 0000000..6c68a37 --- /dev/null +++ b/packages/nvim/init.lua~ @@ -0,0 +1,113 @@ +-- Tab +vim.opt.tabstop = 2 -- number of visual spaces per TAB +vim.opt.softtabstop = 2 -- number of spacesin tab when editing +vim.opt.shiftwidth = 2 -- insert 4 spaces on a tab +vim.opt.expandtab = true -- tabs are spaces, mainly because of python + +-- UI config +vim.opt.number = true -- show absolute number +vim.opt.relativenumber = true -- add numbers to each line on the left side +vim.opt.splitbelow = true -- open new vertical split bottom +vim.opt.splitright = true -- open new horizontal splits right +-- vim.opt.termguicolors = true -- enabl 24-bit RGB color in the TUI +vim.opt.showmode = false -- we are experienced, wo don't need the "-- INSERT --" mode hint + +-- Searching +vim.opt.incsearch = true -- search as characters are entered +vim.opt.hlsearch = false -- do not highlight matches +vim.opt.ignorecase = true -- ignore case in searches by default +vim.opt.smartcase = true -- but make it case sensitive if an uppercase is entered + +-- -- Keybinds +vim.keymap.set('n', '', 'h', opts) +vim.keymap.set('n', '', 'j', opts) +vim.keymap.set('n', '', 'k', opts) +vim.keymap.set('n', '', 'l', opts) + +-- Resize with arrows +-- delta: 2 lines +vim.keymap.set('n', '', ':resize -2', opts) +vim.keymap.set('n', '', ':resize +2', opts) +vim.keymap.set('n', '', ':vertical resize -2', opts) +vim.keymap.set('n', '', ':vertical resize +2', opts) + +-- Telescope binds +vim.keymap.set("n", "fb", ":Telescope file_browser") + + +vim.keymap.set('i', 'jk', '', opts) + +-- Lazy +require("config.lazy") +-- require("flutter-tools").setup {} -- use defaults +require("catppuccin").setup({ + integrations = { + cmp = false, + gitsigns = true, + nvimtree = true, + treesitter = true, + notify = false, + mini = { + enabled = false, + indentscope_color = "", + }, + } +}) + +-- css colors +vim.opt.termguicolors = true +require('nvim-highlight-colors').setup({}) + +vim.cmd.colorscheme "catppuccin" + + + + +-- lsp +local on_attach = function(_, bufnr) + + local bufmap = function(keys, func) + vim.keymap.set('n', keys, func, { buffer = bufnr }) + end + + bufmap('r', vim.lsp.buf.rename) + bufmap('a', vim.lsp.buf.code_action) + + bufmap('gd', vim.lsp.buf.definition) + bufmap('gD', vim.lsp.buf.declaration) + bufmap('gI', vim.lsp.buf.implementation) + bufmap('D', vim.lsp.buf.type_definition) + + bufmap('gr', require('telescope.builtin').lsp_references) + bufmap('s', require('telescope.builtin').lsp_document_symbols) + bufmap('S', require('telescope.builtin').lsp_dynamic_workspace_symbols) + + bufmap('K', vim.lsp.buf.hover) + + vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_) + vim.lsp.buf.format() + end, {}) +end + +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities = require('coq').lsp_ensure_capabilities(capabilities) + +require('lspconfig').lua_ls.setup { + on_attach = on_attach, + capabilities = capabilities, + root_dir = function() + return vim.loop.cwd() + end, + cmd = { "lua-lsp" }, + settings = { + Lua = { + workspace = { checkThirdParty = false }, + telemetry = { enable = false }, + }, + } +} + +require('lspconfig').nil_ls.setup { + on_attach = on_attach, + capabilities = capabilities, +} diff --git a/packages/other/default.nix b/packages/other/default.nix index 56eea38..95e2898 100644 --- a/packages/other/default.nix +++ b/packages/other/default.nix @@ -20,15 +20,12 @@ programs.git = { settings.extraConfig = { safe.directory = "/etc/nixos"; }; + signing.format = null; }; services.kdeconnect = { - enable = true; + enable = false; indicator = true; }; - - - - }