Big update
This commit is contained in:
parent
b704eb4ba8
commit
1fdb076fc5
11 changed files with 53 additions and 37 deletions
|
@ -50,8 +50,19 @@
|
||||||
liveRestore = false;
|
liveRestore = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
security.rtkit.enable = true;
|
||||||
|
services = {
|
||||||
|
pipewire = {
|
||||||
|
enable = true;
|
||||||
|
alsa.enable = true;
|
||||||
|
alsa.support32Bit = true;
|
||||||
|
pulse.enable = true;
|
||||||
|
# If you want to use JACK applications, uncomment this
|
||||||
|
jack.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
hardware = {
|
hardware = {
|
||||||
pulseaudio.enable = true;
|
pulseaudio.enable = false;
|
||||||
bluetooth = {
|
bluetooth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
powerOnBoot = true;
|
powerOnBoot = true;
|
||||||
|
@ -64,12 +75,10 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
networking.nameservers = [ "8.8.8.8"];
|
networking.nameservers = [ "8.8.8.8" ];
|
||||||
networking.resolvconf.enable = pkgs.lib.mkForce false;
|
# networking.resolvconf.enable = pkgs.lib.mkForce false;
|
||||||
networking.dhcpcd.extraConfig = "nohook resolv.conf";
|
# networking.dhcpcd.extraConfig = "nohook resolv.conf";
|
||||||
networking.networkmanager.dns = "none";
|
# networking.networkmanager.dns = "none";
|
||||||
services.resolved.enable = false;
|
|
||||||
|
|
||||||
|
|
||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
EDITOR = "nvim";
|
EDITOR = "nvim";
|
||||||
|
|
|
@ -11,8 +11,9 @@
|
||||||
imports = [
|
imports = [
|
||||||
../shared/dwm.nix
|
../shared/dwm.nix
|
||||||
../shared/vscode.nix
|
../shared/vscode.nix
|
||||||
../shared/dmenu.nix
|
# ../shared/dmenu.nix
|
||||||
../shared/rofi.nix
|
../shared/rofi.nix
|
||||||
|
../shared/mpv.nix
|
||||||
../shared/kitty.nix
|
../shared/kitty.nix
|
||||||
../shared/alacritty.nix
|
../shared/alacritty.nix
|
||||||
../shared/tmux.nix
|
../shared/tmux.nix
|
||||||
|
@ -68,6 +69,7 @@
|
||||||
openssl
|
openssl
|
||||||
dig
|
dig
|
||||||
jq
|
jq
|
||||||
|
wireguard-tools
|
||||||
|
|
||||||
# Dev
|
# Dev
|
||||||
unstable.deno
|
unstable.deno
|
||||||
|
@ -93,7 +95,7 @@
|
||||||
kubectl
|
kubectl
|
||||||
|
|
||||||
#LSP
|
#LSP
|
||||||
roslyn
|
# roslyn
|
||||||
roslyn-ls
|
roslyn-ls
|
||||||
python312Packages.python-lsp-server
|
python312Packages.python-lsp-server
|
||||||
yaml-language-server
|
yaml-language-server
|
||||||
|
@ -101,13 +103,9 @@
|
||||||
jdt-language-server
|
jdt-language-server
|
||||||
texlab
|
texlab
|
||||||
marksman
|
marksman
|
||||||
nodePackages_latest.bash-language-server
|
|
||||||
typescript
|
|
||||||
nodePackages_latest.typescript-language-server
|
|
||||||
nodePackages_latest.vls
|
|
||||||
nodePackages_latest.volar
|
|
||||||
lua-language-server
|
|
||||||
tree-sitter
|
tree-sitter
|
||||||
|
vue-language-server
|
||||||
|
nodePackages_latest.typescript-language-server
|
||||||
gopls
|
gopls
|
||||||
rust-analyzer
|
rust-analyzer
|
||||||
|
|
||||||
|
@ -137,8 +135,8 @@
|
||||||
poppler_utils
|
poppler_utils
|
||||||
|
|
||||||
#Desktop
|
#Desktop
|
||||||
|
fluent-reader
|
||||||
unstable.feishin
|
unstable.feishin
|
||||||
firefox
|
|
||||||
libreoffice
|
libreoffice
|
||||||
unstable.signal-desktop
|
unstable.signal-desktop
|
||||||
pinta
|
pinta
|
||||||
|
@ -146,7 +144,7 @@
|
||||||
vial
|
vial
|
||||||
thunderbird
|
thunderbird
|
||||||
alacritty
|
alacritty
|
||||||
unstable.neovim
|
neovim
|
||||||
fastfetch
|
fastfetch
|
||||||
lazygit
|
lazygit
|
||||||
byzanz
|
byzanz
|
||||||
|
|
|
@ -128,7 +128,7 @@
|
||||||
zathura
|
zathura
|
||||||
thunderbird
|
thunderbird
|
||||||
alacritty
|
alacritty
|
||||||
unstable.neovim
|
neovim
|
||||||
fastfetch
|
fastfetch
|
||||||
lazygit
|
lazygit
|
||||||
byzanz
|
byzanz
|
||||||
|
|
|
@ -3,12 +3,12 @@
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
# Nixpkgs
|
# Nixpkgs
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
|
||||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
fw-pkgs.url = "github:fwastring/fwpkgs/main";
|
fw-pkgs.url = "github:fwastring/fwpkgs/main";
|
||||||
|
|
||||||
# Home manager
|
# Home manager
|
||||||
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
home-manager.url = "github:nix-community/home-manager/release-24.11";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -35,6 +35,14 @@
|
||||||
"docker"
|
"docker"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
runner = {
|
||||||
|
initialPassword = "password";
|
||||||
|
isNormalUser = true;
|
||||||
|
description = "github runner";
|
||||||
|
extraGroups = [
|
||||||
|
"docker"
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,8 @@
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../../config/base.nix
|
../../config/base.nix
|
||||||
../../config/users.nix
|
../../shared/openssh.nix
|
||||||
|
../../jobb/users.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|
|
@ -3,7 +3,7 @@ let
|
||||||
dwm = pkgs.dwm.overrideAttrs (old: {
|
dwm = pkgs.dwm.overrideAttrs (old: {
|
||||||
src = builtins.fetchGit {
|
src = builtins.fetchGit {
|
||||||
url = "https://github.com/FredzyW/dwm-conf.git";
|
url = "https://github.com/FredzyW/dwm-conf.git";
|
||||||
rev = "05276318843d1bfe90a8aae266c9e997bf97e577";
|
rev = "e298bf0dac111f928ef0fbd4a7ebc21db8782df5";
|
||||||
};
|
};
|
||||||
nativeBuildInputs = with pkgs; [
|
nativeBuildInputs = with pkgs; [
|
||||||
xorg.libX11.dev
|
xorg.libX11.dev
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
builtins.fetchGit {
|
builtins.fetchGit {
|
||||||
url = "https://github.com/rockofox/firefox-minima";
|
url = "https://github.com/rockofox/firefox-minima";
|
||||||
ref = "main";
|
ref = "main";
|
||||||
rev = "c5580fd04e9b198320f79d441c78a641517d7af5"; # <-- Change this
|
rev = "dc40a861b24b378982c265a7769e3228ffccd45a"; # <-- Change this
|
||||||
}
|
}
|
||||||
}/userChrome.css";
|
}/userChrome.css";
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -11,12 +11,12 @@
|
||||||
# name = "Iosevka Nerd Font Bold";
|
# name = "Iosevka Nerd Font Bold";
|
||||||
# name = "ComicShannsMono Nerd Font Bold";
|
# name = "ComicShannsMono Nerd Font Bold";
|
||||||
name = "Hack Nerd Font Mono Bold";
|
name = "Hack Nerd Font Mono Bold";
|
||||||
size = 13;
|
size = 12;
|
||||||
};
|
};
|
||||||
shellIntegration = {
|
shellIntegration = {
|
||||||
mode = "no-cursor";
|
mode = "no-cursor";
|
||||||
};
|
};
|
||||||
theme = "Catppuccin-Mocha";
|
themeFile = "Catppuccin-Mocha";
|
||||||
settings = {
|
settings = {
|
||||||
confirm_os_window_close = 2;
|
confirm_os_window_close = 2;
|
||||||
cursor_shape = "block";
|
cursor_shape = "block";
|
||||||
|
|
|
@ -86,6 +86,18 @@
|
||||||
user = "fw";
|
user = "fw";
|
||||||
identityFile = "/home/fw/.ssh/id_rsa";
|
identityFile = "/home/fw/.ssh/id_rsa";
|
||||||
};
|
};
|
||||||
|
"kube01" = {
|
||||||
|
hostname = "192.168.0.177";
|
||||||
|
port = 22;
|
||||||
|
user = "fw";
|
||||||
|
identityFile = "/home/fw/.ssh/fw-ssh-key";
|
||||||
|
};
|
||||||
|
"runner01" = {
|
||||||
|
hostname = "192.168.0.205";
|
||||||
|
port = 22;
|
||||||
|
user = "fw";
|
||||||
|
identityFile = "/home/fw/.ssh/fw-ssh-key";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,16 +7,6 @@
|
||||||
tmuxPlugins.sensible
|
tmuxPlugins.sensible
|
||||||
tmuxPlugins.pain-control
|
tmuxPlugins.pain-control
|
||||||
tmuxPlugins.sessionist
|
tmuxPlugins.sessionist
|
||||||
tmuxPlugins.logging
|
|
||||||
{
|
|
||||||
plugin = tmuxPlugins.resurrect;
|
|
||||||
extraConfig = ''
|
|
||||||
resurrect_dir="$HOME/.tmux/resurrect"
|
|
||||||
set -g @resurrect-dir $resurrect_dir
|
|
||||||
set -g @resurrect-hook-post-save-all 'target=$(readlink -f $resurrect_dir/last); sed "s| --cmd .*-vim-pack-dir||g; s|/etc/profiles/per-user/$USER/bin/||g" $target | sponge $target'
|
|
||||||
set -g @resurrect-strategy-nvim 'session'
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
plugin = tmuxPlugins.continuum;
|
plugin = tmuxPlugins.continuum;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
@ -24,8 +14,6 @@
|
||||||
set -g @continuum-restore 'on'
|
set -g @continuum-restore 'on'
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
fw-pkgs.tmuxPlugins.spotify
|
|
||||||
fw-pkgs.tmuxPlugins.tmux-fzf-window
|
|
||||||
{
|
{
|
||||||
plugin = fw-pkgs.tmuxPlugins.minimal;
|
plugin = fw-pkgs.tmuxPlugins.minimal;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue