From 608752f938854e9661d88e1d70cd8d97a84fd467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Gro=C3=9Fmann?= Date: Fri, 26 May 2023 19:13:51 +0900 Subject: [PATCH] small experiments and fixes --- flake.lock | 6 +++--- flake.nix | 1 + hosts/common/zfs.nix | 16 ++++++++++++++++ .../{hyprland.conf => hyprland.conf.nix} | 0 users/common/graphical/hyprland.nix | 5 +++-- users/common/graphical/waybar.nix | 3 +++ users/common/nvim/default.nix | 3 +++ users/common/nvim/lua/plugins/neotree.lua | 2 +- 8 files changed, 30 insertions(+), 6 deletions(-) rename users/common/graphical/{hyprland.conf => hyprland.conf.nix} (100%) diff --git a/flake.lock b/flake.lock index ec98018..ff5f918 100644 --- a/flake.lock +++ b/flake.lock @@ -217,11 +217,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1684750687, - "narHash": "sha256-lqFY4fLfx17l4lFBCe0nQdNAexxkqut90Y2cBOc2gbo=", + "lastModified": 1684959562, + "narHash": "sha256-Lmdq2O1JtIu7JPce852a7oChjm/zmkLg/JUAT3Tmh6I=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "ad244190e001de3eded047a5a387ea47fa0b3eea", + "rev": "a2bb95fc60c717c873eff273f5ee035e622565d0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 886e500..59cf458 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,7 @@ hyprland = { url = "github:hyprwm/Hyprland"; + #url = "/home/patrick/Downloads/Hyprland"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/common/zfs.nix b/hosts/common/zfs.nix index 7f3df45..d5aad72 100644 --- a/hosts/common/zfs.nix +++ b/hosts/common/zfs.nix @@ -12,6 +12,22 @@ environment.systemPackages = with pkgs; [zfs]; + # Might help with hangs mainly atuin + #boot.kernelPatches = [ + # { + # name = "enable RT_FULL"; + # patch = null; + # extraConfig = '' + # PREEMPT y + # PREEMPT_BUILD y + # PREEMPT_VOLUNTARY n + # PREEMPT_COUNT y + # PREEMPTION y + # DEBUG_INFO_BTF n + # ''; + # } + #]; + services.zfs = { autoScrub = { enable = true; diff --git a/users/common/graphical/hyprland.conf b/users/common/graphical/hyprland.conf.nix similarity index 100% rename from users/common/graphical/hyprland.conf rename to users/common/graphical/hyprland.conf.nix diff --git a/users/common/graphical/hyprland.nix b/users/common/graphical/hyprland.nix index 55ec63a..16c8a40 100644 --- a/users/common/graphical/hyprland.nix +++ b/users/common/graphical/hyprland.nix @@ -12,7 +12,8 @@ in { name = x; value = []; }) - TAGS); + ["42" "43" "44"]); + home.packages = with pkgs; [ qt6.qtwayland wl-clipboard @@ -24,6 +25,6 @@ in { enable = true; xwayland.hidpi = true; nvidiaPatches = true; - extraConfig = import ./hyprland.conf MOD TAGS pkgs; + extraConfig = import ./hyprland.conf.nix MOD TAGS pkgs; }; } diff --git a/users/common/graphical/waybar.nix b/users/common/graphical/waybar.nix index ebea82d..6e2ab76 100644 --- a/users/common/graphical/waybar.nix +++ b/users/common/graphical/waybar.nix @@ -40,6 +40,9 @@ format = "{ifname}  {bandwidthUpBits}  {bandwidthDownBits}"; interval = 1; }; + "wlr/workspaces" = { + on-click = "activate"; + }; }; }; style = ./waybar.css; diff --git a/users/common/nvim/default.nix b/users/common/nvim/default.nix index fe3548c..5ffdf59 100644 --- a/users/common/nvim/default.nix +++ b/users/common/nvim/default.nix @@ -7,6 +7,9 @@ defaultEditor = true; withNodeJs = true; extraPackages = with pkgs; [ + # treesitter + clang_15 + clang-tools_15 # tabnine complition braucht unzip unzip # telescope fzf native braucht make diff --git a/users/common/nvim/lua/plugins/neotree.lua b/users/common/nvim/lua/plugins/neotree.lua index f33cb80..47d7270 100644 --- a/users/common/nvim/lua/plugins/neotree.lua +++ b/users/common/nvim/lua/plugins/neotree.lua @@ -54,7 +54,7 @@ return { renamed = "➜", untracked = "?", ignored = "", - unstaged = "", + unstaged = "󰄱", staged = "", conflict = "", },