Grimmauld/grimm-nixos-laptop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

split out python tooling, update flake, assign libre office types

Browse source
This commit is contained in:
LordGrimmauld 2024-04-28 19:43:56 +02:00
parent 3171f92588
commit cd69ae9f66
8 changed files with 152 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/laptop_hardware.nix
View file

@ -20,7 +20,7 @@ in
# services.ddccontrol.enable = true; # services.ddccontrol.enable = true;
powerManagement.scsiLinkPolicy = lib.mkIf (!config.services.tlp.enable) "min_power"; powerManagement.scsiLinkPolicy = lib.mkIf (!config.services.tlp.enable) "min_power";
hardware.i2c.enable = true; hardware.i2c.enable = true;
services.xserver.libinput.enable = true; services.libinput.enable = true;
powerManagement.cpuFreqGovernor = lib.mkDefault "normal"; powerManagement.cpuFreqGovernor = lib.mkDefault "normal";
services.udev.extraRules = '' services.udev.extraRules = ''

26
common/tooling/default.nix
View file

@ -6,6 +6,8 @@ in
imports = [ imports = [
./lilypond.nix ./lilypond.nix
./nix.nix ./nix.nix
./security.nix
./python.nix
]; ];
config = with cfg; lib.mkIf (enable && tooling.enable) { config = with cfg; lib.mkIf (enable && tooling.enable) {
@ -16,7 +18,6 @@ in
gcc gcc
jdk17 jdk17
python3
pkg-config pkg-config
unzip unzip
p7zip p7zip
@ -30,7 +31,6 @@ in
ranger ranger
wget wget
file file
pypy3
util-linux util-linux
visualvm visualvm
imagemagick imagemagick
@ -48,14 +48,8 @@ in
glxinfo glxinfo
alacritty alacritty
vulkan-tools vulkan-tools
pdfarranger
nomacs
gparted gparted
zathura
imhex
libreoffice-qt
filezilla
obsidian
thunderbird thunderbird
]; ];
@ -115,18 +109,6 @@ in
}; };
}; };
programs.xonsh = {
enable = true;
package = pkgs.xonsh.override {
extraPackages = ps: with ps; [
requests
matplotlib
numpy
scipy
pygobject3
];
};
};
programs.ssh.startAgent = true; programs.ssh.startAgent = true;
programs.thefuck.enable = true; programs.thefuck.enable = true;
}; };
@ -148,8 +130,6 @@ in
}; };
}; };
pass = lib.mkEnableOption "Enables password-store, gnupg and such secret handling";
git_user = mkOption { git_user = mkOption {
type = types.str; type = types.str;
default = "Grimmauld"; default = "Grimmauld";

27
common/tooling/python.nix Normal file
View file

@ -0,0 +1,27 @@
{ pkgs, config, lib, ... }:
let
cfg = config.grimmShared;
in
{
config = with cfg; lib.mkIf (enable && tooling.enable) {
environment.systemPackages = with pkgs; [
python3
pypy3
] ++ lib.optionals cfg.graphical [
jetbrains.pycharm-community
];
programs.xonsh = {
enable = true;
package = pkgs.xonsh.override {
extraPackages = ps: with ps; [
requests
matplotlib
numpy
scipy
pygobject3
];
};
};
};
}

2
common/security.nix → common/tooling/security.nix
View file

@ -37,4 +37,6 @@ in
enable = true; enable = true;
}; };
}; };
options.grimmShared.tooling.pass = lib.mkEnableOption "Enables password-store, gnupg and such secret handling";
} }

47
common/xdg/mime.nix
View file

@ -29,11 +29,31 @@ let
"org.freecadweb.FreeCAD.desktop" "org.freecadweb.FreeCAD.desktop"
"PrusaSlicer.desktop" "PrusaSlicer.desktop"
"openscad.desktop" "openscad.desktop"
"blender.desktop"
]; ];
tex_editors = [ ] ++ text_editors; tex_editors = [ ] ++ text_editors;
in in
{ {
config = with cfg; lib.mkIf (enable && portals && graphical) { config = with cfg; lib.mkIf (enable && portals && graphical) {
environment.systemPackages = with pkgs; [
zathura
imhex
libreoffice-qt
filezilla
obsidian
nomacs
pdfarranger
geany
krita
weasis
kicad
prusa-slicer
freecad
openscad
vlc
blender
];
xdg.mime.enable = true; xdg.mime.enable = true;
xdg.mime.addedAssociations = { xdg.mime.addedAssociations = {
"application/java-vm" = [ "application/java-vm" = [
@ -59,6 +79,7 @@ in
"image/vnd.dwg" = cad; "image/vnd.dwg" = cad;
"model/*" = cad; "model/*" = cad;
"gcode" = [ "gcode" = [
"PrusaGcodeviewer.desktop"
"PrusaSlicer.desktop" "PrusaSlicer.desktop"
]; ];
"audio/*" = audio_players; "audio/*" = audio_players;
@ -71,6 +92,32 @@ in
"text/x-c" = [ "clion.desktop" ] ++ text_editors; "text/x-c" = [ "clion.desktop" ] ++ text_editors;
"text/x-java-source" = [ "idea-community.desktop" ] ++ text_editors; "text/x-java-source" = [ "idea-community.desktop" ] ++ text_editors;
"video/*" = video_viewers; "video/*" = video_viewers;
"application/vnd.oasis.opendocument.chart" = "calc.desktop";
"application/vnd.oasis.opendocument.chart-template" = "calc.desktop";
"application/vnd.oasis.opendocument.database" = "base.desktop";
"application/vnd.oasis.opendocument.formula" = "math.desktop";
"application/vnd.oasis.opendocument.formula-template" = "math.desktop";
"application/vnd.oasis.opendocument.graphics" = "draw.desktop";
"application/vnd.oasis.opendocument.graphics-template" = "draw.desktop";
"application/vnd.oasis.opendocument.image" = "draw.desktop";
"application/vnd.oasis.opendocument.image-template" = "draw.desktop";
"application/vnd.oasis.opendocument.presentation" = "impress.desktop";
"application/vnd.oasis.opendocument.presentation-template" = "impress.desktop";
"application/vnd.oasis.opendocument.spreadsheet" = "calc.desktop";
"application/vnd.oasis.opendocument.spreadsheet-template" = "calc.desktop";
"application/vnd.oasis.opendocument.text" = "writer.desktop";
"application/vnd.oasis.opendocument.text-master" = "writer.desktop";
"application/vnd.oasis.opendocument.text-template" = "writer.desktop";
"application/vnd.oasis.opendocument.text-web" = "writer.desktop";
"application/vnd.openxmlformats-officedocument.presentationml.presentation" = "impress.desktop";
"application/vnd.openxmlformats-officedocument.presentationml.slide" = "impress.desktop";
"application/vnd.openxmlformats-officedocument.presentationml.slideshow" = "impress.desktop";
"application/vnd.openxmlformats-officedocument.presentationml.template" = "impress.desktop";
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" = "calc.desktop";
"application/vnd.openxmlformats-officedocument.spreadsheetml.template" = "calc.desktop";
"application/vnd.openxmlformats-officedocument.wordprocessingml.document" = "writer.desktop";
"application/vnd.openxmlformats-officedocument.wordprocessingml.template" = "writer.desktop";
}; };
}; };
} }

97
flake.lock
View file

@ -10,11 +10,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1712079060, "lastModified": 1714136352,
"narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", "narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "1381a759b205dff7a6818733118d02253340fd5e", "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -78,11 +78,11 @@
"yafas": "yafas" "yafas": "yafas"
}, },
"locked": { "locked": {
"lastModified": 1714043270, "lastModified": 1714227479,
"narHash": "sha256-WTpyfCMHEaGWLKQR0rVTXwxFnGzyC8VYwHYVsOTdf1Q=", "narHash": "sha256-TJsEB9sKK6hMhKGXEeqD6Hz1vvgfwuNNwwt4UmyxHvQ=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "7705ea7bb501453ffb1f085b4ddbdc606f5463f8", "rev": "11b4acecf7aa41e4b3fcb34a985fe0477da4347c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,12 +106,29 @@
"url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz"
} }
}, },
"complement": {
"flake": false,
"locked": {
"lastModified": 1713458251,
"narHash": "sha256-hom/Lt0gZzLWqFhUJG0X2i88CAMIILInO5w0tPj6G3s=",
"owner": "matrix-org",
"repo": "complement",
"rev": "d73c81a091604b0fc5b6b0617dcac58c25763f57",
"type": "github"
},
"original": {
"owner": "matrix-org",
"repo": "complement",
"type": "github"
}
},
"conduit": { "conduit": {
"inputs": { "inputs": {
"attic": [ "attic": [
"chaotic", "chaotic",
"attic" "attic"
], ],
"complement": "complement",
"crane": [ "crane": [
"chaotic", "chaotic",
"crane" "crane"
@ -135,14 +152,15 @@
"nixpkgs": [ "nixpkgs": [
"chaotic", "chaotic",
"nixpkgs" "nixpkgs"
] ],
"rocksdb": "rocksdb"
}, },
"locked": { "locked": {
"lastModified": 1713379868, "lastModified": 1714111420,
"narHash": "sha256-L/QhOkRmzB/gmwrWrqxct/sD6XIL4AOGguRhb4ahO/8=", "narHash": "sha256-ax+Z3K9y2N43C/+1gwyTbtXKHuWYY1NYN+tV5NcJ+zI=",
"owner": "girlbossceo", "owner": "girlbossceo",
"repo": "conduwuit", "repo": "conduwuit",
"rev": "d0a9666a2976b983daf72eb0c0f8d41c04443f84", "rev": "341bafb91e77cd95775d9cfa4f0810309889b176",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -364,11 +382,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713682182, "lastModified": 1714203603,
"narHash": "sha256-2RSqVmQMFmn6OjQ21SXnWC+HuSeqDLWLftRv/ZhEDZE=", "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4cec20dbf5c0a716115745ae32531e34816ecbbe", "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -386,11 +404,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713606448, "lastModified": 1714022840,
"narHash": "sha256-JMKo6uoAcUip9N10a3r1T2IoLz+pUStwIFrsVW/R4MA=", "narHash": "sha256-i6xZsf7Kvp1n/Sn3nqPY1MJQx0gf80OGQw32PA/aZd8=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "96cbbcd3712a0cb7f128c54b21ec2af0950d88d0", "rev": "94def3af1d45fe4b142beda3aa59a6a98e62ce9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -412,11 +430,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1713647546, "lastModified": 1714146712,
"narHash": "sha256-oiLxCGkICL2LXHZV6hhm3858JC/+6oANV5guVaRM6Wg=", "narHash": "sha256-8cdUq1XHTQ2CXSDGQMs0WOtB3eB469RK4iLpgUtQIZQ=",
"owner": "martinvonz", "owner": "martinvonz",
"repo": "jj", "repo": "jj",
"rev": "77eaf67f96c6ea438e2dd1a5636f34b6a321e6be", "rev": "6752402113445d2cbad66b56ab06094a7fff84d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -449,11 +467,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713620717, "lastModified": 1714068652,
"narHash": "sha256-YuYowUw5ecPa78bhT72zY2b99wn68mO3vVkop8hnb8M=", "narHash": "sha256-/5aMM42kNfiIMKKjipBlXVpR/2SGyziA1/lh40sYr9k=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "6a80078259ca3e3854b0748a15e98c7293d0822a", "rev": "8d99e3c015fe210acf0e67fa62335688f5e3df15",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -485,11 +503,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714093995, "lastModified": 1714303849,
"narHash": "sha256-7oYv0EJ2iqL9MZiB7QRE63nHDVMuyTgukgYZDdjL8Kg=", "narHash": "sha256-o/IgiwA0ZS/nMh5YB0bt+ae3Lt+tlbQouY/xL7tB5h0=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "a8c2a0e160e1212c67724aa89a823b55d423d157", "rev": "dbb96ae98e723128cf5a612480ba6187113f5e49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -544,11 +562,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1714076141, "lastModified": 1714253743,
"narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -594,11 +612,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1713995372, "lastModified": 1714272655,
"narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", "narHash": "sha256-3/ghIWCve93ngkx5eNPdHIKJP/pMzSr5Wc4rNKE1wOc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", "rev": "12430e43bd9b81a6b4e79e64f87c624ade701eaf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -608,6 +626,23 @@
"type": "github" "type": "github"
} }
}, },
"rocksdb": {
"flake": false,
"locked": {
"lastModified": 1713810944,
"narHash": "sha256-/Xf0bzNJPclH9IP80QNaABfhj4IAR5LycYET18VFCXc=",
"owner": "facebook",
"repo": "rocksdb",
"rev": "6f7cabeac80a3a6150be2c8a8369fcecb107bf43",
"type": "github"
},
"original": {
"owner": "facebook",
"ref": "v9.1.1",
"repo": "rocksdb",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",

1
load_common.nix
View file

@ -16,7 +16,6 @@ with lib;
./common/gaming.nix ./common/gaming.nix
./common/firefox.nix ./common/firefox.nix
./common/cloudsync.nix ./common/cloudsync.nix
./common/security.nix
./common/laptop_hardware.nix ./common/laptop_hardware.nix
]; ];
} }

16
modules/users.nix
View file

@ -27,27 +27,17 @@
]; ];
packages = with pkgs; [ packages = with pkgs; [
geany stable.jetbrains.clion
jetbrains.idea-community
webcord webcord
discord discord
obs-studio obs-studio
kwrited
element-desktop element-desktop
ghidra ghidra
kcalc kcalc
rmview rmview
krita
weasis
kicad
prusa-slicer
freecad
openscad
vlc
arena arena
stable.jetbrains.clion
jetbrains.idea-community
jetbrains.pycharm-community
blender
]; ];
}; };
} }