From a7b626a131cb0a71ea1fc4c326cee82f988879a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Tue, 18 Feb 2025 19:51:10 +0100 Subject: [PATCH] Use regular hyprland --- flake.lock | 506 +-------------------- flake.nix | 16 - home/git/default.nix | 1 + home/hyprland/default.nix | 3 +- home/nvim/files/lua/plugins/catppuccin.lua | 1 + home/nvim/files/lua/plugins/dap.lua | 175 +++---- home/nvim/files/lua/plugins/nvim-lint.lua | 14 +- hosts/Common/desktop.nix | 11 +- hosts/Kell/default.nix | 21 +- 9 files changed, 128 insertions(+), 620 deletions(-) diff --git a/flake.lock b/flake.lock index da6e17e..e41ae22 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-DuhR3y0gPZG0AJ2FDd+nUKzQMwT+c/DFIUWNDQ5Uyx4=", - "path": "/nix/store/n0765zaz6mvbrlcgqg4a6yivyk4n5xxz-source/home/ags", + "path": "/nix/store/8waggz90kqc3r1szbsy7332f8xhgg5qw-source/home/ags", "type": "path" }, "original": { - "path": "/nix/store/n0765zaz6mvbrlcgqg4a6yivyk4n5xxz-source/home/ags", + "path": "/nix/store/8waggz90kqc3r1szbsy7332f8xhgg5qw-source/home/ags", "type": "path" } }, @@ -38,39 +38,6 @@ "type": "github" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739103745, - "narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "astal": { "inputs": { "nixpkgs": [ @@ -93,22 +60,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -191,28 +142,6 @@ "url": "https://git.thomasave.be/thomasave/fzgo.git" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -233,302 +162,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1738664950, - "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739049071, - "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_3", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1739757807, - "narHash": "sha256-R+fSm684OXCOjhhdANCgBvUPRPiya6Cyi2zV5Xf6sHI=", - "ref": "refs/heads/main", - "rev": "59c615c321c45302491de3b1c003844c86aefca7", - "revCount": 5825, - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1738422629, - "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739048983, - "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739048914, - "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "a7334904d591f38757c46fbe2ab68651877d9099", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprsplit": { - "inputs": { - "hyprland": [ - "hyprland" - ] - }, - "locked": { - "lastModified": 1738616954, - "narHash": "sha256-zxA+ad1meC19xwyIOcvwd2Ej4FytY3wC3LI6iTQ74bw=", - "ref": "refs/heads/main", - "rev": "ae21754c90f1eaa839cc20b4981f8c9556c866bc", - "revCount": 64, - "type": "git", - "url": "https://github.com/shezdy/hyprsplit" - }, - "original": { - "type": "git", - "url": "https://github.com/shezdy/hyprsplit" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739048933, - "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1739049028, - "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "04146df74a8d5ec0b579657307be01f1e241125f", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1693833173, - "narHash": "sha256-hlMABKrGbEiJD5dwUSfnw1CQ3bG7KKwDV+Nx3bEZd7U=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "ac030bd9ba98e318e1f4c4328d60766ade8ebe8b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nixos-06cb-009a-fingerprint-sensor": { "inputs": { "nixpkgs": [ @@ -584,11 +217,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1739580444, + "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "8bb37161a0488b89830168b81c48aed11569cb93", "type": "github" }, "original": { @@ -602,35 +235,19 @@ "locked": { "lastModified": 1739580444, "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", "rev": "8bb37161a0488b89830168b81c48aed11569cb93", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_5": { - "locked": { - "lastModified": 1739580444, - "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8bb37161a0488b89830168b81c48aed11569cb93", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1730200266, "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", @@ -649,7 +266,7 @@ "nur": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -666,79 +283,17 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "ags": "ags", "fzgo": "fzgo", "home-manager": "home-manager", - "hyprland": "hyprland", - "hyprsplit": "hyprsplit", "nixos-06cb-009a-fingerprint-sensor": "nixos-06cb-009a-fingerprint-sensor", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nur": "nur", - "split-monitor-workspaces": "split-monitor-workspaces", "worktimer": "worktimer" } }, - "split-monitor-workspaces": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "nix-filter": "nix-filter" - }, - "locked": { - "lastModified": 1738490537, - "narHash": "sha256-AxrlbJgHb5ECeEDi2qumeR2xeu7sl5AG/ssjdUx33Pg=", - "owner": "Duckonaut", - "repo": "split-monitor-workspaces", - "rev": "917e9ad52e910ffa0ab7d61fecd5a2e3d3f66d87", - "type": "github" - }, - "original": { - "owner": "Duckonaut", - "repo": "split-monitor-workspaces", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -763,7 +318,7 @@ "worktimer": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1739738223, @@ -779,47 +334,6 @@ "type": "git", "url": "https://git.thomasave.be/thomasave/WorkTimer" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737634991, - "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f127842..27b6b08 100644 --- a/flake.nix +++ b/flake.nix @@ -5,23 +5,9 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland = { - type = "git"; - url = "https://github.com/hyprwm/Hyprland"; - submodules = true; - }; - hyprsplit = { - type = "git"; - url = "https://github.com/shezdy/hyprsplit"; - inputs.hyprland.follows = "hyprland"; - }; nur.url = "github:nix-community/NUR"; ags.url = "./home/ags"; fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git"; - split-monitor-workspaces = { - url = "github:Duckonaut/split-monitor-workspaces"; - inputs.hyprland.follows = "hyprland"; - }; worktimer = { type = "git"; url = "https://git.thomasave.be/thomasave/WorkTimer"; @@ -48,12 +34,10 @@ time.timeZone = "Europe/Brussels"; nix.settings = { substituters = [ - "https://hyprland.cachix.org" "https://nix-community.cachix.org" "https://cuda-maintainers.cachix.org" ]; trusted-public-keys = [ - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" ]; diff --git a/home/git/default.nix b/home/git/default.nix index 6f1fca0..3cdd1ee 100644 --- a/home/git/default.nix +++ b/home/git/default.nix @@ -8,6 +8,7 @@ enable = true; userName = "Thomas Avé"; userEmail = "email@thomasave.be"; + lfs.enable = true; aliases = { s = "status"; a = "add"; diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index e4e170d..58379e0 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -22,7 +22,7 @@ let # hyprland_plugins = [ inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces ]; workspace_command_prefix = "split:"; - hyprland_plugins = [ inputs.hyprsplit.packages."${pkgs.system}".hyprsplit ]; + hyprland_plugins = [ pkgs.hyprlandPlugins.hyprsplit ]; # Disable split-monitor-workspaces # workspace_command_prefix = ""; @@ -126,7 +126,6 @@ in { systemd.enable = true; systemd.enableXdgAutostart = true; xwayland.enable = true; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; plugins = [ ] ++ hyprland_plugins; settings = { "$mainMod" = pkgs.lib.mkDefault "SUPER_L"; diff --git a/home/nvim/files/lua/plugins/catppuccin.lua b/home/nvim/files/lua/plugins/catppuccin.lua index 5a62f4a..774d66c 100644 --- a/home/nvim/files/lua/plugins/catppuccin.lua +++ b/home/nvim/files/lua/plugins/catppuccin.lua @@ -16,6 +16,7 @@ return { TelescopeTitle = { fg = colors.blue }, WinSeparator = { fg = "#023269" }, FlashCursor = { bg = colors.red }, + SnacksIndent = { fg = "#303240" }, } end, color_overrides = { diff --git a/home/nvim/files/lua/plugins/dap.lua b/home/nvim/files/lua/plugins/dap.lua index ae09f29..9fb841d 100644 --- a/home/nvim/files/lua/plugins/dap.lua +++ b/home/nvim/files/lua/plugins/dap.lua @@ -1,90 +1,91 @@ return { - { - "mfussenegger/nvim-dap", - dependencies = { - "leoluz/nvim-dap-go", - 'mfussenegger/nvim-dap-python', - "rcarriga/nvim-dap-ui", - "nvim-neotest/nvim-nio", + { + "mfussenegger/nvim-dap", + dependencies = { + "leoluz/nvim-dap-go", + 'mfussenegger/nvim-dap-python', + "rcarriga/nvim-dap-ui", + "nvim-neotest/nvim-nio", + }, + config = function() + local dap = require "dap" + require('dap.ext.vscode').load_launchjs("launch.json") + dap.defaults.fallback.exception_breakpoints = {'raised'} + + local ui = require "dapui" + + require("dapui").setup({ + layouts = { + { + elements = { + { + id = "breakpoints", + size = 0.5 + }, + { + id = "stacks", + size = 0.5 + }, + -- { + -- id = "watches", + -- size = 0.25 + -- }, + }, + position = "left", + size = 25 + }, + { + elements = { + { + id = "scopes", + size = 1 + }, + }, + position = "bottom", + size = 10 + }, + { + elements = { + { + id = "repl", + size = 1 + }, + }, + position = "bottom", + size = 10 + } + }, + }) + require("dap-go").setup() + require("dap-python").setup() + + vim.keymap.set("n", "b", dap.toggle_breakpoint) + vim.keymap.set("n", "gb", dap.run_to_cursor) + + -- Eval var under cursor + vim.keymap.set("n", "?", function() + require("dapui").eval(nil, { enter = true }) + end) + + vim.keymap.set("n", "", dap.continue) + vim.keymap.set("n", "", dap.step_into) + vim.keymap.set("n", "", dap.step_over) + vim.keymap.set("n", "", dap.step_out) + vim.keymap.set("n", "", dap.step_back) + vim.keymap.set("n", "", dap.restart) + + dap.listeners.before.attach.dapui_config = function() + ui.open() + end + dap.listeners.before.launch.dapui_config = function() + ui.open() + end + -- dap.listeners.before.event_terminated.dapui_config = function() + -- ui.close() + -- end + -- dap.listeners.before.event_exited.dapui_config = function() + -- ui.close() + -- end + end, }, - config = function() - local dap = require "dap" - require('dap.ext.vscode').load_launchjs("launch.json") - - local ui = require "dapui" - - require("dapui").setup({ - layouts = { - { - elements = { - { - id = "breakpoints", - size = 0.5 - }, - { - id = "stacks", - size = 0.5 - }, - -- { - -- id = "watches", - -- size = 0.25 - -- }, - }, - position = "left", - size = 25 - }, - { - elements = { - { - id = "scopes", - size = 1 - }, - }, - position = "bottom", - size = 10 - }, - { - elements = { - { - id = "repl", - size = 1 - }, - }, - position = "bottom", - size = 10 - } - }, - }) - require("dap-go").setup() - require("dap-python").setup() - - vim.keymap.set("n", "b", dap.toggle_breakpoint) - vim.keymap.set("n", "gb", dap.run_to_cursor) - - -- Eval var under cursor - vim.keymap.set("n", "?", function() - require("dapui").eval(nil, { enter = true }) - end) - - vim.keymap.set("n", "", dap.continue) - vim.keymap.set("n", "", dap.step_into) - vim.keymap.set("n", "", dap.step_over) - vim.keymap.set("n", "", dap.step_out) - vim.keymap.set("n", "", dap.step_back) - vim.keymap.set("n", "", dap.restart) - - dap.listeners.before.attach.dapui_config = function() - ui.open() - end - dap.listeners.before.launch.dapui_config = function() - ui.open() - end - -- dap.listeners.before.event_terminated.dapui_config = function() - -- ui.close() - -- end - -- dap.listeners.before.event_exited.dapui_config = function() - -- ui.close() - -- end - end, - }, } diff --git a/home/nvim/files/lua/plugins/nvim-lint.lua b/home/nvim/files/lua/plugins/nvim-lint.lua index f17e764..d05af86 100644 --- a/home/nvim/files/lua/plugins/nvim-lint.lua +++ b/home/nvim/files/lua/plugins/nvim-lint.lua @@ -22,12 +22,12 @@ return { require("lint").linters_by_ft = { python = {"mypy"}, } - vim.api.nvim_create_autocmd({ "BufWritePost" }, { - callback = function() - -- try_lint without arguments runs the linters defined in `linters_by_ft` - -- for the current tile type - require("lint").try_lint() - end, - }) + -- vim.api.nvim_create_autocmd({ "BufWritePost" }, { + -- callback = function() + -- -- try_lint without arguments runs the linters defined in `linters_by_ft` + -- -- for the current tile type + -- require("lint").try_lint() + -- end, + -- }) end } diff --git a/hosts/Common/desktop.nix b/hosts/Common/desktop.nix index 7fa49aa..0a9e99f 100644 --- a/hosts/Common/desktop.nix +++ b/hosts/Common/desktop.nix @@ -1,11 +1,18 @@ -{ pkgs, ... }: +{ inputs, pkgs, ... }: { services.udev.packages = [ pkgs.yubikey-personalization ]; hardware.graphics = { enable = true; + extraPackages = with pkgs; [ + vulkan-loader + vulkan-validation-layers + vulkan-extension-layer + ]; + }; + programs.hyprland = { + enable = true; }; - services.greetd = { enable = pkgs.lib.mkDefault true; settings = rec { diff --git a/hosts/Kell/default.nix b/hosts/Kell/default.nix index 6dc67fd..b4ceaeb 100644 --- a/hosts/Kell/default.nix +++ b/hosts/Kell/default.nix @@ -18,6 +18,7 @@ in { boot.kernelModules = [ "zenpower amd_pstate=active" ]; boot.kernelParams = ["amd_pstate=active"]; boot.initrd.kernelModules = [ "amdgpu" ]; + # hardware.graphics.extraPackages = with pkgs; [ # rocmPackages.clr.icd # ]; @@ -64,18 +65,18 @@ in { }; }; networking.interfaces.br0.useDHCP = lib.mkDefault true; - networking.interfaces.wlan0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; boot.kernel.sysctl."net.ipv6.conf.enp5s0.disable_ipv6" = true; - networking.wireless.iwd.enable = true; - networking.wireless.iwd.settings = { - IPv6 = { - Enabled = true; - }; - Settings = { - AutoConnect = true; - }; - }; + # networking.wireless.iwd.enable = true; + # networking.wireless.iwd.settings = { + # IPv6 = { + # Enabled = true; + # }; + # Settings = { + # AutoConnect = true; + # }; + # }; # Programs & Services