Desktop transition to NixOS 25.05

This commit is contained in:
Vili Sinervä 2025-05-27 19:25:41 +03:00
parent ae4e84ac9a
commit 1e4037d1c2
No known key found for this signature in database
GPG key ID: DF8FEAF54EFAC996
3 changed files with 20 additions and 31 deletions

View file

@ -13,7 +13,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
tmux tmux
git git
nvi vim
p7zip p7zip
tree tree
btop btop
@ -62,10 +62,10 @@
bind v split-window -h bind v split-window -h
# Smart pane switching with awareness of Vim splits. # Smart pane switching with awareness of Vim splits.
bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-h) || tmux select-pane -L" bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iq nvim && tmux send-keys C-h) || tmux select-pane -L"
bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-j) || tmux select-pane -D" bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iq nvim && tmux send-keys C-j) || tmux select-pane -D"
bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-k) || tmux select-pane -U" bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iq nvim && tmux send-keys C-k) || tmux select-pane -U"
bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-l) || tmux select-pane -R" bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iq nvim && tmux send-keys C-l) || tmux select-pane -R"
bind -n C-Left select-pane -L bind -n C-Left select-pane -L
bind -n C-Right select-pane -R bind -n C-Right select-pane -R

View file

@ -80,11 +80,11 @@ in
nssmdns4 = true; nssmdns4 = true;
openFirewall = true; openFirewall = true;
}; };
};
services.pipewire.enable = false; pipewire.enable = false;
pulseaudio.enable = true;
};
nixpkgs.config.pulseaudio = true; nixpkgs.config.pulseaudio = true;
hardware.pulseaudio.enable = true;
security.polkit.enable = true; security.polkit.enable = true;

View file

@ -1,17 +1,11 @@
{ pkgs, ... }: { pkgs, lib, ... }:
let let
nixvim = import ( nixvim = import (
builtins.fetchGit { builtins.fetchGit {
url = "https://github.com/nix-community/nixvim"; url = "https://github.com/nix-community/nixvim";
ref = "nixos-24.11"; ref = "nixos-25.05";
} }
); );
unstable_pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-unstable") {
config = {
allowUnfree = true;
};
overlays = [ ];
};
in in
{ {
#################### Git configuration #################### #################### Git configuration ####################
@ -38,25 +32,20 @@ in
}; };
#################### Packages #################### #################### Packages ####################
environment.systemPackages = environment.systemPackages = with pkgs; [
(with pkgs; [
nixfmt-rfc-style nixfmt-rfc-style
nixd nixd
vagrant vagrant
nmap nmap
])
++ (with unstable_pkgs; [
metasploit metasploit
armitage armitage
]); ];
virtualisation.virtualbox.host.enable = true; virtualisation.virtualbox.host.enable = true;
virtualisation.virtualbox.host.addNetworkInterface = false; virtualisation.virtualbox.host.addNetworkInterface = false;
users.extraGroups.vboxusers.members = [ "vili" ]; users.extraGroups.vboxusers.members = [ "vili" ];
fonts.packages = with pkgs; [ fonts.packages = builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
nerdfonts
];
#################### Neovim configuration #################### #################### Neovim configuration ####################
imports = [ nixvim.nixosModules.nixvim ]; imports = [ nixvim.nixosModules.nixvim ];
@ -64,7 +53,7 @@ in
programs.nixvim = { programs.nixvim = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
vimAlias = true; vimAlias = false;
colorschemes.vscode.enable = true; colorschemes.vscode.enable = true;
globals.mapleader = " "; globals.mapleader = " ";