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

Compare commits

..

No commits in common. "10b812fd99b1091615accebeb5d7d4350e16558f" and "76240be5ec80ddcafd249d6874fc29bf430f5509" have entirely different histories.

6 changed files with 16 additions and 62 deletions

30
flake.lock generated
View File

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

View File

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

View File

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

View File

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

View File

@ -1,41 +0,0 @@
{
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";
mode = "3840x2160";
#dpi = 288;
dpi = 192;
dpi = 96;
};
DP-2 = {
enable = true;