Desktop transition to NixOS 25.05
This commit is contained in:
parent
ae4e84ac9a
commit
1e4037d1c2
3 changed files with 20 additions and 31 deletions
10
base.nix
10
base.nix
|
@ -13,7 +13,7 @@
|
|||
environment.systemPackages = with pkgs; [
|
||||
tmux
|
||||
git
|
||||
nvi
|
||||
vim
|
||||
p7zip
|
||||
tree
|
||||
btop
|
||||
|
@ -62,10 +62,10 @@
|
|||
bind v split-window -h
|
||||
|
||||
# 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-j run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && 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-l run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-l) || tmux select-pane -R"
|
||||
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 nvim && tmux send-keys C-j) || tmux select-pane -D"
|
||||
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 nvim && tmux send-keys C-l) || tmux select-pane -R"
|
||||
|
||||
bind -n C-Left select-pane -L
|
||||
bind -n C-Right select-pane -R
|
||||
|
|
|
@ -80,11 +80,11 @@ in
|
|||
nssmdns4 = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
};
|
||||
|
||||
services.pipewire.enable = false;
|
||||
pipewire.enable = false;
|
||||
pulseaudio.enable = true;
|
||||
};
|
||||
nixpkgs.config.pulseaudio = true;
|
||||
hardware.pulseaudio.enable = true;
|
||||
|
||||
security.polkit.enable = true;
|
||||
|
||||
|
|
|
@ -1,17 +1,11 @@
|
|||
{ pkgs, ... }:
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
nixvim = import (
|
||||
builtins.fetchGit {
|
||||
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
|
||||
{
|
||||
#################### Git configuration ####################
|
||||
|
@ -38,25 +32,20 @@ in
|
|||
};
|
||||
|
||||
#################### Packages ####################
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
environment.systemPackages = with pkgs; [
|
||||
nixfmt-rfc-style
|
||||
nixd
|
||||
|
||||
vagrant
|
||||
nmap
|
||||
])
|
||||
++ (with unstable_pkgs; [
|
||||
metasploit
|
||||
armitage
|
||||
]);
|
||||
];
|
||||
virtualisation.virtualbox.host.enable = true;
|
||||
virtualisation.virtualbox.host.addNetworkInterface = false;
|
||||
users.extraGroups.vboxusers.members = [ "vili" ];
|
||||
|
||||
fonts.packages = with pkgs; [
|
||||
nerdfonts
|
||||
];
|
||||
fonts.packages = builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
|
||||
|
||||
#################### Neovim configuration ####################
|
||||
imports = [ nixvim.nixosModules.nixvim ];
|
||||
|
@ -64,7 +53,7 @@ in
|
|||
programs.nixvim = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
vimAlias = true;
|
||||
vimAlias = false;
|
||||
colorschemes.vscode.enable = true;
|
||||
|
||||
globals.mapleader = " ";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue