upgrades from macbookpro

This commit is contained in:
Florian Schmitt 2024-07-03 10:46:47 +03:00
parent 274954af86
commit 637d902291
5 changed files with 16 additions and 65 deletions

View file

@ -25,6 +25,8 @@
networking.hostName = "luffy"; # Define your hostname.
networking.extraHosts = ''
127.0.0.1 yeswiki.test
192.168.36.206 chmok.net
fd72:51a6:d583:0:984a:cc56:cf75:dc6 chmok.net
'';
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
@ -61,8 +63,8 @@
# Configure keymap in X11
services.xserver = {
layout = "us,ru";
xkbVariant = "mac";
xkb.layout = "us,ru";
xkb.variant = "mac";
};
imports = [

View file

@ -61,6 +61,7 @@
wirelesstools
yt-dlp
zellij
zoxide
zsh-autosuggestions
];
}

View file

@ -22,13 +22,15 @@
printing.drivers = [ pkgs.brlaser ];
avahi = {
enable = true;
nssmdns = true;
nssmdns4 = true;
openFirewall = true;
};
displayManager.defaultSession = "plasmawayland";
displayManager.sddm.wayland.enable = true;
displayManager.sddm.enableHidpi = true;
xserver = {
enable = true;
displayManager.defaultSession = "plasmawayland";
desktopManager.plasma5.enable = true;
displayManager.sddm.wayland.enable = true;
displayManager.sddm.enableHidpi = true;

View file

@ -7,36 +7,6 @@ let
rev = "4e56cfeb95081a43cb49487d0996dc936d6201e5";
sha256 = "sha256-LJ/lFEupLSi7xtUps234hhMk7ZdVLRoYeU7KiCFaoGw=";
};
treesitterWithGrammars = (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [
p.bash
p.comment
p.css
p.dockerfile
p.fish
p.gitattributes
p.gitignore
p.go
p.gomod
p.gowork
p.hcl
p.html
p.php
p.javascript
p.jq
p.json5
p.json
p.lua
p.make
p.markdown
p.nix
p.python
p.rust
p.twig
p.toml
p.typescript
p.vue
p.yaml
]));
startupScript = pkgs.pkgs.writeShellScriptBin "hyprland-start" ''
${pkgs.waybar}/bin/waybar &
${pkgs.swww}/bin/swww init &
@ -47,7 +17,7 @@ let
'';
in {
# TODO can we automate the installation of home-manager ?
# sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager
# sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager
imports = [
<home-manager/nixos>
];
@ -55,7 +25,6 @@ in {
# Let Home Manager install and manage itself.
#programs.home-manager.enable = true;
home-manager.useGlobalPkgs = true;
users.users.mrflos = {
isNormalUser = true;
description = "mrflos";
@ -104,13 +73,6 @@ in {
source = ../dotfiles/tmux;
recursive = true;
};
# Treesitter is configured as a locally developed module in lazy.nvim
# we hardcode a symlink here so that we can refer to it in our lazy config
"./.local/share/nvim/nix/nvim-treesitter/" = {
recursive = true;
source = treesitterWithGrammars;
};
};
home.sessionVariables = {
EDITOR = "nvim";
@ -247,29 +209,11 @@ in {
core.fileMode = false;
};
};
neovim = {
enable = true;
defaultEditor = true;
viAlias = true;
vimAlias = true;
coc.enable = false;
plugins = [ treesitterWithGrammars ];
};
password-store = {
enable = true;
package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]);
settings = {
PASSWORD_STORE_DIR = "$XDG_DATA_HOME/password-store";
PASSWORD_STORE_KEY = "How to Hide This ?";
PASSWORD_STORE_CLIP_TIME = "60";
};
};
thunderbird = {
enable = true;
profiles.default = { isDefault = true; };
};
starship = {
@ -279,7 +223,7 @@ in {
zsh = {
enable = true;
enableAutosuggestions = true;
autosuggestion.enable = true;
enableCompletion = true;
shellAliases = {
#tmux = "tmux -f ~/.config/tmux/tmux.conf attach || tmux -f ~/.config/tmux/tmux.conf new";
@ -295,6 +239,7 @@ in {
initExtra = ''
export BUN_INSTALL="$HOME/.bun"
export PATH="$HOME/.local/bin:$BUN_INSTALL/bin:$PATH"
eval "$(zoxide init zsh)"
'';
oh-my-zsh = {
enable = true;

View file

@ -73,11 +73,11 @@
environment.systemPackages = with pkgs; [
#clang
dart-sass
dbeaver
dbeaver-bin
docker-compose
gcc
go
nixfmt
nixfmt-rfc-style
nixpkgs-fmt
nodejs
nodePackages.eslint
@ -91,6 +91,7 @@
ruff-lsp
stylelint
symfony-cli
tree-sitter
virt-manager
yarn
zig