jan-leila/nix-config
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: jan-leila:1ac0b89935dc11609bbc26b18e016db1bfc7295a
Branches Tags
jan-leila:main
..
compare: jan-leila:358f0394607843d23f659d6aae633c1c29b1a9ef
Branches Tags
jan-leila:main

No commits in common. "1ac0b89935dc11609bbc26b18e016db1bfc7295a" and "358f0394607843d23f659d6aae633c1c29b1a9ef" have entirely different histories.
1ac0b89935 ... 358f039460

5 changed files with 73 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

107
configurations/home-manager/leyla/packages/vscode/default.nix
View file

@ -8,10 +8,6 @@
nix-development-enabled = osConfig.host.nix-development.enable; nix-development-enabled = osConfig.host.nix-development.enable;
ai-tooling-enabled = osConfig.host.ai.enable; ai-tooling-enabled = osConfig.host.ai.enable;
in { in {
imports = [
./user-words.nix
];
config = lib.mkIf config.user.isDesktopUser { config = lib.mkIf config.user.isDesktopUser {
programs = { programs = {
bash.shellAliases = { bash.shellAliases = {
@ -30,6 +26,7 @@ in {
userSettings = lib.mkMerge [ userSettings = lib.mkMerge [
{ {
"workbench.colorTheme" = "Atom One Dark"; "workbench.colorTheme" = "Atom One Dark";
"cSpell.userWords" = import ./user-words.nix;
"javascript.updateImportsOnFileMove.enabled" = "always"; "javascript.updateImportsOnFileMove.enabled" = "always";
"editor.tabSize" = 2; "editor.tabSize" = 2;
"editor.insertSpaces" = false; "editor.insertSpaces" = false;
@ -44,6 +41,9 @@ in {
"editor.formatOnType" = true; "editor.formatOnType" = true;
}; };
"alejandra.program" = "alejandra"; "alejandra.program" = "alejandra";
"nixpkgs" = {
"expr" = "import <nixpkgs> {}";
};
}) })
(lib.mkIf ai-tooling-enabled { (lib.mkIf ai-tooling-enabled {
}) })
@ -52,67 +52,58 @@ in {
extensions = let extensions = let
extension-pkgs = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version; extension-pkgs = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
in ( in (
( with extension-pkgs.open-vsx;
with extension-pkgs.open-vsx; ( [
[ # vs code feel extensions
# vs code feel extensions ms-vscode.atom-keybindings
ms-vscode.atom-keybindings akamud.vscode-theme-onedark
akamud.vscode-theme-onedark streetsidesoftware.code-spell-checker
streetsidesoftware.code-spell-checker streetsidesoftware.code-spell-checker-german
streetsidesoftware.code-spell-checker-german streetsidesoftware.code-spell-checker-italian
streetsidesoftware.code-spell-checker-italian jeanp413.open-remote-ssh
jeanp413.open-remote-ssh
# html extensions # html extensions
formulahendry.auto-rename-tag formulahendry.auto-rename-tag
ms-vscode.live-server ms-vscode.live-server
# js extensions # js extensions
dsznajder.es7-react-js-snippets dsznajder.es7-react-js-snippets
dbaeumer.vscode-eslint dbaeumer.vscode-eslint
standard.vscode-standard standard.vscode-standard
orta.vscode-jest orta.vscode-jest
stylelint.vscode-stylelint stylelint.vscode-stylelint
tauri-apps.tauri-vscode tauri-apps.tauri-vscode
# go extensions # go extensions
golang.go golang.go
# astro blog extensions # astro blog extensions
astro-build.astro-vscode astro-build.astro-vscode
unifiedjs.vscode-mdx unifiedjs.vscode-mdx
# misc extensions # misc extensions
tamasfe.even-better-toml tamasfe.even-better-toml
] ]
++ (lib.lists.optionals nix-development-enabled [ ++ (lib.lists.optionals nix-development-enabled [
# nix extensions # nix extensions
pinage404.nix-extension-pack pinage404.nix-extension-pack
jnoortheen.nix-ide jnoortheen.nix-ide
kamadorueda.alejandra kamadorueda.alejandra
]) ])
) ++ (
) with extension-pkgs.vscode-marketplace;
++ ( [
with extension-pkgs.vscode-marketplace; ( # js extensions
[ karyfoundation.nearley
# js extensions
karyfoundation.nearley
]
++ (lib.lists.optionals ai-tooling-enabled [
])
)
)
++ (
with pkgs.codium-extensions; (
[]
++ (
lib.lists.optionals ai-tooling-enabled [
ai-code
] ]
) ++ (lib.lists.optionals ai-tooling-enabled [
])
)
++ (
with pkgs.codium-extensions; [
ai-code
]
) )
)
); );
}; };
}; };

75
configurations/home-manager/leyla/packages/vscode/user-words.nix
View file

@ -1,69 +1,6 @@
{...}: { [
config.programs.vscode.profiles.default.userSettings = { "leyla"
"cSpell.userWords" = [ "webdav"
"leyla" "ollama"
"ollama" "optimise"
"webdav" ]
"pname"
"direnv"
"deepseek"
"qwen"
"syncthing"
"immich"
"sonos"
"makemkv"
"hass"
"qbittorent"
"prostudiomasters"
"tmpfiles"
"networkmanager"
"Networkd"
"networkmanager"
"dialout"
"adbusers"
"protonmail"
"authkey"
"netdevs"
"atomix"
"geary"
"gedit"
"hitori"
"iagno"
"alsa"
"timezoned"
"pipewire"
"pulseaudio"
"rtkit"
"disko"
"ashift"
"autotrim"
"canmount"
"mountpoint"
"xattr"
"acltype"
"relatime"
"keyformat"
"keylocation"
"vdevs"
# codium extensions
"akamud"
"onedark"
"jeanp"
"dsznajder"
"dbaeumer"
"orta"
"tauri"
"unifiedjs"
"tamasfe"
"pinage"
"jnoortheen"
"kamadorueda"
"karyfoundation"
"nearley"
# nix.optimise is spelled wrong
"optimise"
];
};
}

2
configurations/nixos/defiant/configuration.nix
View file

@ -201,7 +201,7 @@
autoSnapshot.enable = true; autoSnapshot.enable = true;
}; };
# temp enable desktop environment for setup # temp enable desktop enviroment for setup
# Enable the X11 windowing system. # Enable the X11 windowing system.
xserver.enable = true; xserver.enable = true;

2
modules/nixos-modules/desktop.nix
View file

@ -22,7 +22,7 @@
gnome-characters # character set viewer gnome-characters # character set viewer
gnome-music # music player gnome-music # music player
gnome-photos # photo viewer gnome-photos # photo viewer
gnome-logs # log viewer gnome-logs # log viwer
gnome-maps # map viewer gnome-maps # map viewer
gnome-tour # welcome tour gnome-tour # welcome tour
hitori # sudoku game hitori # sudoku game

16
modules/nixos-modules/users.nix
View file

@ -17,6 +17,7 @@
eve = 1002; eve = 1002;
jellyfin = 2000; jellyfin = 2000;
forgejo = 2002; forgejo = 2002;
adguardhome = 2003;
hass = 2004; hass = 2004;
syncthing = 2007; syncthing = 2007;
ollama = 2008; ollama = 2008;
@ -33,6 +34,7 @@
jellyfin_media = 2001; jellyfin_media = 2001;
jellyfin = 2000; jellyfin = 2000;
forgejo = 2002; forgejo = 2002;
adguardhome = 2003;
hass = 2004; hass = 2004;
syncthing = 2007; syncthing = 2007;
ollama = 2008; ollama = 2008;
@ -127,6 +129,12 @@ in {
group = config.users.users.forgejo.name; group = config.users.users.forgejo.name;
}; };
adguardhome = {
uid = lib.mkForce uids.adguardhome;
isSystemUser = true;
group = config.users.users.adguardhome.name;
};
hass = { hass = {
uid = lib.mkForce uids.hass; uid = lib.mkForce uids.hass;
isSystemUser = true; isSystemUser = true;
@ -219,6 +227,14 @@ in {
]; ];
}; };
adguardhome = {
gid = lib.mkForce gids.adguardhome;
members = [
users.adguardhome.name
# leyla
];
};
hass = { hass = {
gid = lib.mkForce gids.hass; gid = lib.mkForce gids.hass;
members = [ members = [