Compare commits

...

3 commits

Author SHA1 Message Date
121f92e0e2
update commits 2025-01-02 21:48:08 -05:00
fda4d7deb0
move rust packages to nix 2025-01-02 21:47:37 -05:00
d9542dd030
disable mason 2025-01-02 21:47:03 -05:00
6 changed files with 44 additions and 37 deletions

View file

@ -3,7 +3,7 @@
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(commit
"2b32a3809883a9b0fc38a79886921f1a53e00425")
"5d7455bb580eed41a4fa7c20b71eaccad9f49e73")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
@ -14,7 +14,7 @@
(url "https://gitlab.com/nonguix/nonguix.git")
(branch "master")
(commit
"10e3c2bcaedaba121eec0e255d366a080082cf0a")
"f44a49d3092d509c5e09cc27ada40a8c4d99c02d")
(introduction
(make-channel-introduction
"897c1a470da759236cc11798f4e0a5f7d4d59fbc"
@ -25,7 +25,7 @@
(url "https://g.freya.cat/freya/sakura")
(branch "main")
(commit
"db9a1e89bf4d730232c5c8ab705a1bab01262a25")
"bdf203599fa7c324991505153dddd2b28f2906ad")
(introduction
(make-channel-introduction
"8fb2f9c2fa414754c41c1c73665e3e73e12693ab"

View file

@ -1,23 +1,23 @@
local lsp = require('lsp-zero').preset('recommended')
require('mason').setup({})
require('mason-lspconfig').setup({
ensure_installed = {
'eslint',
'rust_analyzer',
'clangd',
'html',
'cssls',
'pyright',
'vimls',
'yamlls',
'bashls',
'lua_ls',
},
handlers = {
lsp.default_setup,
},
})
--require('mason').setup({})
--require('mason-lspconfig').setup({
-- ensure_installed = {
-- 'eslint',
-- 'rust_analyzer',
-- 'clangd',
-- 'html',
-- 'cssls',
-- 'pyright',
-- 'vimls',
-- 'yamlls',
-- 'bashls',
-- 'lua_ls',
-- },
-- handlers = {
-- lsp.default_setup,
-- },
--})
local cmp = require('cmp')

View file

@ -103,11 +103,6 @@
"clang-toolchain"
"python"
; rust
"rust"
"rust-cargo"
"rust-analyzer"
; social
"gajim"
"gajim-openpgp"

16
home/nix/flake.lock generated
View file

@ -22,17 +22,17 @@
]
},
"locked": {
"lastModified": 1734037113,
"narHash": "sha256-ENSfIRpZUGyr2quTJCESzppcR9i0N2iUrenGxcr9Mj0=",
"lastModified": 1735774425,
"narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e526fd2b1a40e4ca0b5e07e87b8c960281c67412",
"rev": "5f6aa268e419d053c3d5025da740e390b12ac936",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"rev": "e526fd2b1a40e4ca0b5e07e87b8c960281c67412",
"rev": "5f6aa268e419d053c3d5025da740e390b12ac936",
"type": "github"
}
},
@ -60,17 +60,17 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1733212471,
"narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
"lastModified": 1735471104,
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
"type": "github"
}
},

View file

@ -3,10 +3,10 @@
inputs = {
# nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/55d15ad12a74eb7d4646254e13638ad0c4128776";
nixpkgs.url = "github:nixos/nixpkgs/88195a94f390381c6afcdaa933c2f6ff93959cb4";
# home manager
home-manager.url = "github:nix-community/home-manager/e526fd2b1a40e4ca0b5e07e87b8c960281c67412";
home-manager.url = "github:nix-community/home-manager/5f6aa268e419d053c3d5025da740e390b12ac936";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
# nixgl

View file

@ -15,11 +15,23 @@
stateVersion = "25.05";
packages = with pkgs; [
# desktop
# shell
starship
# desktop
discord
element-desktop
thunderbird
# rust
rustc
rustfmt
rust-analyzer
cargo
clippy
# unity
unityhub
# libs
openssl
libgcc
];
};