From 1e633dd97d5337be069e661e473bd41acd5ed53d Mon Sep 17 00:00:00 2001 From: Vivian Date: Wed, 4 Dec 2024 15:13:10 +0100 Subject: [PATCH] update --- common/desktop/default.nix | 16 ++--- common/hm-modules/nvim/default.nix | 8 ++- common/hm-modules/nvim/lsp.nix | 28 ++++++++- flake.lock | 86 +++++++++++++------------- flake.nix | 2 +- hosts/thalassa/aoife/default.nix | 14 ++--- hosts/thalassa/aoife/hardware.nix | 8 ++- hosts/thalassa/aoife/home/hyprland.nix | 10 +-- 8 files changed, 105 insertions(+), 67 deletions(-) diff --git a/common/desktop/default.nix b/common/desktop/default.nix index 69b654b6..415aee01 100644 --- a/common/desktop/default.nix +++ b/common/desktop/default.nix @@ -93,19 +93,19 @@ fonts.packages = with pkgs; [ material-design-icons + noto-fonts noto-fonts-cjk-sans noto-fonts-emoji + dejavu_fonts - (nerdfonts.override { - fonts = [ - "DejaVuSansMono" - "Ubuntu" - "DroidSansMono" - "NerdFontsSymbolsOnly" - ]; - }) + + nerd-fonts.dejavu-sans-mono + nerd-fonts.ubuntu + nerd-fonts.droid-sans-mono + nerd-fonts.symbols-only ]; + programs = { steam = { enable = true; diff --git a/common/hm-modules/nvim/default.nix b/common/hm-modules/nvim/default.nix index 09a9ddc6..4c0fd35a 100644 --- a/common/hm-modules/nvim/default.nix +++ b/common/hm-modules/nvim/default.nix @@ -136,11 +136,17 @@ with lib; treesitter = { enable = true; nixGrammars = true; - settings.highlight.enable = true; + settings = { + highlight.enable = true; + incremental_selection.enable = true; + indent.enable = true; + }; }; + # Git fugitive.enable = true; committia.enable = true; + gitsigns.enable = true; lualine = { enable = true; diff --git a/common/hm-modules/nvim/lsp.nix b/common/hm-modules/nvim/lsp.nix index 06d53fe9..7465dbc9 100644 --- a/common/hm-modules/nvim/lsp.nix +++ b/common/hm-modules/nvim/lsp.nix @@ -1,8 +1,34 @@ { pkgs, ... }: { plugins = { + rustaceanvim = { + enable = true; + rustAnalyzerPackage = pkgs.rust-analyzer; + + settings = { + auto_attach = true; + server = { + standalone = false; + default_settings = { + rust-analyzer = { + inlayHints = { + lifetimeElisionHints = { + enable = "always"; + }; + }; + check = { + command = "clippy"; + }; + cachePriming.enable = false; + }; + }; + }; + }; + }; + lsp = { enable = true; + inlayHints = true; keymaps = { lspBuf = { K = "hover"; @@ -23,7 +49,7 @@ nil_ls.enable = true; # NixOS dockerls.enable = true; rust_analyzer = { - enable = true; + enable = false; installCargo = false; installRustc = false; }; diff --git a/flake.lock b/flake.lock index ff51efed..b81022cb 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1732838231, - "narHash": "sha256-KJTRqfEcGpONBK/6BkMdWmbGth0r/nYWY3k/rvZl4es=", + "lastModified": 1733001911, + "narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=", "owner": "catppuccin", "repo": "nix", - "rev": "becc64812c8d6af24dedc2f75c5c63ebf778a115", + "rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e", "type": "github" }, "original": { @@ -625,11 +625,11 @@ ] }, "locked": { - "lastModified": 1732884235, - "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", + "lastModified": 1733304249, + "narHash": "sha256-o6wNhr1ONxMuBJUGC9v0hEjFdv5rN6XzHJEL/rQJLjA=", "owner": "nix-community", "repo": "home-manager", - "rev": "819f682269f4e002884702b87e445c82840c68f2", + "rev": "6c3a7a0b72c19ec994b85c57a1712d177bd809b2", "type": "github" }, "original": { @@ -646,11 +646,11 @@ ] }, "locked": { - "lastModified": 1732482255, - "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "lastModified": 1733175814, + "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "rev": "bf23fe41082aa0289c209169302afd3397092f22", "type": "github" }, "original": { @@ -742,11 +742,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1732633513, - "narHash": "sha256-6LmtOmeDpv9iHS8l0GNcppP11dKIJFMZLdFyxQ+qQBM=", + "lastModified": 1733284567, + "narHash": "sha256-zxBh56jKE6AXhiUoktY6cOHPUTyqXWbI/Pyh5sSC5B4=", "owner": "astro", "repo": "microvm.nix", - "rev": "093ef734d3c37669860043a87dbf1c09fc6f5b38", + "rev": "0ab757d2d3e3214b0034b00f9cc3dcdba0b8c563", "type": "github" }, "original": { @@ -763,11 +763,11 @@ ] }, "locked": { - "lastModified": 1732603785, - "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", + "lastModified": 1733105089, + "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", + "rev": "c6b65d946097baf3915dd51373251de98199280d", "type": "github" }, "original": { @@ -820,11 +820,11 @@ }, "nixlib": { "locked": { - "lastModified": 1732410305, - "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", + "lastModified": 1733015484, + "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "87b6978992e2eb605732fba842cad0a7e14b2047", + "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e", "type": "github" }, "original": { @@ -841,11 +841,11 @@ ] }, "locked": { - "lastModified": 1732496924, - "narHash": "sha256-/MNhZLR0eh9z/d3l+ammq+F5XxHln0RHgO4Bhtjr0IM=", + "lastModified": 1733101779, + "narHash": "sha256-Qqnfnb/RFxBbD25UYJ/yibvl9kIZNK5WkyLsUcb2byk=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "098e8b6ff72c86944a8d54b64ddd7b7e6635830a", + "rev": "a471acc460d4c238936a5116c8cc48a3c431dd66", "type": "github" }, "original": { @@ -856,11 +856,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1732483221, - "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", + "lastModified": 1733217105, + "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", + "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", "type": "github" }, "original": { @@ -966,26 +966,26 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1733249193, + "narHash": "sha256-TuGHC498nz3/3Momv5wKLGMHYAgX6S18JLQjdEeJiuE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "206cc199fcc174e297d6114b3d3b18443902df3d", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "type": "indirect" } }, "nixpkgs_5": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1733015953, + "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", "type": "github" }, "original": { @@ -1024,11 +1024,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1732838896, - "narHash": "sha256-9YfEyCU2wB/aSbtpZ+OHb++xS2Km970Ja33H13oEaWM=", + "lastModified": 1733220378, + "narHash": "sha256-tWCskBne7LigfeXRWnUFJKKTLOYmmdqiwdqom2Sml1s=", "owner": "pta2002", "repo": "nixvim", - "rev": "05331006a42846d6e55129b642485f45f90c9efc", + "rev": "78bfbf7b7eb7a1b6cf42e199547de55a55ba2cea", "type": "github" }, "original": { @@ -1039,11 +1039,11 @@ }, "nur": { "locked": { - "lastModified": 1732877422, - "narHash": "sha256-ZDOlikQLTOnKek5J2bHItv0tWS6c1kdcLzVMseGd2rI=", + "lastModified": 1733306116, + "narHash": "sha256-ZlbxSsBfrwQKfne/HIKjDaaIbpjqri9Ch5v3YubyHks=", "owner": "nix-community", "repo": "NUR", - "rev": "c5bfbd142cb0d4aee8e8222934cf4c305548d4ac", + "rev": "d07fbb0bcbdc0a0969373a8679d24aa565805a35", "type": "github" }, "original": { @@ -1062,11 +1062,11 @@ ] }, "locked": { - "lastModified": 1731936508, - "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", + "lastModified": 1733006402, + "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=", "owner": "NuschtOS", "repo": "search", - "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", + "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2", "type": "github" }, "original": { @@ -1328,11 +1328,11 @@ ] }, "locked": { - "lastModified": 1732643199, - "narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=", + "lastModified": 1732894027, + "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c", + "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index aa50e451..1489a7d0 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ # * https://github.com/Infinidoge/nix-minecraft inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable"; + nixpkgs.url = "nixpkgs/nixos-unstable-small"; flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus"; nur.url = "github:nix-community/NUR"; colmena.url = "github:zhaofengli/colmena"; diff --git a/hosts/thalassa/aoife/default.nix b/hosts/thalassa/aoife/default.nix index 4dff1b23..020936ff 100644 --- a/hosts/thalassa/aoife/default.nix +++ b/hosts/thalassa/aoife/default.nix @@ -6,6 +6,7 @@ inputs, lib, pkgs, + modulesPath, ... }: { @@ -16,9 +17,6 @@ ./uni.nix ]; - # services.power-profiles-daemon.enable = lib.mkForce false; - # services.tlp.enable = true; - meta = { mac = "04:7b:cb:b6:2d:88"; isLaptop = true; @@ -26,14 +24,15 @@ users.users.vivian.extraGroups = [ "adbusers" ]; - environment.systemPackages = with pkgs; [ - - ]; - services.flatpak.enable = true; # Bootloader. boot = { + kernelParams = [ + "amdgpu.sg_display=0" # did not fix the flickering + "amdgpu.ppfeaturemask=0xffffffff" # did not fix flicker + "amdgpu.graphics_sg=0" + ]; bootspec.enable = true; initrd.kernelModules = [ "amdgpu" ]; resumeDevice = "/dev/nvme0n1p2"; @@ -54,7 +53,6 @@ programs.nix-ld.enable = true; programs.nix-ld.libraries = with pkgs; [ - # Add any missing dynamic libraries for unpackaged programs # here, NOT in environment.systemPackages diff --git a/hosts/thalassa/aoife/hardware.nix b/hosts/thalassa/aoife/hardware.nix index adca3b8c..787a3995 100644 --- a/hosts/thalassa/aoife/hardware.nix +++ b/hosts/thalassa/aoife/hardware.nix @@ -14,10 +14,16 @@ graphics = { enable = true; extraPackages = with pkgs; [ - amdvlk mesa.drivers ]; }; + + amdgpu = { + initrd.enable = true; + opencl.enable = true; + amdvlk.enable = true; + + }; }; services = { fwupd.enable = true; diff --git a/hosts/thalassa/aoife/home/hyprland.nix b/hosts/thalassa/aoife/home/hyprland.nix index b9a77d7c..f8242144 100644 --- a/hosts/thalassa/aoife/home/hyprland.nix +++ b/hosts/thalassa/aoife/home/hyprland.nix @@ -196,10 +196,12 @@ in passes = 1; }; - drop_shadow = "yes"; - shadow_range = 4; - shadow_render_power = 3; - "col.shadow" = "rgba(1a1a1aee)"; + shadow = { + enabled = true; + color = "rgba(1a1a1aee)"; + range = 4; + render_power = 3; + }; }; animations = { enabled = "yes";