diff --git a/defaults/sway/config b/defaults/sway/config index 40c4ff0..174fba1 100644 --- a/defaults/sway/config +++ b/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 diff --git a/flake.lock b/flake.lock index 2d87ae8..cc35439 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", + "lastModified": 1754487366, + "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, - "narHash": "sha256-Nb3pxs1onnbdhhnoNc+IfHzrW9dM+UbEdjK0AguR2J4=", + "lastModified": 1755536444, + "narHash": "sha256-NFPZW6obNgUyELvekVhagCbXcdepZAAezxyzmFPQnFg=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "f6d1c274b9c0e095dc0a1b411dec7410ad779bf5", + "rev": "d8842b933b4991e8197e2605135d13a299f388f5", "type": "github" }, "original": { @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1750792728, - "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", + "lastModified": 1753592768, + "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, - "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", + "lastModified": 1755471983, + "narHash": "sha256-axUoWcm4cNQ36jOlnkD9D40LTfSQgk8ExfHSRm3rTtg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", + "rev": "48f4c982de68d966421d2b6f1ddbeb6227cc5ceb", "type": "github" }, "original": { @@ -197,11 +197,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1753432016, - "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=", + "lastModified": 1755049066, + "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, - "narHash": "sha256-vbT+nGdMLNAeYZ1S5WBBLJTVWosGne2VRt46rqPfB2A=", + "lastModified": 1755463179, + "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" } } diff --git a/home/neovim.nix b/home/neovim.nix index 4d7701b..f6d7ac3 100644 --- a/home/neovim.nix +++ b/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.shiftwidth = 2 + vim.opt.tabstop = 4 + 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,16 +197,21 @@ # tabline configuration tabline = { - nvimBufferline.enable = true; - nvimBufferline.mappings = { - closeCurrent = "x"; - cycleNext = ""; - cyclePrevious = ""; - moveNext = null; - movePrevious = null; - sortByDirectory = null; - sortByExtension = null; - sortById = null; + nvimBufferline = { + enable = true; + options = { + numbers = "none"; + }; + mappings = { + closeCurrent = "x"; + cycleNext = ""; + cyclePrevious = ""; + moveNext = null; + movePrevious = null; + sortByDirectory = null; + sortByExtension = null; + sortById = null; + }; }; }; diff --git a/home/sway.nix b/home/sway.nix index 5778135..925a54f 100644 --- a/home/sway.nix +++ b/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,142 +17,131 @@ in { gtk = true; }; }; - - xdg.configFile."sway/config".source = lib.mkForce (dirs.defaults + /sway/config); - xdg.configFile."waybar/config".source = lib.mkForce (dirs.defaults + /waybar/config); - xdg.configFile."waybar/style.css".source = lib.mkForce (dirs.defaults + /waybar/style.css); - - programs.wofi = { - enable = pkgs.stdenv.isLinux; - settings = { - width=600; - height=350; - location="center"; - show="drun"; - prompt="Search..."; - filter_rate=100; - allow_markup=true; - no_actions=true; - halign="fill"; - orientation="vertical"; - content_halign="fill"; - insensitive=true; - allow_images=true; - image_size=40; - gtk_dark=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); }; - style = '' - @define-color selected-text #8caaee; - @define-color text #c6d0f5; - @define-color base #24273a; - - * { - font-family: 'Monaspace Krypton 9', monospace; - font-size: 18px; - } - - window { - margin: 0px; - padding: 20px; - background-color: @base; - opacity: 0.95; - } - - #inner-box { - margin: 0; - padding: 0; - border: none; - background-color: @base; - } - - #outer-box { - margin: 0; - padding: 20px; - border: none; - background-color: @base; - } - - #scroll { - margin: 0; - padding: 0; - border: none; - background-color: @base; - } - - #input { - margin: 0; - padding: 10px; - border: none; - background-color: @base; - color: @text; - } - - #input:focus { - outline: none; - box-shadow: none; - border: none; - } - - #text { - margin: 5px; - border: none; - color: @text; - } - - #entry { - background-color: @base; - } - - #entry:selected { - outline: none; - border: none; - } - - #entry:selected #text { - color: @selected-text; - } - - #entry image { - -gtk-icon-transform: scale(0.7); - } - ''; }; - programs.swaylock.enable = pkgs.stdenv.isLinux; - + services.mako = { 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; + 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; + programs = { + wofi = { + enable = pkgs.stdenv.isLinux; + settings = { + width = 600; + height = 350; + location = "center"; + show = "drun"; + prompt = "Search..."; + filter_rate = 100; + allow_markup = true; + no_actions = true; + halign = "fill"; + orientation = "vertical"; + content_halign = "fill"; + insensitive = true; + allow_images = true; + image_size = 40; + gtk_dark = true; }; + style = '' + @define-color selected-text #8caaee; + @define-color text #c6d0f5; + @define-color base #24273a; - buildInputs = old.buildInputs ++ [ pkgs.fftw pkgs.libcava ]; - # mesonFlags = (old.mesonFlags or []) ++ [ "-Dcava=disabled" ]; - }); + * { + font-family: 'Monaspace Krypton 9', monospace; + font-size: 18px; + } + + window { + margin: 0px; + padding: 20px; + background-color: @base; + opacity: 0.95; + } + + #inner-box { + margin: 0; + padding: 0; + border: none; + background-color: @base; + } + + #outer-box { + margin: 0; + padding: 20px; + border: none; + background-color: @base; + } + + #scroll { + margin: 0; + padding: 0; + border: none; + background-color: @base; + } + + #input { + margin: 0; + padding: 10px; + border: none; + background-color: @base; + color: @text; + } + + #input:focus { + outline: none; + box-shadow: none; + border: none; + } + + #text { + margin: 5px; + border: none; + color: @text; + } + + #entry { + background-color: @base; + } + + #entry:selected { + outline: none; + border: none; + } + + #entry:selected #text { + color: @selected-text; + } + + #entry image { + -gtk-icon-transform: scale(0.7); + } + ''; + }; + swaylock.enable = pkgs.stdenv.isLinux; + + waybar = { + enable = pkgs.stdenv.isLinux; + systemd.enable = true; + }; }; }