added stuff

This commit is contained in:
fwastring 2025-06-03 21:39:19 +02:00
parent 6bce9f0f69
commit f0f251c814
10 changed files with 72 additions and 73 deletions

View file

@ -10,6 +10,7 @@
{
imports = [
# ../shared/vial.nix
# ../shared/st.nix
];
nixpkgs = {
overlays = [
@ -26,6 +27,16 @@
users.defaultUserShell = pkgs.bash;
documentation.man.generateCaches = false;
programs.fish.enable = true;
programs.slock = {
enable = true;
package = with pkgs; (slock.overrideAttrs (oldAttrs: rec {
src = builtins.fetchGit {
url = "https://github.com/fwastring/slock";
rev = "53ada91fefc22f6c9c76ef71b9741b385b6bedfb";
};
buildInputs = oldAttrs.buildInputs ++ [ xorg.libX11.dev xorg.libXft imlib2 xorg.libXinerama pkg-config xorg.libXrandr xorg.xrandr libxcrypt xorg.libXext xorg.xorgproto];
}));
};
programs.bash = {
interactiveShellInit = ''
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
@ -85,19 +96,15 @@
environment.sessionVariables = {
EDITOR = "nvim";
VISUAL = "nvim";
TERM = "xterm-256color";
};
time.timeZone = "Europe/Stockholm";
fonts.packages = with pkgs; [
(nerdfonts.override {
fonts = [
"Hack"
"FiraCode"
"ComicShannsMono"
];
})
nerd-fonts.comic-shanns-mono
nerd-fonts.fira-code
];
i18n.defaultLocale = "en_US.UTF-8";
@ -124,12 +131,24 @@
};
};
console.keyMap = "sv-latin1";
console.font = "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
environment.systemPackages = with pkgs; [
lolcat
fortune
cowsay
pkg-config
xlsfonts
xorg.fontmiscmisc
xorg.mkfontdir
xclip
vim
git
openssh
rofi
dysk
rsync
procs
dust
(wrapHelm kubernetes-helm {
plugins = with pkgs.kubernetes-helmPlugins; [
helm-secrets
@ -140,17 +159,36 @@
})
k3sup
nixfmt-rfc-style
# LSPs
nixd
unstable.neovim
omnisharp-roslyn
nodePackages.vscode-json-languageserver
tailwindcss-language-server
dmenu
dockerfile-language-server-nodejs
nodejs_22
bash-language-server
(st.overrideAttrs (oldAttrs: rec {
src = builtins.fetchGit {
url = "https://github.com/fwastring/st";
rev = "9b95aafa2bcb3f4f991a5fc2c7cb939ce3f550b2";
};
buildInputs = oldAttrs.buildInputs ++ [ xorg.libX11.dev xorg.libXft imlib2 xorg.libXinerama pkg-config];
}))
(dmenu.overrideAttrs (oldAttrs: rec {
src = builtins.fetchGit {
url = "https://github.com/fwastring/dmenu";
rev = "2f09f9ead8c2736dbca838393f97e5a0e4e55a2e";
};
buildInputs = oldAttrs.buildInputs ++ [ xorg.libX11.dev xorg.libXft imlib2 xorg.libXinerama pkg-config];
}))
];
services = {
picom.enable = true;
clipmenu.enable = true;
openssh = {
enable = true;
};
@ -173,11 +211,6 @@
enable = true;
};
};
locate = {
enable = true;
package = pkgs.mlocate;
localuser = null;
};
blueman = {
enable = true;
};

View file

@ -59,7 +59,6 @@
bat
bluez
bluez-tools
unstable.betterlockscreen
# tmux
fzf
eza
@ -72,24 +71,18 @@
wireguard-tools
acpi
light
# dmenu-rs-enable-plugins
# Dev
unstable.fluxcd
argocd
gh
unstable.deno
unstable.hugo
unstable.logstash
ngrok
tailwindcss
nodejs_23
yarn
plantuml
go
templ
goa
azuredatastudio
mdbtools
prettierd
#Tools
@ -100,28 +93,7 @@
lazydocker
kubectl
#LSP
# roslyn
# roslyn-ls
dockerfile-language-server-nodejs
docker-compose-language-service
bash-language-server
python312Packages.python-lsp-server
yaml-language-server
lua-language-server
typescript
nil
jdt-language-server
texlab
marksman
tree-sitter
vue-language-server
typescript-language-server
gopls
rust-analyzer
# UI
# rofi-bluetooth
pastel
imagemagick
@ -147,7 +119,6 @@
poppler_utils
#Desktop
fluent-reader
unstable.feishin
libreoffice
unstable.signal-desktop