diff --git a/flake.lock b/flake.lock index 6646c08..fa1bec7 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1738132650, - "narHash": "sha256-ryebu2VoopIpr5+DuHIs2/x60u+3EzRJexYRWVJn2AE=", + "lastModified": 1737945015, + "narHash": "sha256-VCa7UAWqP14IC+fmT4P3rxGhkugDlU/4FZqqPyFUs9s=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "eb7d893c8675f955fa770c8ae6f1c32a2394284c", + "rev": "71a3855af61b0071832c23085f76a8711e32b49c", "type": "github" }, "original": { @@ -562,11 +562,11 @@ ] }, "locked": { - "lastModified": 1738178313, - "narHash": "sha256-/8TLf6LkXGRGERzcWMNDeXjYaHSbexmfV+ofheo7K6k=", + "lastModified": 1737968762, + "narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=", "owner": "nix-community", "repo": "home-manager", - "rev": "420a0d9506b5dac4d86a68b9ef8e763624ad86c6", + "rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1738174211, - "narHash": "sha256-eYmp1mKM4kULV1W+EBtCPk6LmKWl2REivaYfGRl+AWo=", + "lastModified": 1738097047, + "narHash": "sha256-GcgcCYhAkxU9BtzsUImFRIEFK0WqgjKrMqMySImGLK4=", "ref": "refs/heads/main", - "rev": "64e33a7e09a0d1faacf2fd3f6ebd647fe4d8346a", - "revCount": 17329, + "rev": "3a41bf32a78550f7373b51d39c07a4bb91bb9f2e", + "revCount": 16702, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -710,11 +710,11 @@ ] }, "locked": { - "lastModified": 1738176840, - "narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=", + "lastModified": 1738009885, + "narHash": "sha256-zPch36LSTs8dZJZlIiufXuY7wut06xp4CMdf/oqXoq0=", "ref": "refs/heads/main", - "rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e", - "revCount": 133, + "rev": "cf43eeb6b376cc36f70b0632bc39dc949b9f3b59", + "revCount": 132, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738156024, - "narHash": "sha256-D3cox2cbtFauXz1skDTkJwSU0272wY6wRwiFNm5TV/c=", + "lastModified": 1737961005, + "narHash": "sha256-b4hqJNgyx8lnngz7NFcJ1W+59xQnMQYF0EK5g0IOy7c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "541920ede8b5d48f110c94d858a1ddf283eac3b9", + "rev": "e98ae62893568dd31e7a7e4e75e1dbbf23f759a0", "type": "github" }, "original": { @@ -770,11 +770,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738148186, - "narHash": "sha256-Yd2xKbZ8S4LC5sxPleuutlX0RbKnI93LhciVhneNBHQ=", + "lastModified": 1737956052, + "narHash": "sha256-Gr+tkCSuhQ5NT04hv/PoHExCgbuqRA/GZQv+le40LNY=", "owner": "YaLTeR", "repo": "niri", - "rev": "1d3820a064f1f3b686eb6e8a1aab155681a96457", + "rev": "9b4d73f13a6906537faf01b5c5e5e2fee9dd602e", "type": "github" }, "original": { @@ -1045,11 +1045,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1738178544, - "narHash": "sha256-UbM+zJFlze877N5j2YMLKYFX7t05VvmuNX2M0vJ7RfI=", + "lastModified": 1738090407, + "narHash": "sha256-X6BvM495ef4Rk+7WFhvYFwJoKteQYgvSaRERLGofZ+s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "975ac0ab33ee7fea64842047a96f5d679d90913c", + "rev": "2c00621e9692affa61da62f82e76648c5a07e6a0", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1738184667, - "narHash": "sha256-+pG3UJVAdVCF3nGRpy5n/tbCzGa64DCWOC8hAxnssD0=", + "lastModified": 1738106190, + "narHash": "sha256-woDlUpfK4n1znQfGREKDLMVOQ4JZo7L6YY/sTPZGw0g=", "owner": "nix-community", "repo": "nixvim", - "rev": "2f5374c3dcd06c750c36798bce6bccdf8a25bc89", + "rev": "eeafe2a7153197982ccd6ad6678192bca1df446e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0f4e96a..95a0154 100644 --- a/flake.nix +++ b/flake.nix @@ -126,6 +126,9 @@ ... }: { + # make pkgs available to `perSystem` + _module.args.pkgs = inputs'.nixpkgs.legacyPackages; + treefmt = { projectRootFile = "flake.nix"; programs.nixfmt.enable = true; diff --git a/home/kitty.nix b/home/kitty.nix index 7134390..f47567c 100644 --- a/home/kitty.nix +++ b/home/kitty.nix @@ -58,7 +58,6 @@ "ctrl+f2" = "detach_tab"; # hints - # > basically means the preceding key is a prefix (think tmux) "kitty_mod+o>o" = "open_url_with_hints"; "kitty_mod+o>p" = "kitten hints --type path --program -"; "kitty_mod+o>n" = "kitten hints --type line --program -"; diff --git a/home/niri/default.nix b/home/niri/default.nix index 67720cb..ea9acb9 100644 --- a/home/niri/default.nix +++ b/home/niri/default.nix @@ -73,6 +73,10 @@ in window-rules = [ { matches = [ + { + app-id = "anki"; + title = "Add"; + } { app-id = "mpv"; } { app-id = "Bitwarden"; } { @@ -84,12 +88,7 @@ in open-floating = true; } { - matches = [ - { - app-id = "anki"; - title = "Add"; - } - ]; + matches = [ { app-id = "anki"; } ]; default-column-width.proportion = .25; } { diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 26b8bc6..89bfd94 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -24,7 +24,7 @@ extraPlugins = [ (pkgs.vimUtils.buildVimPlugin { - name = "github-theme"; + name = "gitub-theme"; src = inputs.nvim-github-theme; }) ]; @@ -71,41 +71,6 @@ key = ""; mode = "i"; } - # quick chat with copilot - { - key = "ccq"; - action.__raw = '' - function() - local input = vim.fn.input("Quick chat: ") - if input ~= "" then - require("CopilotChat").ask(input, { selection = require("CopilotChat.select").buffer }) - end - end - ''; - mode = [ - "n" - "v" - ]; - } - # ask perplexity a quick question - { - key = "ccs"; - action.__raw = '' - function() - local input = vim.fn.input("Perplexity: ") - if input ~= "" then - require("CopilotChat").ask(input, { - agent = "perplexityai", - selection = false, - }) - end - end - ''; - mode = [ - "n" - "v" - ]; - } ]; plugins.cmp = { @@ -232,13 +197,6 @@ settings.current_line_blame = true; }; - plugins.copilot-chat = { - enable = true; - settings = { - model = "claude-3.5-sonnet"; - }; - }; - plugins.cmp-buffer.enable = true; plugins.cmp-emoji.enable = true; plugins.cmp-nvim-lsp.enable = true; diff --git a/home/vscode.nix b/home/vscode.nix index 0c1bf95..d2b7bb0 100644 --- a/home/vscode.nix +++ b/home/vscode.nix @@ -8,30 +8,11 @@ mutableExtensionsDir = false; extensions = with pkgs.vscode-extensions; [ vscodevim.vim - jnoortheen.nix-ide - editorconfig.editorconfig - github.github-vscode-theme + jnoortheen.nix-ide # nix language support + editorconfig.editorconfig # editorconfig + dracula-theme.theme-dracula # color scheme + tomoki1207.pdf # pdf viewer + yzhang.markdown-all-in-one # markdown tools ]; - userSettings = { - "workbench.colorTheme" = "GitHub Dark Default"; - "files.autoSave" = "afterDelay"; - "nix.enableLanguageServer" = true; - "nix.serverPath" = "nixd"; - "editor.fontFamily" = "IBM Plex Mono"; - "editor.fontSize" = 15; - "editor.wordWrap" = "on"; - - # vim mode - "vim.handleKeys" = { - "" = false; # file tree toggle - }; - "vim.normalModeKeyBindings" = [ - { - "before" = [ ";" ]; - "after" = [ ":" ]; - "silent" = true; - } - ]; - }; }; } diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index e0ed53c..fa26fd2 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -9,7 +9,6 @@ ../niri ../irssi.nix ../kitty.nix - ../vscode.nix ]; home = { username = "yt";