1
0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-20 09:39:39 +01:00

Compare commits

...

4 Commits

Author SHA1 Message Date
10b812fd99
[stel-xps,nucturne] Add vscodium to progrom subgroup. Add Discord 2024-02-06 16:58:47 +01:00
09452d5cc6
Add vscodium to stel-xps 2024-02-06 16:28:56 +01:00
750922d0b6
flake.lock: Update
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/f994dc5cd9323dc83968049348858ea7e683f424' (2024-02-04)
  → 'github:nix-community/emacs-overlay/5106217a5b0652bcd8f24ebf955aed45d2e7c2ad' (2024-02-06)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/25e3d4c0d3591c99929b1ec07883177f6ea70c9d' (2024-02-01)
  → 'github:NixOS/nixpkgs/9f2ee8c91ac42da3ae6c6a1d21555f283458247e' (2024-02-05)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/83e571bb291161682b9c3ccd48318f115143a550' (2024-02-02)
  → 'github:NixOS/nixos-hardware/6e5cc385fc8cf5ca6495d70243074ccdea9f64c7' (2024-02-06)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/25e3d4c0d3591c99929b1ec07883177f6ea70c9d' (2024-02-01)
  → 'github:NixOS/nixpkgs/9f2ee8c91ac42da3ae6c6a1d21555f283458247e' (2024-02-05)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/b8b232ae7b8b144397fdb12d20f592e5e7c1a64d' (2024-01-31)
  → 'github:NixOS/nixpkgs/faf912b086576fd1a15fca610166c98d47bc667e' (2024-02-05)
2024-02-06 12:54:05 +01:00
da29acb0b7
Change notebook dpi to 192
Signed-off-by: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
2024-02-06 12:53:20 +01:00
6 changed files with 62 additions and 16 deletions

30
flake.lock generated
View File

@ -73,11 +73,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1707037587, "lastModified": 1707210421,
"narHash": "sha256-MtDvvuA1dLek+jEcpFhiNo1BIEKTiFffNN+fwR5y/XI=", "narHash": "sha256-1NJiNd9v4CVX0lABmupY2mjnh/v+iDGrKHNuFaqBP/k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "f994dc5cd9323dc83968049348858ea7e683f424", "rev": "5106217a5b0652bcd8f24ebf955aed45d2e7c2ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -291,11 +291,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1706834982, "lastModified": 1707211557,
"narHash": "sha256-3CfxA7gZ+DVv/N9Pvw61bV5Oe/mWfxYPyVQGqp9TMJA=", "narHash": "sha256-LTKTzZ6fM5j8XWXf51IMBzDaOaJg9kYWLUZxoIhzRN8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "83e571bb291161682b9c3ccd48318f115143a550", "rev": "6e5cc385fc8cf5ca6495d70243074ccdea9f64c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -369,11 +369,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1706826059, "lastModified": 1707091808,
"narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=", "narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d", "rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -401,11 +401,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1706732774, "lastModified": 1707092692,
"narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", "rev": "faf912b086576fd1a15fca610166c98d47bc667e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -417,11 +417,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1706826059, "lastModified": 1707091808,
"narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=", "narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d", "rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -89,6 +89,7 @@
channelsConfig = { channelsConfig = {
allowUnfreePredicate = pkg: allowUnfreePredicate = pkg:
builtins.elem (extended-lib.getName pkg) [ builtins.elem (extended-lib.getName pkg) [
"discord"
"slack" "slack"
"steam" "steam"
"steam-original" "steam-original"

View File

@ -8,6 +8,7 @@
onlyoffice-bin onlyoffice-bin
krita # drawing tool for my wacom krita # drawing tool for my wacom
slack slack
discord
]; ];
programs = { programs = {
@ -26,6 +27,7 @@
emacs.enable = true; emacs.enable = true;
obsstudio.enable = true; obsstudio.enable = true;
python.enable = true; python.enable = true;
vscodium.enable = true;
}; };
texlive.enable = true; texlive.enable = true;

View File

@ -8,6 +8,7 @@
libreoffice-fresh libreoffice-fresh
onlyoffice-bin onlyoffice-bin
slack slack
discord
]; ];
programs = { programs = {
@ -29,6 +30,7 @@
emacs.enable = true; emacs.enable = true;
obsstudio.enable = true; obsstudio.enable = true;
python.enable = true; python.enable = true;
vscodium.enable = true;
}; };
texlive.enable = true; texlive.enable = true;

41
modules/vscodium.nix Normal file
View File

@ -0,0 +1,41 @@
{
config,
lib,
pkgs,
...
}:
with lib; {
options.elss.programs.vscodium.enable = mkEnableOption "Configure VSCodium with needed extensions";
config = let
cfg = config.elss.programs.vscodium;
in
mkIf cfg.enable {
environment.systemPackages = with pkgs; [
(vscode-with-extensions.override {
vscode = vscodium;
vscodeExtensions = with vscode-extensions;
[
mkhl.direnv
vadimcn.vscode-lldb
rust-lang.rust-analyzer
serayuzgur.crates
tamasfe.even-better-toml
yzhang.markdown-all-in-one
bbenoist.nix
redhat.vscode-yaml
ms-python.python
ms-azuretools.vscode-docker
]
++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
{
name = "vscode-rustfmt";
publisher = "statiolake";
version = "0.1.2";
sha256 = "8caLIaURug+7tclziywtKh86sKAMYHNO5oEPIwvp+U4=";
}
];
})
];
};
}

View File

@ -54,7 +54,7 @@ with lib; {
position = "3840x0"; position = "3840x0";
mode = "3840x2160"; mode = "3840x2160";
#dpi = 288; #dpi = 288;
dpi = 96; dpi = 192;
}; };
DP-2 = { DP-2 = {
enable = true; enable = true;