wip: customize nvf, sway config modifications

defaults/.neoconf.json

@@ -1,20 +0,0 @@
-{
-  "neodev": {
-    "library": {
-      "enabled": true,
-      "plugins": true
-    }
-  },
-  "neoconf": {
-    "plugins": {
-      "lua_ls": {
-        "enabled": true
-      }
-    }
-  },
-  "lspconfig": {
-    "lua_ls": {
-      "Lua.format.enable": false
-    }
-  }
-}

defaults/.stylua.toml

@@ -1,7 +0,0 @@
-column_width = 120
-line_endings = "Unix"
-indent_type = "Spaces"
-indent_width = 2
-quote_style = "AutoPreferDouble"
-call_parentheses = "None"
-collapse_simple_statement = "Always"

defaults/sway/config

@@ -215,7 +215,8 @@ font pango:FiraCode: 14px
 ### Window formatting
 default_border none
 default_border pixel 2
-gaps inner 10px
+gaps inner 0
+gaps outer 0
 
 # Applications
 exec_always /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1

flake.lock

@@ -61,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753121425,
+        "lastModified": 1754487366,
-        "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
+        "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
+        "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
         "type": "github"
       },
       "original": {
@@ -101,11 +101,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1751123364,
+        "lastModified": 1755536444,
-        "narHash": "sha256-Nb3pxs1onnbdhhnoNc+IfHzrW9dM+UbEdjK0AguR2J4=",
+        "narHash": "sha256-NFPZW6obNgUyELvekVhagCbXcdepZAAezxyzmFPQnFg=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "f6d1c274b9c0e095dc0a1b411dec7410ad779bf5",
+        "rev": "d8842b933b4991e8197e2605135d13a299f388f5",
         "type": "github"
       },
       "original": {
@@ -121,11 +121,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750792728,
+        "lastModified": 1753592768,
-        "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=",
+        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557",
+        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
         "type": "github"
       },
       "original": {
@@ -181,11 +181,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1750969886,
+        "lastModified": 1755471983,
-        "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=",
+        "narHash": "sha256-axUoWcm4cNQ36jOlnkD9D40LTfSQgk8ExfHSRm3rTtg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a676066377a2fe7457369dd37c31fd2263b662f4",
+        "rev": "48f4c982de68d966421d2b6f1ddbeb6227cc5ceb",
         "type": "github"
       },
       "original": {
@@ -197,11 +197,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1753432016,
+        "lastModified": 1755049066,
-        "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=",
+        "narHash": "sha256-ANrc15FSoOAdNbfKHxqEJjZLftIwIsenJGRb/04K41s=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6027c30c8e9810896b92429f0092f624f7b1aace",
+        "rev": "e45f8f193029378d0aaee5431ba098dc80054e9a",
         "type": "github"
       },
       "original": {
@@ -220,11 +220,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1754552918,
+        "lastModified": 1755463179,
-        "narHash": "sha256-vbT+nGdMLNAeYZ1S5WBBLJTVWosGne2VRt46rqPfB2A=",
+        "narHash": "sha256-5Ggb1Mhf7ZlRgGi2puCa2PvWs6KbMnWBlW6KW7Vf79Y=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "d61de135ce174f4e04b4e509de02e1afe040a834",
+        "rev": "03833118267ad32226b014b360692bdce9d6e082",
         "type": "github"
       },
       "original": {
@@ -276,7 +276,8 @@
     "zig": {
       "inputs": {
         "flake-compat": [
-          "ghostty"
+          "ghostty",
+          "flake-compat"
         ],
         "flake-utils": [
           "ghostty",
@@ -322,8 +323,8 @@
       },
       "original": {
         "owner": "jcollie",
-        "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "repo": "zon2nix",
+        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "type": "github"
       }
     }

home/neovim.nix

@@ -18,17 +18,23 @@
         viAlias = true;
         vimAlias = true;
 
-        # useSystemClipboard = true;
-
         # setting some nvim settings that are not in nvf
         luaConfigPost = ''
-          vim.opt.tabstop = 2
+          vim.opt.tabstop = 4
-          vim.opt.shiftwidth = 2
+          vim.opt.shiftwidth = 4
           vim.opt.expandtab = true
           vim.opt.autoindent = true
           vim.opt.smartindent = true
           vim.opt.smarttab = true
-          vim.opt.scrolloff = 20;
+          vim.opt.scrolloff = 12
+          vim.opt.sidescrolloff = 8
+          vim.opt.wrap = false
+          vim.opt.linebreak = false
+          vim.opt.number = true
+          vim.opt.relativgnumber = true
+          vim.opt.cursorline = true
+          vim.opt.signcolumn = "yes"
+          vim.opt.tabline = 2
         '';
 
         # clipboard configuration
@@ -132,7 +138,7 @@
             enable = true;
             lsp = {
               enable = true;
-              server = "csharp_ls";
+              server = "omnisharp";
             };
             treesitter.enable = true;
           };
@@ -191,8 +197,12 @@
 
         # tabline configuration
         tabline = {
-          nvimBufferline.enable = true;
+          nvimBufferline = {
-          nvimBufferline.mappings = {
+            enable = true;
+            options = {
+              numbers = "none";
+            };
+            mappings = {
               closeCurrent = "<leader>x";
               cycleNext = "<tab>";
               cyclePrevious = "<S-tab>";
@@ -203,6 +213,7 @@
               sortById = null;
             };
           };
+        };
 
         treesitter = {
           context = {

home/sway.nix

@@ -6,14 +6,6 @@
   dirs = {
     defaults = ../defaults;
   };
-
-  # Derived from subprojects/cava.wrap
-  libcava.src = pkgs.fetchFromGitHub {
-    owner = "LukashonakV";
-    repo = "cava";
-    rev = "0.10.3";
-    hash = "sha256-ZDFbI69ECsUTjbhlw2kHRufZbQMu+FQSMmncCJ5pagg=";
-  };
 in {
   wayland.windowManager.sway = {
     enable = pkgs.stdenv.isLinux;
@@ -25,12 +17,32 @@ in {
       gtk = true;
     };
   };
+  xdg = {
+    configFile = {
+      "sway/config".source = lib.mkForce (dirs.defaults + /sway/config);
+      "waybar/config".source = lib.mkForce (dirs.defaults + /waybar/config);
+      "waybar/style.css".source = lib.mkForce (dirs.defaults + /waybar/style.css);
+    };
+  };
 
-  xdg.configFile."sway/config".source = lib.mkForce (dirs.defaults + /sway/config);
+  services.mako = {
-  xdg.configFile."waybar/config".source = lib.mkForce (dirs.defaults + /waybar/config);
+    enable = pkgs.stdenv.isLinux;
-  xdg.configFile."waybar/style.css".source = lib.mkForce (dirs.defaults + /waybar/style.css);
+    settings = {
-
+      text-color = "#cad3f5";
-  programs.wofi = { 
+      border-color = "#c6d0f5";
+      background-color = "#24273a";
+      width = 420;
+      height = 110;
+      padding = 10;
+      border-size = 2;
+      font = "Monaspace Krypton 9";
+      anchor = "top-right";
+      default-timeout = 5000;
+      max-icon-size = 32;
+    };
+  };
+  programs = {
+    wofi = {
       enable = pkgs.stdenv.isLinux;
       settings = {
         width = 600;
@@ -125,42 +137,11 @@ in {
         }
       '';
     };
-  programs.swaylock.enable = pkgs.stdenv.isLinux;
+    swaylock.enable = pkgs.stdenv.isLinux;
 
-  services.mako = {
+    waybar = {
-    enable = pkgs.stdenv.isLinux;
-    settings = {
-      text-color="#cad3f5";
-      border-color="#c6d0f5";
-      background-color="#24273a";
-      width=420;
-      height=110;
-      padding=10;
-      border-size=2;
-      font="Monaspace Krypton 9";
-      anchor="top-right";
-      default-timeout=5000;
-      max-icon-size=32;
-    };
-  };
-
-  programs.waybar = {
       enable = pkgs.stdenv.isLinux;
       systemd.enable = true;
-
-    package = pkgs.waybar.overrideAttrs (old: {
-      version = "0.11.0";
-
-      src = pkgs.fetchFromGitHub {
-        owner = "Alexays";
-        repo = "Waybar";
-        rev = "d56dd6ee7fdf8c5ba4e90790af62b7f7829d3a47";
-        sha256 = "sha256-3lc0voMU5RS+mEtxKuRayq/uJO09X7byq6Rm5NZohq8=";
-        fetchSubmodules = true;
     };
-
-      buildInputs = old.buildInputs ++ [ pkgs.fftw pkgs.libcava ];
-      # mesonFlags = (old.mesonFlags or []) ++ [ "-Dcava=disabled" ];
-    });
   };
 }