wakapi and cleanup
This commit is contained in:
parent
52025b5cbf
commit
12cf5c7b87
13
flake.nix
13
flake.nix
@ -16,7 +16,7 @@
|
|||||||
editor = "neovim"; # neovim, vscode
|
editor = "neovim"; # neovim, vscode
|
||||||
|
|
||||||
# List all themes: $ nix build nixpkgs#base16-schemes && ls result/share/themes
|
# List all themes: $ nix build nixpkgs#base16-schemes && ls result/share/themes
|
||||||
theme = "evangelion-blood"; # catppuccin-mocha, tokyo-night-dark, one-dark
|
theme = "catppuccin-mocha"; # catppuccin-mocha, tokyo-night-dark, one-dark
|
||||||
background =
|
background =
|
||||||
if userSettings.theme == "catppuccin-mocha"
|
if userSettings.theme == "catppuccin-mocha"
|
||||||
then "aurora_borealis.png"
|
then "aurora_borealis.png"
|
||||||
@ -151,9 +151,18 @@
|
|||||||
|
|
||||||
nixcord = {
|
nixcord = {
|
||||||
url = "github:kaylorben/nixcord";
|
url = "github:kaylorben/nixcord";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
shinya-nvf.url = "git+https://git.foglar.tech/foglar/neovim-config";
|
zen-browser = {
|
||||||
|
url = "github:0xc000022070/zen-browser-flake";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
|
shinya-nvf = {
|
||||||
|
url = "git+https://git.foglar.tech/foglar/neovim-config";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
# Nix Flake Install Script
|
# Nix Flake Install Script
|
||||||
install-script = {
|
install-script = {
|
||||||
|
|||||||
@ -88,6 +88,7 @@
|
|||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
inputs.install-script.packages.${system}.default
|
inputs.install-script.packages.${system}.default
|
||||||
inputs.shinya-nvf.packages.${system}.nvf
|
inputs.shinya-nvf.packages.${system}.nvf
|
||||||
|
inputs.zen-browser.packages.${system}.default
|
||||||
];
|
];
|
||||||
|
|
||||||
#services.twingate.enable = true;
|
#services.twingate.enable = true;
|
||||||
|
|||||||
@ -23,6 +23,7 @@
|
|||||||
lazygit
|
lazygit
|
||||||
ghostty
|
ghostty
|
||||||
cargo
|
cargo
|
||||||
|
ciscoPacketTracer8
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@ -342,6 +342,7 @@
|
|||||||
"opacity 0.80 0.80,class:^(code-oss)$"
|
"opacity 0.80 0.80,class:^(code-oss)$"
|
||||||
"opacity 0.90 0.90,class:^(code)$"
|
"opacity 0.90 0.90,class:^(code)$"
|
||||||
"opacity 0.90 0.90,initialTitle:^(Open Folder)$"
|
"opacity 0.90 0.90,initialTitle:^(Open Folder)$"
|
||||||
|
"opacity 0.90 0.90,initialTitle:^(Open Files)$"
|
||||||
"opacity 0.80 0.80,class:^(code-url-handler)$"
|
"opacity 0.80 0.80,class:^(code-url-handler)$"
|
||||||
"opacity 0.80 0.80,class:^(code-insiders-url-handler)$"
|
"opacity 0.80 0.80,class:^(code-insiders-url-handler)$"
|
||||||
"opacity 0.80 0.80,class:^(kitty)$"
|
"opacity 0.80 0.80,class:^(kitty)$"
|
||||||
@ -383,8 +384,10 @@
|
|||||||
"opacity 0.80 0.80,class:^(io.gitlab.adhami3310.Impression)$"
|
"opacity 0.80 0.80,class:^(io.gitlab.adhami3310.Impression)$"
|
||||||
"opacity 0.80 0.80,class:^(io.missioncenter.MissionCenter)$"
|
"opacity 0.80 0.80,class:^(io.missioncenter.MissionCenter)$"
|
||||||
"opacity 0.80 0.80,class:^(io.github.flattool.Warehouse)$"
|
"opacity 0.80 0.80,class:^(io.github.flattool.Warehouse)$"
|
||||||
|
|
||||||
"float,class:^(org.kde.dolphin)$,title:^(Progress Dialog — Dolphin)$"
|
"float,class:^(org.kde.dolphin)$,title:^(Progress Dialog — Dolphin)$"
|
||||||
"float,class:^(org.kde.dolphin)$,title:^(Copying — Dolphin)$"
|
"float,class:^(org.kde.dolphin)$,title:^(Copying — Dolphin)$"
|
||||||
|
"float, initialTitle:^(Open Files)$"
|
||||||
"float,title:^(About Mozilla Firefox)$"
|
"float,title:^(About Mozilla Firefox)$"
|
||||||
"float,class:^(firefox)$,title:^(Picture-in-Picture)$"
|
"float,class:^(firefox)$,title:^(Picture-in-Picture)$"
|
||||||
"float,class:^(firefox)$,title:^(Library)$"
|
"float,class:^(firefox)$,title:^(Library)$"
|
||||||
@ -452,6 +455,7 @@
|
|||||||
"opacity 0.80 0.70,class:^(chat-simplex-desktop-MainKt)$"
|
"opacity 0.80 0.70,class:^(chat-simplex-desktop-MainKt)$"
|
||||||
|
|
||||||
"float,class:^(Bitwarden)$"
|
"float,class:^(Bitwarden)$"
|
||||||
|
"float, initialClass:^(PacketTracer)"
|
||||||
];
|
];
|
||||||
|
|
||||||
layerrule = [
|
layerrule = [
|
||||||
|
|||||||
@ -45,86 +45,91 @@
|
|||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
profiles.default.userSettings = {
|
profiles.default = {
|
||||||
"files.autoSave" = "afterDelay";
|
userSettings = {
|
||||||
"explorer.confirmDragAndDrop" = false;
|
"files.autoSave" = "afterDelay";
|
||||||
#"editor.fontSize" = 16;
|
"explorer.confirmDragAndDrop" = false;
|
||||||
"editor.minimap.side" = "right";
|
#"editor.fontSize" = 16;
|
||||||
"editor.scrollbar.vertical" = "hidden";
|
"editor.minimap.side" = "right";
|
||||||
"editor.scrollbar.verticalScrollbarSize" = 0;
|
"editor.scrollbar.vertical" = "hidden";
|
||||||
"editor.fontLigatures" = "'calt', 'ss01', 'ss02', 'ss03', 'ss04', 'ss05', 'ss06', 'ss07', 'ss08', 'ss09', 'liga'";
|
"editor.scrollbar.verticalScrollbarSize" = 0;
|
||||||
"editor.stickyScroll.enabled" = false;
|
"editor.fontLigatures" = "'calt', 'ss01', 'ss02', 'ss03', 'ss04', 'ss05', 'ss06', 'ss07', 'ss08', 'ss09', 'liga'";
|
||||||
"security.workspace.trust.untrustedFiles" = "newWindow";
|
"editor.stickyScroll.enabled" = false;
|
||||||
"security.workspace.trust.startupPrompt" = "never";
|
"security.workspace.trust.untrustedFiles" = "newWindow";
|
||||||
"security.workspace.trust.enabled" = false;
|
"security.workspace.trust.startupPrompt" = "never";
|
||||||
"terminal.external.linuxExec" = "${pkgs.kitty}/bin/kitty";
|
"security.workspace.trust.enabled" = false;
|
||||||
"terminal.integrated.stickyScroll.enabled" = true;
|
"terminal.external.linuxExec" = "${pkgs.kitty}/bin/kitty";
|
||||||
"terminal.integrated.inheritEnv" = false;
|
"terminal.integrated.stickyScroll.enabled" = true;
|
||||||
"telemetry.telemetryLevel" = "off";
|
"terminal.integrated.inheritEnv" = false;
|
||||||
"workbench.activityBar.location" = "hidden"; # bottom
|
"telemetry.telemetryLevel" = "off";
|
||||||
"workbench.iconTheme" = "material-icon-theme";
|
"workbench.activityBar.location" = "hidden"; # bottom
|
||||||
"workbench.productIconTheme" = "material-product-icons";
|
"workbench.iconTheme" = "material-icon-theme";
|
||||||
"window.menuBarVisibility" = "toggle";
|
"workbench.productIconTheme" = "material-product-icons";
|
||||||
|
"window.menuBarVisibility" = "toggle";
|
||||||
|
};
|
||||||
|
|
||||||
|
extensions = with pkgs-stable.vscode-extensions; [
|
||||||
|
ms-azuretools.vscode-docker
|
||||||
|
|
||||||
|
foxundermoon.shell-format
|
||||||
|
tamasfe.even-better-toml
|
||||||
|
aaron-bond.better-comments
|
||||||
|
christian-kohler.path-intellisense
|
||||||
|
|
||||||
|
github.codespaces
|
||||||
|
|
||||||
|
nefrob.vscode-just-syntax
|
||||||
|
|
||||||
|
# Remote
|
||||||
|
ms-vscode-remote.remote-ssh
|
||||||
|
ms-vscode-remote.remote-ssh-edit
|
||||||
|
|
||||||
|
pkief.material-product-icons
|
||||||
|
pkief.material-icon-theme
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
profiles.default.extensions = with pkgs-stable.vscode-extensions; [
|
|
||||||
ms-azuretools.vscode-docker
|
|
||||||
|
|
||||||
foxundermoon.shell-format
|
|
||||||
tamasfe.even-better-toml
|
|
||||||
aaron-bond.better-comments
|
|
||||||
christian-kohler.path-intellisense
|
|
||||||
|
|
||||||
github.codespaces
|
|
||||||
|
|
||||||
nefrob.vscode-just-syntax
|
|
||||||
|
|
||||||
# Remote
|
|
||||||
ms-vscode-remote.remote-ssh
|
|
||||||
ms-vscode-remote.remote-ssh-edit
|
|
||||||
|
|
||||||
pkief.material-product-icons
|
|
||||||
pkief.material-icon-theme
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
(lib.mkIf config.program.vscode.ide.python.enable {
|
(lib.mkIf config.program.vscode.ide.python.enable {
|
||||||
programs.vscode.profiles.default.userSettings = {
|
programs.vscode.profiles.default = {
|
||||||
"[python]" = {
|
userSettings = {
|
||||||
"editor.defaultFormatter" = "ms-python.black-formatter";
|
"[python]" = {
|
||||||
"python.defaultInterpreterPath" = "${pkgs.python3}/bin/python";
|
"editor.defaultFormatter" = "ms-python.black-formatter";
|
||||||
|
"python.defaultInterpreterPath" = "${pkgs.python3}/bin/python";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
|
extensions = with pkgs-stable.vscode-extensions; [
|
||||||
ms-python.python
|
ms-python.python
|
||||||
ms-python.vscode-pylance
|
ms-python.vscode-pylance
|
||||||
ms-python.black-formatter
|
ms-python.black-formatter
|
||||||
ms-python.debugpy
|
ms-python.debugpy
|
||||||
njpwerner.autodocstring
|
njpwerner.autodocstring
|
||||||
ms-toolsai.jupyter
|
ms-toolsai.jupyter
|
||||||
ms-toolsai.jupyter-keymap
|
ms-toolsai.jupyter-keymap
|
||||||
ms-toolsai.jupyter-renderers
|
ms-toolsai.jupyter-renderers
|
||||||
];
|
];
|
||||||
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
(lib.mkIf config.program.vscode.ide.go.enable {
|
(lib.mkIf config.program.vscode.ide.go.enable {
|
||||||
programs.vscode.profiles.default.userSettings = {
|
programs.vscode.profiles.default = {
|
||||||
"go.alternateTools" = {
|
userSettings = {
|
||||||
"go-langserver" = "${pkgs.gopls}/bin/gopls";
|
"go.alternateTools" = {
|
||||||
|
"go-langserver" = "${pkgs.gopls}/bin/gopls";
|
||||||
|
};
|
||||||
|
"gopls" = {"ui.diagnostic.staticcheck" = true;};
|
||||||
};
|
};
|
||||||
"gopls" = {"ui.diagnostic.staticcheck" = true;};
|
|
||||||
};
|
|
||||||
|
|
||||||
|
extensions = with pkgs-stable.vscode-extensions; [
|
||||||
|
golang.go
|
||||||
|
];
|
||||||
|
};
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
GOOS = "linux";
|
GOOS = "linux";
|
||||||
GOARCH = "amd64";
|
GOARCH = "amd64";
|
||||||
GOPATH = "$HOME/.local/share/go";
|
GOPATH = "$HOME/.local/share/go";
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
|
|
||||||
golang.go
|
|
||||||
];
|
|
||||||
})
|
})
|
||||||
|
|
||||||
(lib.mkIf config.program.vscode.ide.csharp.enable {
|
(lib.mkIf config.program.vscode.ide.csharp.enable {
|
||||||
@ -137,30 +142,32 @@
|
|||||||
})
|
})
|
||||||
|
|
||||||
(lib.mkIf config.program.vscode.nix.enable {
|
(lib.mkIf config.program.vscode.nix.enable {
|
||||||
programs.vscode.profiles.default.userSettings = {
|
programs.vscode.profiles.default = {
|
||||||
"nix.serverPath" = "nixd";
|
userSettings = {
|
||||||
"nix.enableLanguageServer" = true;
|
"nix.serverPath" = "nixd";
|
||||||
"nix.serverSettings" = {
|
"nix.enableLanguageServer" = true;
|
||||||
"nixd" = {
|
"nix.serverSettings" = {
|
||||||
"formatting" = {
|
"nixd" = {
|
||||||
"command" = ["alejandra"]; # or nixfmt or nixpkgs-fmt
|
"formatting" = {
|
||||||
};
|
"command" = ["alejandra"]; # or nixfmt or nixpkgs-fmt
|
||||||
"options" = {
|
|
||||||
"nixos" = {
|
|
||||||
"expr" = "(builtins.getFlake \"~/.dotfiles/\").nixosConfigurations.${userSettings.hostname}.options";
|
|
||||||
};
|
};
|
||||||
|
"options" = {
|
||||||
|
"nixos" = {
|
||||||
|
"expr" = "(builtins.getFlake \"~/.dotfiles/\").nixosConfigurations.${userSettings.hostname}.options";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
# "home_manager": {
|
||||||
|
# "expr": "(builtins.getFlake \"/PATH/TO/FLAKE\").homeConfigurations..options"
|
||||||
|
# },
|
||||||
|
# },
|
||||||
};
|
};
|
||||||
# "home_manager": {
|
|
||||||
# "expr": "(builtins.getFlake \"/PATH/TO/FLAKE\").homeConfigurations..options"
|
|
||||||
# },
|
|
||||||
# },
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
|
extensions = with pkgs-stable.vscode-extensions; [
|
||||||
jnoortheen.nix-ide
|
jnoortheen.nix-ide
|
||||||
];
|
];
|
||||||
|
};
|
||||||
home.packages = with pkgs-stable; [
|
home.packages = with pkgs-stable; [
|
||||||
alejandra
|
alejandra
|
||||||
nixd
|
nixd
|
||||||
@ -168,48 +175,58 @@
|
|||||||
})
|
})
|
||||||
|
|
||||||
(lib.mkIf config.program.vscode.ide.web.enable {
|
(lib.mkIf config.program.vscode.ide.web.enable {
|
||||||
programs.vscode.profiles.default.userSettings = {
|
programs.vscode.profiles.default = {
|
||||||
"[json]" = {
|
userSettings = {
|
||||||
"editor.defaultFormatter" = "esbenp.prettier-vscode";
|
"[json]" = {
|
||||||
|
"editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||||
|
};
|
||||||
|
"[html]" = {
|
||||||
|
"editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||||
|
};
|
||||||
|
"[css]" = {
|
||||||
|
"editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
"[html]" = {
|
|
||||||
"editor.defaultFormatter" = "esbenp.prettier-vscode";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
|
extensions = with pkgs-stable.vscode-extensions; [
|
||||||
ritwickdey.liveserver
|
ritwickdey.liveserver
|
||||||
esbenp.prettier-vscode
|
esbenp.prettier-vscode
|
||||||
ecmel.vscode-html-css
|
ecmel.vscode-html-css
|
||||||
ms-vscode.live-server
|
ms-vscode.live-server
|
||||||
formulahendry.auto-rename-tag
|
formulahendry.auto-rename-tag
|
||||||
];
|
];
|
||||||
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
(lib.mkIf config.program.vscode.git.enable {
|
(lib.mkIf config.program.vscode.git.enable {
|
||||||
programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
|
programs.vscode.profiles.default = {
|
||||||
donjayamanne.githistory
|
userSettings = {
|
||||||
eamodio.gitlens
|
"git.autofetch" = true;
|
||||||
github.vscode-pull-request-github
|
};
|
||||||
github.vscode-github-actions
|
|
||||||
];
|
|
||||||
|
|
||||||
programs.vscode.profiles.default.userSettings = {
|
extensions = with pkgs-stable.vscode-extensions; [
|
||||||
"git.autofetch" = true;
|
donjayamanne.githistory
|
||||||
|
eamodio.gitlens
|
||||||
|
github.vscode-pull-request-github
|
||||||
|
github.vscode-github-actions
|
||||||
|
];
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
(lib.mkIf config.program.vscode.markdown.enable {
|
(lib.mkIf config.program.vscode.markdown.enable {
|
||||||
programs.vscode.profiles.default.userSettings = {
|
programs.vscode.profiles.default = {
|
||||||
"[markdown]" = {
|
userSettings = {
|
||||||
"editor.defaultFormatter" = "yzhang.markdown-all-in-one";
|
"[markdown]" = {
|
||||||
|
"editor.defaultFormatter" = "yzhang.markdown-all-in-one";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
|
extensions = with pkgs-stable.vscode-extensions; [
|
||||||
yzhang.markdown-all-in-one
|
yzhang.markdown-all-in-one
|
||||||
davidanson.vscode-markdownlint
|
davidanson.vscode-markdownlint
|
||||||
];
|
marp-team.marp-vscode
|
||||||
|
];
|
||||||
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
(lib.mkIf config.program.vscode.themes.enable {
|
(lib.mkIf config.program.vscode.themes.enable {
|
||||||
@ -223,14 +240,16 @@
|
|||||||
})
|
})
|
||||||
|
|
||||||
(lib.mkIf config.program.vscode.ai.enable {
|
(lib.mkIf config.program.vscode.ai.enable {
|
||||||
programs.vscode.profiles.default.userSettings = {
|
programs.vscode.profiles.default = {
|
||||||
"github.copilot.editor.enableAutoCompletions" = true;
|
userSettings = {
|
||||||
};
|
"github.copilot.editor.enableAutoCompletions" = true;
|
||||||
|
};
|
||||||
|
|
||||||
programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
|
extensions = with pkgs-stable.vscode-extensions; [
|
||||||
github.copilot
|
github.copilot
|
||||||
github.copilot-chat
|
github.copilot-chat
|
||||||
];
|
];
|
||||||
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
(lib.mkIf config.program.vscode.ide.cpp.enable {
|
(lib.mkIf config.program.vscode.ide.cpp.enable {
|
||||||
|
|||||||
@ -10,11 +10,13 @@
|
|||||||
./packages/ssh-client.nix
|
./packages/ssh-client.nix
|
||||||
./packages/syncthing.nix
|
./packages/syncthing.nix
|
||||||
./packages/ollama.nix
|
./packages/ollama.nix
|
||||||
|
./packages/wakapi.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
program = {
|
program = {
|
||||||
docker.enable = lib.mkDefault false;
|
docker.enable = lib.mkDefault false;
|
||||||
podman.enable = lib.mkDefault true;
|
podman.enable = lib.mkDefault true;
|
||||||
|
wakapi.enable = lib.mkDefault true;
|
||||||
ollama.enable = lib.mkDefault false;
|
ollama.enable = lib.mkDefault false;
|
||||||
steam.enable = lib.mkDefault true;
|
steam.enable = lib.mkDefault true;
|
||||||
proxychains.enable = lib.mkDefault true;
|
proxychains.enable = lib.mkDefault true;
|
||||||
@ -29,8 +31,15 @@
|
|||||||
ssh.client.enable = lib.mkDefault true;
|
ssh.client.enable = lib.mkDefault true;
|
||||||
syncthing.enable = lib.mkDefault true;
|
syncthing.enable = lib.mkDefault true;
|
||||||
};
|
};
|
||||||
sys.desktop.steamdeck.enable = lib.mkDefault false;
|
|
||||||
sys.security.sops.enable = lib.mkDefault true;
|
sys = {
|
||||||
programs.kdeconnect.enable = lib.mkDefault true;
|
desktop.steamdeck.enable = lib.mkDefault false;
|
||||||
programs.wireshark.enable = lib.mkDefault true;
|
security.sops.enable = lib.mkDefault true;
|
||||||
|
};
|
||||||
|
|
||||||
|
programs = {
|
||||||
|
kdeconnect.enable = lib.mkDefault true;
|
||||||
|
wireshark.enable = lib.mkDefault true;
|
||||||
|
appimage.binfmt = lib.mkDefault true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
14
nixos/system/packages/wakapi.nix
Normal file
14
nixos/system/packages/wakapi.nix
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
options = {
|
||||||
|
program.wakapi.enable = lib.mkEnableOption "wakapi";
|
||||||
|
};
|
||||||
|
config = lib.mkIf config.program.wakapi.enable {
|
||||||
|
services.wakapi = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user