diff --git a/flake.lock b/flake.lock index 9ca6167d..db948404 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "agkozak-zsh-prompt": { "flake": false, "locked": { - "lastModified": 1636940431, - "narHash": "sha256-II7+pwMpXPB3MhYScALZcs/28CPQltEt1FCwen7CxSE=", + "lastModified": 1697829263, + "narHash": "sha256-QDUI9EYflITttkX9Khij62ybBMYJwPfayqj+wr495mM=", "owner": "agkozak", "repo": "agkozak-zsh-prompt", - "rev": "87ea6db9375032a6a26496a7f4a6266804f6929a", + "rev": "9739bd64748fef8598231a59e41086b6ecd40c1b", "type": "github" }, "original": { @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1696360011, - "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=", + "lastModified": 1699437533, + "narHash": "sha256-lMoPz9c89CpPVuJ95OFFesM9JagCF0soGbQatj3ZhqM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a", + "rev": "eb2b9b64238349bd351561e32e260cac15db6f9a", "type": "github" }, "original": { @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1697419184, - "narHash": "sha256-eRPjCyjdcqaME/baecZHyTQTn3k0AYFzN/S+u351FcE=", + "lastModified": 1699099781, + "narHash": "sha256-2WAs839yL6xmIPBLNVwbft46BDh0/RAjq1bAKNRqeR4=", "owner": "nix-community", "repo": "disko", - "rev": "325e1f7f2e0eea44c27e5e8a3946c2461ec095f2", + "rev": "548962c50b8afad7b8c820c1d6e21dc8394d6e65", "type": "github" }, "original": { @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, "original": { @@ -157,14 +157,18 @@ }, "flake-parts_2": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "neovim-nightly-overlay", + "hercules-ci-effects", + "nixpkgs" + ] }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "type": "github" }, "original": { @@ -174,30 +178,7 @@ }, "flake-parts_3": { "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "hercules-ci-effects", - "hercules-ci-agent", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { "lastModified": 1685662779, @@ -267,56 +248,20 @@ "type": "github" } }, - "haskell-flake": { - "locked": { - "lastModified": 1684780604, - "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=", - "owner": "srid", - "repo": "haskell-flake", - "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2", - "type": "github" - }, - "original": { - "owner": "srid", - "ref": "0.3.0", - "repo": "haskell-flake", - "type": "github" - } - }, - "hercules-ci-agent": { - "inputs": { - "flake-parts": "flake-parts_3", - "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1688568579, - "narHash": "sha256-ON0M56wtY/TIIGPkXDlJboAmuYwc73Hi8X9iJGtxOhM=", - "owner": "hercules-ci", - "repo": "hercules-ci-agent", - "rev": "367dd8cd649b57009a6502e878005a1e54ad78c5", - "type": "github" - }, - "original": { - "id": "hercules-ci-agent", - "type": "indirect" - } - }, "hercules-ci-effects": { "inputs": { "flake-parts": "flake-parts_2", - "hercules-ci-agent": "hercules-ci-agent", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" ] }, "locked": { - "lastModified": 1697031886, - "narHash": "sha256-oTMPX8dGC7yxSwrbF4NuPNQsUEcHB1dusW2yEbFD5zg=", + "lastModified": 1699381651, + "narHash": "sha256-mZlQ54xJs3j5+SJrLhzePPMXzS+Czbx7gNyOnOAQrHA=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "178b36dc3a75c96efc25477d45eafc37ba1fafc3", + "rev": "0bd99f5ab7ec7a74c11238bd02bb29e709c14328", "type": "github" }, "original": { @@ -422,7 +367,7 @@ "neovim-flake": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "dir": "contrib", @@ -451,11 +396,11 @@ ] }, "locked": { - "lastModified": 1697587261, - "narHash": "sha256-csLOMUlWFVVn7i4QeazkjM6suaMpCCW6lT1ILb78d9w=", + "lastModified": 1699401982, + "narHash": "sha256-TpuSsI2ZizxDVdcx1LF04jnfu1TCpWebqDK2fiui0Dg=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "11a5f7738d1f3c19b6f01aecca66664116cc6f23", + "rev": "100a4df311f50bf5fa6a19fedde51a69f7f3ade1", "type": "github" }, "original": { @@ -468,14 +413,14 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1697592152, - "narHash": "sha256-O+95kubUxK/64TKmDF9xzGH8I5h7Ye/wqNh+eTBnvuY=", + "lastModified": 1699406699, + "narHash": "sha256-Y/cuCmpmkAIhhKmoF97k4ZG4I2hRH6kcZe00BH3KN3U=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "4bdb4190da449d5ac0d062de2f3b92a95141d270", + "rev": "57af5d8164187dcb4015e9efc823f7bd33d9c6fc", "type": "github" }, "original": { @@ -486,7 +431,7 @@ }, "nixd": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "nixpkgs": [ "nixpkgs" ] @@ -507,11 +452,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1697100850, - "narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=", + "lastModified": 1699159446, + "narHash": "sha256-cL63IjsbPl2otS7R4kdXbVOJOXYMpGw5KGZoWgdCuCM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565", + "rev": "627bc9b88256379578885a7028c9e791c29fb581", "type": "github" }, "original": { @@ -523,15 +468,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688322751, - "narHash": "sha256-eW62dC5f33oKZL7VWlomttbUnOTHrAbte9yNUNW8rbk=", - "owner": "NixOS", + "lastModified": 1699099776, + "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "0fbe93c5a7cac99f90b60bdf5f149383daaa615f", + "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -539,11 +484,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1697332183, - "narHash": "sha256-ACYvYsgLETfEI2xM1jjp8ZLVNGGC0onoCGe+69VJGGE=", + "lastModified": 1699375123, + "narHash": "sha256-ny0+k0LQPVAhntYZo/FMVFxUlejpn4pIQVOo5Vdek/I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e1cff585c1a85aeab059d3109f66134a8f76935", + "rev": "bceb3bff2ee78424c1073d0b4676858265f926d1", "type": "github" }, "original": { @@ -554,24 +499,6 @@ } }, "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_2": { "locked": { "dir": "lib", "lastModified": 1685564631, @@ -591,11 +518,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1697628939, - "narHash": "sha256-Hkhyn6JJPU98y4YWlVkhzcZfyJU5OBjfopAflyfzdzg=", + "lastModified": 1699448320, + "narHash": "sha256-P6uVanihahwKdRYh+LQdw81XbTmmDzYjqLtfUY7XL3A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "af421ccb0ab04bf1b7b0f8f73ca278e5863f63a4", + "rev": "628bd7800494edf7c0e0d79f4839b65942fcf46c", "type": "github" }, "original": { @@ -606,22 +533,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1697456312, - "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1684570954, "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", @@ -637,13 +548,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1697226376, - "narHash": "sha256-cumLLb1QOUtWieUnLGqo+ylNt3+fU8Lcv5Zl+tYbRUE=", + "lastModified": 1699291058, + "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "898cb2064b6e98b8c5499f37e81adbdf2925f7c5", + "rev": "41de143fda10e33be0f47eab2bfe08a50f234267", "type": "github" }, "original": { @@ -672,11 +583,11 @@ "noice-nvim": { "flake": false, "locked": { - "lastModified": 1697401474, - "narHash": "sha256-VlWRZZzNYYqf9CKNbRfcOGCiJOHnSnJK+AL068msDAU=", + "lastModified": 1698229631, + "narHash": "sha256-7lgJK5pkMqwIXNeBDsz4B8UAKnkpUvDrHdeG/aSFRzM=", "owner": "folke", "repo": "noice.nvim", - "rev": "e50fc6de68333633fa9eaaa54cb4cdfe7de5f25a", + "rev": "92433164e2f7118d4122c7674c3834d9511722ba", "type": "github" }, "original": { @@ -785,7 +696,7 @@ "nix-vscode-extensions": "nix-vscode-extensions", "nixd": "nixd", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-master": "nixpkgs-master", "nnn-nvim": "nnn-nvim", @@ -940,11 +851,11 @@ "zsh-completions": { "flake": false, "locked": { - "lastModified": 1697600772, - "narHash": "sha256-G9OQU1s1DGMUignz+XvOy/gOHLLlLGg+E+6qG+e+slA=", + "lastModified": 1698288378, + "narHash": "sha256-cxA+WH/dKk00s6HVN+w1sh/1skHvH4Ji+3rLSSNQGJU=", "owner": "zsh-users", "repo": "zsh-completions", - "rev": "7f84cdaf9c64001509860004ee8b4cd6b3074ba2", + "rev": "a0f027a1de9272d22ce20465d660d7b611f30cf0", "type": "github" }, "original": { @@ -956,11 +867,11 @@ "zsh-syntax-highlighting": { "flake": false, "locked": { - "lastModified": 1693974187, - "narHash": "sha256-TKGCck51qQ50dQGntKaeSk8waK3BlwUjueg4MImTH8k=", + "lastModified": 1698603908, + "narHash": "sha256-bD0oKXSw9lucJR+6/O16m7prwA1cP36C0Tvh5mklapw=", "owner": "zsh-users", "repo": "zsh-syntax-highlighting", - "rev": "143b25eb98aa3227af63bd7f04413e1b3e7888ec", + "rev": "bb27265aeeb0a22fb77f1275118a5edba260ec47", "type": "github" }, "original": { diff --git a/hm-imports/vscode/default.nix b/hm-imports/vscode/default.nix index f96da576..dce32c1c 100644 --- a/hm-imports/vscode/default.nix +++ b/hm-imports/vscode/default.nix @@ -28,12 +28,15 @@ in yzhang.markdown-all-in-one # markdown marketplace.davidanson.vscode-markdownlint marketplace.quarto.quarto + marketplace.valentjn.vscode-ltex # languagetool #marketplace.gpoore.codebraid-preview + ## others jnoortheen.nix-ide # nix golang.go # go marketplace.ms-python.python # python + marketplace.donjayamanne.python-environment-manager # python ms-dotnettools.csharp # c# und so rust-lang.rust-analyzer # rust marketplace.sswg.swift-lang # swift @@ -45,6 +48,7 @@ in marketplace.alexisvt.flutter-snippets # flutter snippets marketplace.tauri-apps.tauri-vscode # tauri marketplace.dbaeumer.vscode-eslint # js + marketplace.arcanis.vscode-zipfs # yarn ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ ]; @@ -55,11 +59,15 @@ in { "editor.fontFamily" = fontFamily; "terminal.integrated.fontFamily" = fontFamily; + "terminal.integrated.scrollback" = 20000; "workbench.colorTheme" = "Gruvbox Dark Soft"; "editor.autoClosingBrackets" = "never"; "editor.autoClosingQuotes" = "never"; "editor.minimap.autohide" = true; + "editor.tabCompletion" = "onlySnippets"; + "editor.snippetSuggestions" = "top"; + # Addon Configuration ## Vim @@ -173,6 +181,8 @@ in # swift "lldb.library" = "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/LLDB"; "lldb.launch.expressions" = "native"; + # ltex-ls + "ltex.ltex-ls.path" = "${pkgs.unstable.ltex-ls}"; }; diff --git a/hm-imports/zsh/zshrc b/hm-imports/zsh/zshrc index bfa0eba9..24a25d4d 100644 --- a/hm-imports/zsh/zshrc +++ b/hm-imports/zsh/zshrc @@ -24,6 +24,10 @@ hash kitty 2>/dev/null && alias ssh="kitty kitten ssh" hash helm 2>/dev/null && . <(helm completion zsh) hash kubectl 2>/dev/null && . <(kubectl completion zsh) export NNN_ARCHIVE="\\.(7z|a|ace|alz|arc|arj|bz|bz2|cab|cpio|deb|gz|jar|lha|lz|lzh|lzma|lzo|rar|rpm|rz|t7z|tar|tbz|tbz2|tgz|tlz|txz|tZ|tzo|war|xpi|xz|Z|zip)$" +if [[ -d "$HOME/miniconda3" ]]; then + export PATH=$PATH:$HOME/miniconda3/bin + . <(~/miniconda3/bin/conda shell.zsh hook) +fi n () { diff --git a/hosts/daedalus/hammerspoon.lua b/hosts/daedalus/hammerspoon.lua index 2f20dfc3..d91112c6 100644 --- a/hosts/daedalus/hammerspoon.lua +++ b/hosts/daedalus/hammerspoon.lua @@ -212,16 +212,16 @@ function showHideBundleId(bundleId) end end -hs.loadSpoon("MiroWindowsManager") -hs.window.animationDuration = 0 -spoon.MiroWindowsManager:bindHotkeys({ - up = {modifiers.window, "up"}, - right = {modifiers.window, "right"}, - down = {modifiers.window, "down"}, - left = {modifiers.window, "left"}, - fullscreen = {modifiers.window, "return"}, - nextscreen = {modifiers.hyper, "right"} -}) +-- hs.loadSpoon("MiroWindowsManager") +-- hs.window.animationDuration = 0 +-- spoon.MiroWindowsManager:bindHotkeys({ +-- up = {modifiers.window, "up"}, +-- right = {modifiers.window, "right"}, +-- down = {modifiers.window, "down"}, +-- left = {modifiers.window, "left"}, +-- fullscreen = {modifiers.window, "return"}, +-- nextscreen = {modifiers.hyper, "right"} +-- }) hs.hotkey.bind(modifiers.hyper, hs.keycodes.map.delete, function() hs.caffeinate.lockScreen() end) diff --git a/nixos-modules/services/bitwarden.nix b/nixos-modules/services/bitwarden.nix index 6d3750d2..5c598554 100644 --- a/nixos-modules/services/bitwarden.nix +++ b/nixos-modules/services/bitwarden.nix @@ -13,6 +13,7 @@ in config = lib.mkIf cfg.enable { services.vaultwarden = { enable = true; + package = pkgs.unstable.vaultwarden; #backupDir = "/persistent/backups/vaultwarden"; config = { domain = "https://${cfg.domainPrefix}.${domain}";