diff --git a/flake.lock b/flake.lock index f4682d4..83a8393 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1681154394, - "narHash": "sha256-avnu1K9AuouygBiwVKuDp6emiTET43az3rcpv0ctLjc=", + "lastModified": 1682009832, + "narHash": "sha256-QdNOeFE7sI+0ddqVfn9vQDCUs7OdxhJ7evo9sdyP82Y=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "025912529dd0b31dead95519e944ea05f1ad56f2", + "rev": "a1ee4d333b092bc055655fb06229eb3013755812", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1681468923, - "narHash": "sha256-+X2oO4juRVhQRs002mn8km6PODccIRiz09c2K1xtSpY=", + "lastModified": 1682072616, + "narHash": "sha256-sR5RL3LACGuq5oePcAoJ/e1S3vitKQQSNACMYmqIE1E=", "owner": "nix-community", "repo": "home-manager", - "rev": "17198cf5ae27af5b647c7dac58d935a7d0dbd189", + "rev": "47d6c3f65234230d37f1cf7d3d6b5575ec80fe0c", "type": "github" }, "original": { @@ -92,16 +92,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1681465517, - "narHash": "sha256-EasJh15/jcJNAHtq2SGbiADRXteURAnQbj1NqBoKkzU=", + "lastModified": 1681932375, + "narHash": "sha256-tSXbYmpnKSSWpzOrs27ie8X3I0yqKA6AuCzCYNtwbCU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "abe7316dd51a313ce528972b104f4f04f56eefc4", + "rev": "3d302c67ab8647327dba84fbdb443cdbf0e82744", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 943c3d4..e659f20 100644 --- a/flake.nix +++ b/flake.nix @@ -7,14 +7,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - /* - neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - */ - nix-ld.url = "github:Mic92/nix-ld"; darwin = { diff --git a/home/default.nix b/home/default.nix index 73fa0f5..a53eaff 100644 --- a/home/default.nix +++ b/home/default.nix @@ -441,7 +441,7 @@ in { firefox = { enable = stdenv.isLinux; - package = pkgs.firefox-devedition; + package = pkgs.firefox-devedition-bin; profiles = { default = { @@ -450,6 +450,8 @@ in { settings = { "privacy.resistFingerprinting" = true; }; + name = "dev-edition-default"; + path = "6b7pm104.dev-edition-default"; }; }; }; diff --git a/home/nvim/lua/init.lua b/home/nvim/lua/init.lua index 7d5450a..e94df15 100644 --- a/home/nvim/lua/init.lua +++ b/home/nvim/lua/init.lua @@ -182,16 +182,16 @@ lspconfig.gopls.setup({ capabilities = capabilities, }) -lspconfig.lua_ls.setup({ - capabilities = capabilities, - settings = { - Lua = { - diagnostics = { - globals = { 'vim' } - } - } - } -}) +-- lspconfig.lua_ls.setup({ +-- capabilities = capabilities, +-- settings = { +-- Lua = { +-- diagnostics = { +-- globals = { 'vim' } +-- } +-- } +-- } +-- }) lspconfig.pyright.setup({ capabilities = capabilities, diff --git a/packages/common.nix b/packages/common.nix index dadec84..590a432 100644 --- a/packages/common.nix +++ b/packages/common.nix @@ -125,14 +125,13 @@ in { # python poetry - pipx - python311Full - python311Packages.black - python311Packages.ipython - python311Packages.pip - python311Packages.poetry-core - python311Packages.setuptools - python311Packages.virtualenv + python310 + python310Packages.black + python310Packages.ipython + python310Packages.pip + python310Packages.poetry-core + python310Packages.setuptools + python310Packages.virtualenv # media youtube-dl