AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix some setting after upgrade

Browse Source
This commit is contained in:
Dmitriy Kholkin 2025-04-05 20:31:16 +03:00
parent c78cf8f7f5
commit 64c6cefe44
Signed by: AtaraxiaDev
GPG Key ID: FD266B810DF48DF2
7 changed files with 246 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@ -36,7 +36,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
catppuccin.url = "github:catppuccin/nix"; catppuccin.url = "github:catppuccin/nix";
catppuccin-vsc.url = "github:catppuccin/vscode";
deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.url = "github:serokell/deploy-rs";
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";

363
profiles/applications/vscode/default.nix
View File

@ -1,4 +1,11 @@
{ pkgs, lib, config, inputs, ... }: {
pkgs,
lib,
config,
inputs,
self-nixpkgs,
...
}:
let let
EDITOR = pkgs.writeShellScript "code-editor" '' EDITOR = pkgs.writeShellScript "code-editor" ''
source "/etc/profiles/per-user/${config.mainuser}/etc/profile.d/hm-session-vars.sh" source "/etc/profiles/per-user/${config.mainuser}/etc/profile.d/hm-session-vars.sh"
@ -10,10 +17,13 @@ let
"$@" "$@"
''; '';
ext-vscode = inputs.nix-vscode-marketplace.extensions.${pkgs.system}.vscode-marketplace; pkgs-ext = import self-nixpkgs {
ext-nixpkgs = pkgs.vscode-extensions; inherit (pkgs) system;
config.allowUnfree = true;
overlays = [ inputs.nix-vscode-marketplace.overlays.default ];
};
continue-ver = lib.getVersion ext-nixpkgs.continue.continue; continue-ver = lib.getVersion pkgs-ext.vscode-extensions.continue.continue;
in in
{ {
environment.sessionVariables = { environment.sessionVariables = {
@ -35,177 +45,184 @@ in
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscode; package = pkgs.vscode;
enableExtensionUpdateCheck = false; profiles.default = {
enableUpdateCheck = false; enableExtensionUpdateCheck = false;
extensions = [ enableUpdateCheck = false;
ext-vscode.aaron-bond.better-comments extensions =
# ext-vscode.alefragnani.bookmarks let
# ext-vscode.alefragnani.project-manager ext-market = pkgs-ext.vscode-marketplace;
# ext-vscode.alexisvt.flutter-snippets ext-nixpkgs = pkgs-ext.vscode-extensions;
ext-vscode.christian-kohler.path-intellisense in
ext-vscode.codezombiech.gitignore [
ext-nixpkgs.continue.continue ext-market.aaron-bond.better-comments
# ext-vscode.dart-code.dart-code # ext-market.alefragnani.bookmarks
# ext-vscode.dart-code.flutter # ext-market.alefragnani.project-manager
ext-vscode.eamodio.gitlens # ext-market.alexisvt.flutter-snippets
ext-vscode.enkia.tokyo-night ext-market.christian-kohler.path-intellisense
# ext-vscode.felixangelov.bloc ext-market.codezombiech.gitignore
ext-vscode.fill-labs.dependi ext-nixpkgs.continue.continue
ext-vscode.github.vscode-github-actions # ext-market.dart-code.dart-code
ext-vscode.github.vscode-pull-request-github # ext-market.dart-code.flutter
ext-vscode.gruntfuggly.todo-tree ext-market.eamodio.gitlens
ext-vscode.irongeek.vscode-env ext-market.enkia.tokyo-night
ext-vscode.jebbs.plantuml # ext-market.felixangelov.bloc
ext-vscode.jnoortheen.nix-ide ext-market.fill-labs.dependi
# ext-vscode.lucax88x.codeacejumper ext-market.github.vscode-github-actions
# ext-vscode.marcelovelasquez.flutter-tree ext-market.github.vscode-pull-request-github
ext-vscode.mhutchie.git-graph ext-market.gruntfuggly.todo-tree
ext-vscode.mkhl.direnv ext-market.irongeek.vscode-env
ext-vscode.ms-azuretools.vscode-docker ext-market.jebbs.plantuml
ext-nixpkgs.ms-python.python ext-market.jnoortheen.nix-ide
ext-vscode.ms-python.isort # ext-market.lucax88x.codeacejumper
ext-vscode.ms-python.vscode-pylance # ext-market.marcelovelasquez.flutter-tree
ext-nixpkgs.ms-vscode.cpptools ext-market.mhutchie.git-graph
ext-vscode.ms-vscode.hexeditor ext-market.mkhl.direnv
ext-nixpkgs.ms-vscode-remote.remote-containers ext-market.ms-azuretools.vscode-docker
ext-nixpkgs.ms-vscode-remote.remote-ssh #FIX later ext-nixpkgs.ms-python.python
ext-vscode.pkief.material-icon-theme ext-market.ms-python.isort
ext-vscode.streetsidesoftware.code-spell-checker ext-market.ms-python.vscode-pylance
ext-vscode.streetsidesoftware.code-spell-checker-russian ext-nixpkgs.ms-vscode.cpptools
ext-vscode.ultram4rine.vscode-choosealicense ext-market.ms-vscode.hexeditor
ext-vscode.usernamehw.errorlens ext-nixpkgs.ms-vscode-remote.remote-containers
ext-vscode.yzhang.markdown-all-in-one ext-nixpkgs.ms-vscode-remote.remote-ssh # FIX later
# Rust ext-market.pkief.material-icon-theme
ext-vscode.jscearcy.rust-doc-viewer ext-market.streetsidesoftware.code-spell-checker
ext-vscode.polypus74.trusty-rusty-snippets ext-market.streetsidesoftware.code-spell-checker-russian
ext-nixpkgs.rust-lang.rust-analyzer ext-market.ultram4rine.vscode-choosealicense
ext-vscode.tamasfe.even-better-toml ext-market.usernamehw.errorlens
ext-vscode.vadimcn.vscode-lldb ext-market.yzhang.markdown-all-in-one
# Golang # Rust
ext-vscode.golang.go ext-market.jscearcy.rust-doc-viewer
# Zig ext-market.polypus74.trusty-rusty-snippets
ext-vscode.ziglang.vscode-zig ext-nixpkgs.rust-lang.rust-analyzer
]; ext-market.tamasfe.even-better-toml
# mutableExtensionsDir = false; ext-market.vadimcn.vscode-lldb
userSettings = { # Golang
"continue.telemetryEnabled" = false; ext-market.golang.go
"dart.checkForSdkUpdates" = false; # Zig
"dart.debugSdkLibraries" = true; ext-market.ziglang.vscode-zig
"dart.flutterCreateOrganization" = "com.ataraxiadev"; ];
"dart.flutterCreatePlatforms" = [ "linux,web,windows" ]; # mutableExtensionsDir = false;
"dart.flutterScreenshotPath" = "/home/${config.mainuser}/Pictures/flutter"; userSettings = {
"dart.openDevTools" = "flutter"; "continue.telemetryEnabled" = false;
"dart.runPubGetOnNestedProjects" = "below"; "dart.checkForSdkUpdates" = false;
"dart.showTodos" = true; "dart.debugSdkLibraries" = true;
"editor.fontFamily" = "'VictorMono Nerd Font Medium'"; "dart.flutterCreateOrganization" = "com.ataraxiadev";
"editor.fontLigatures" = true; "dart.flutterCreatePlatforms" = [ "linux,web,windows" ];
"editor.fontSize" = 16; "dart.flutterScreenshotPath" = "/home/${config.mainuser}/Pictures/flutter";
"editor.guides.bracketPairs" = "active"; "dart.openDevTools" = "flutter";
"editor.quickSuggestions" = { "dart.runPubGetOnNestedProjects" = "below";
"other" = true; "dart.showTodos" = true;
"comments" = false; "editor.fontFamily" = "'VictorMono Nerd Font Medium'";
"strings" = true; "editor.fontLigatures" = true;
}; "editor.fontSize" = 16;
"files.autoSave" = "afterDelay"; "editor.guides.bracketPairs" = "active";
"files.exclude" = { "editor.quickSuggestions" = {
"**/.classpath" = true; "other" = true;
"**/.project" = true; "comments" = false;
"**/.settings" = true; "strings" = true;
"**/.factorypath" = true; };
"**/.direnv" = true; "files.autoSave" = "afterDelay";
}; "files.exclude" = {
"files.trimTrailingWhitespace" = true; "**/.classpath" = true;
"files.watcherExclude" = { "**/.project" = true;
"**/.direnv" = true; "**/.settings" = true;
}; "**/.factorypath" = true;
"git-graph.repository.sign.commits" = true; "**/.direnv" = true;
"git-graph.repository.sign.tags" = true; };
"git.autofetch" = false; "files.trimTrailingWhitespace" = true;
"git.enableCommitSigning" = true; "files.watcherExclude" = {
"go.useLanguageServer" = true; "**/.direnv" = true;
"gopls" = { };
"ui.semanticTokens" = true; "git-graph.repository.sign.commits" = true;
"formatting.gofumpt" = true; "git-graph.repository.sign.tags" = true;
"ui.diagnostic.staticcheck" = true; "git.autofetch" = false;
}; "git.enableCommitSigning" = true;
"license.author" = "Dmitriy <ataraxiadev@ataraxiadev.com>"; "go.useLanguageServer" = true;
"license.default" = "mit"; "gopls" = {
"license.extension" = ".md"; "ui.semanticTokens" = true;
"license.year" = "auto"; "formatting.gofumpt" = true;
"nix.enableLanguageServer" = true; "ui.diagnostic.staticcheck" = true;
"nix.formatterPath" = "${pkgs.nixfmt-rfc-style}/bin/nixfmt"; };
"nix.serverPath" = "${pkgs.nil}/bin/nil"; "license.author" = "Dmitriy <ataraxiadev@ataraxiadev.com>";
# "nix.serverPath" = "${pkgs.nixd}/bin/nixd"; "license.default" = "mit";
"nix.serverSettings" = { "license.extension" = ".md";
"nil" = { "license.year" = "auto";
"formatting" = { "nix.enableLanguageServer" = true;
"command" = ["${pkgs.nixfmt-rfc-style}/bin/nixfmt"]; "nix.formatterPath" = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
}; "nix.serverPath" = "${pkgs.nil}/bin/nil";
# "nix" = { # "nix.serverPath" = "${pkgs.nixd}/bin/nixd";
# "maxMemoryMB" = 4096; "nix.serverSettings" = {
# "flake" = { "nil" = {
# "autoEvalInputs" = true; "formatting" = {
# }; "command" = [ "${pkgs.nixfmt-rfc-style}/bin/nixfmt" ];
# }; };
}; # "nix" = {
"nixd" = { # "maxMemoryMB" = 4096;
"formatting" = { # "flake" = {
"command" = ["${pkgs.nixfmt-rfc-style}/bin/nixfmt"]; # "autoEvalInputs" = true;
}; # };
# "options" = { # };
# "nixos" = { };
# "expr" = ""; "nixd" = {
# }; "formatting" = {
# "home-manager" = { "command" = [ "${pkgs.nixfmt-rfc-style}/bin/nixfmt" ];
# "expr" = ""; };
# }; # "options" = {
# }; # "nixos" = {
}; # "expr" = "";
}; # };
"rust-analyzer.check.command" = "clippy"; # "home-manager" = {
"search.exclude" = { # "expr" = "";
"**/.direnv" = true; # };
}; # };
"security.workspace.trust.untrustedFiles" = "open"; };
"telemetry.telemetryLevel" = "off"; };
"terminal.integrated.defaultProfile.linux" = "zsh"; "rust-analyzer.check.command" = "clippy";
"terminal.integrated.fontFamily" = "FiraCode Nerd Font"; "search.exclude" = {
"terminal.integrated.fontWeight" = "500"; "**/.direnv" = true;
"terminal.integrated.profiles.linux".zsh.path = "/run/current-system/sw/bin/zsh"; };
"terminal.integrated.scrollback" = 100000; "security.workspace.trust.untrustedFiles" = "open";
"todo-tree.regex.regex" = "(//|#|<!--|;|/\\*|^|^[ \\t]*(-|\\d+.))\\s*($TAGS)|todo!"; "telemetry.telemetryLevel" = "off";
"update.mode" = "none"; "terminal.integrated.defaultProfile.linux" = "zsh";
"window.menuBarVisibility" = "toggle"; "terminal.integrated.fontFamily" = "FiraCode Nerd Font";
"window.titleBarStyle" = "custom"; "terminal.integrated.fontWeight" = "500";
"workbench.colorTheme" = "Tokyo Night"; "terminal.integrated.profiles.linux".zsh.path = "/run/current-system/sw/bin/zsh";
"workbench.iconTheme" = "material-icon-theme"; "terminal.integrated.scrollback" = 100000;
"zig.path" = "zig"; "todo-tree.regex.regex" = "(//|#|<!--|;|/\\*|^|^[ \\t]*(-|\\d+.))\\s*($TAGS)|todo!";
"zig.zls.path" = "zls"; "update.mode" = "none";
"zig.initialSetupDone" = true; "window.menuBarVisibility" = "toggle";
"[dart]" = { "window.titleBarStyle" = "custom";
"editor.formatOnSave" = true; "workbench.colorTheme" = "Tokyo Night";
"editor.formatOnType" = true; "workbench.iconTheme" = "material-icon-theme";
"editor.rulers" = [ "zig.path" = "zig";
80 "zig.zls.path" = "zls";
"zig.initialSetupDone" = true;
"[dart]" = {
"editor.formatOnSave" = true;
"editor.formatOnType" = true;
"editor.rulers" = [
80
];
"editor.selectionHighlight" = false;
"editor.suggest.snippetsPreventQuickSuggestions" = false;
"editor.suggestSelection" = "first";
"editor.tabCompletion" = "onlySnippets";
"editor.wordBasedSuggestions" = "off";
};
"[nix]" = {
"editor.tabSize" = 2;
"editor.detectIndentation" = true;
};
"[rust]" = {
"editor.defaultFormatter" = "rust-lang.rust-analyzer";
"editor.formatOnSave" = true;
};
"python.analysis.extraPaths" = [
"/home/${config.mainuser}/.vscode/extensions/continue.continue"
"/home/${config.mainuser}/.vscode/extensions/continue.continue-${continue-ver}-linux-x64"
]; ];
"editor.selectionHighlight" = false;
"editor.suggest.snippetsPreventQuickSuggestions" = false;
"editor.suggestSelection" = "first";
"editor.tabCompletion" = "onlySnippets";
"editor.wordBasedSuggestions" = "off";
}; };
"[nix]" = {
"editor.tabSize" = 2;
"editor.detectIndentation" = true;
};
"[rust]" = {
"editor.defaultFormatter" = "rust-lang.rust-analyzer";
"editor.formatOnSave" = true;
};
"python.analysis.extraPaths" = [
"/home/${config.mainuser}/.vscode/extensions/continue.continue"
"/home/${config.mainuser}/.vscode/extensions/continue.continue-${continue-ver}-linux-x64"
];
}; };
}; };
}; };

9
profiles/overlay.nix
View File

@ -56,15 +56,6 @@ with lib; {
''; '';
}); });
hyprland = prev.hyprland.overrideAttrs (oa: {
patches = (oa.patches or []) ++ [
../patches/hyprland-tablet.patch
];
});
maa-assistant-arknights = prev.maa-assistant-arknights.overrideAttrs (_: {
env.NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized";
});
neatvnc = prev.neatvnc.overrideAttrs (oa: { neatvnc = prev.neatvnc.overrideAttrs (oa: {
patches = [ ../patches/neatvnc.patch ] ++ oa.patches or [ ]; patches = [ ../patches/neatvnc.patch ] ++ oa.patches or [ ];
}); });

32
profiles/workspace/catppuccin/catppuccin.nix
View File

@ -31,6 +31,38 @@
catppuccin.zsh-syntax-highlighting.enable = true; catppuccin.zsh-syntax-highlighting.enable = true;
programs.zsh.syntaxHighlighting.enable = true; programs.zsh.syntaxHighlighting.enable = true;
catppuccin.vscode = {
enable = true;
flavor = cfg.flavor;
settings = {
accent = cfg.accent;
boldKeywords = false;
italicComments = false;
italicKeywords = false;
extraBordersEnabled = false;
workbenchMode = "flat";
bracketMode = "dimmed";
colorOverrides = {
${cfg.flavor} = {
base = "#1c1c2d";
mantle = "#191925";
crust = "#151511";
};
};
customUIColors = {
"statusBar.foreground" = "accent";
};
};
};
programs.vscode.profiles.default.userSettings = {
"gopls.ui.semanticTokens" = lib.mkForce true;
"editor.semanticHighlighting.enabled" = lib.mkForce true;
"terminal.integrated.minimumContrastRatio" = lib.mkForce 1;
"window.titleBarStyle" = lib.mkForce "custom";
"workbench.colorTheme" = lib.mkForce "Catppuccin ${cfg.flavorUpper}";
"workbench.iconTheme" = lib.mkForce "catppuccin-${cfg.flavor}";
};
wayland.windowManager.hyprland.extraConfig = '' wayland.windowManager.hyprland.extraConfig = ''
exec=hyprctl setcursor catppuccin-${cfg.flavor}-${cfg.accent}-cursors ${toString cfg.thm.cursorSize} exec=hyprctl setcursor catppuccin-${cfg.flavor}-${cfg.accent}-cursors ${toString cfg.thm.cursorSize}
''; '';

1
profiles/workspace/catppuccin/default.nix
View File

@ -25,7 +25,6 @@
(import ./gitea.nix { inherit cfg; gitea = "gitea"; }) (import ./gitea.nix { inherit cfg; gitea = "gitea"; })
# Deprecated on catppuccin-nix # Deprecated on catppuccin-nix
(import ./gtk.nix { inherit cfg; }) (import ./gtk.nix { inherit cfg; })
(import ./vscode.nix { inherit cfg; })
]; ];
home-manager.users.${config.mainuser} = { home-manager.users.${config.mainuser} = {

38
profiles/workspace/catppuccin/vscode.nix
View File

@ -1,38 +0,0 @@
{ cfg }: { config, lib, pkgs, inputs, ... }: {
home-manager.users.${config.mainuser} = {
programs.vscode = {
extensions = let
ext-vscode = inputs.nix-vscode-marketplace.extensions.${pkgs.system}.vscode-marketplace;
in [
ext-vscode.alexdauenhauer.catppuccin-noctis
ext-vscode.catppuccin.catppuccin-vsc-icons
(inputs.catppuccin-vsc.packages.${pkgs.system}.catppuccin-vsc.override {
accent = cfg.accent;
boldKeywords = false;
italicComments = false;
italicKeywords = false;
extraBordersEnabled = false;
workbenchMode = "flat";
bracketMode = "dimmed";
colorOverrides = {
mocha = {
base = "#1c1c2d";
mantle = "#191925";
crust = "#151511";
};
};
customUIColors = {
"statusBar.foreground" = "accent";
};
})
];
userSettings = {
"editor.semanticHighlighting.enabled" = lib.mkForce true;
"terminal.integrated.minimumContrastRatio" = lib.mkForce 1;
"window.titleBarStyle" = lib.mkForce "custom";
"workbench.colorTheme" = lib.mkForce "Catppuccin ${cfg.flavorUpper}";
"workbench.iconTheme" = lib.mkForce "catppuccin-${cfg.flavor}";
};
};
};
}

45
profiles/workspace/wayland/hyprland.nix
View File

@ -251,31 +251,34 @@ in {
bind=${modifier}ALT,g,movetoworkspace,name:Games bind=${modifier}ALT,g,movetoworkspace,name:Games
bind=${modifier}ALT,Cyrillic_E,movetoworkspace,name:Messengers bind=${modifier}ALT,Cyrillic_E,movetoworkspace,name:Messengers
'' '' '' ''
windowrulev2=workspace name:Email silent,class:^(geary)$ windowrule=workspace name:Email silent,class:^(geary)$
windowrulev2=workspace name:Steam silent,class:^(steam)$ windowrule=workspace name:Steam silent,class:^(steam)$
windowrulev2=workspace name:Steam silent,class:^(.gamescope-wrapped)$,title:(Steam) windowrule=workspace name:Steam silent,class:^(.gamescope-wrapped)$,title:(Steam)
windowrulev2=workspace name:Music silent,title:^(Spotify)$ windowrule=workspace name:Music silent,title:^(Spotify)$
windowrulev2=tile,title:^(Spotify)$ windowrule=tile,title:^(Spotify)$
windowrulev2=workspace name:Messengers silent,class:^(org.telegram.desktop)$ windowrule=workspace name:Messengers silent,class:^(org.telegram.desktop)$
windowrule=opaque,firefox windowrule=opaque,class:^(firefox)$
windowrule=opaque,chromium-browser windowrule=opaque,class:^(Chromium-browser)$
windowrule=opaque,mpv windowrule=opaque,class:^(mpv)$
windowrule=float,Waydroid windowrule=float,class:^(Waydroid)$
windowrule=size 1600 900,Waydroid windowrule=size 1600 900,class:^(Waydroid)$
windowrule=center,Waydroid windowrule=center,class:^(Waydroid)$
windowrule=opaque,Waydroid windowrule=opaque,class:^(Waydroid)$
windowrule=opaque,qemu windowrule=opaque,class:.*(qemu).*
windowrule=opaque,steam_app.* windowrule=opaque,class:^(steam)$
windowrule=float,steam_app.* windowrule=float,class:^(steam)$
windowrule=opaque,virt-manager windowrule=opaque,class:^(gamescope)$
windowrulev2=opaque,class:^(.*winbox64.exe)$ windowrule=float,class:^(gamescope)$
windowrulev2=tile,class:^(.*winbox64.exe)$
windowrulev2=opaque,class:^(starrail.exe)$
windowrule=opaque,.*jellyfin.* windowrule=opaque,class:.*(virt-manager).*
windowrule=opaque,class:^(.*winbox64.exe)$
windowrule=tile,class:^(.*winbox64.exe)$
windowrule=opaque,class:^(starrail.exe)$
windowrule=opaque,class:.*(jellyfin).*
'' '' '' ''
env=GDK_BACKEND=wayland,x11 env=GDK_BACKEND=wayland,x11
env=QT_QPA_PLATFORM=wayland;xcb env=QT_QPA_PLATFORM=wayland;xcb