feat: several changes (add packages, fix syntax, ...)

This commit is contained in:
Xavier Morel
2025-05-18 17:02:53 +02:00
committed by installer
parent 285d96d758
commit 3eefb0e8ce
6 changed files with 207 additions and 10 deletions

83
dev-flakes/flake.lock generated Normal file
View File

@@ -0,0 +1,83 @@
{
"nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1745391562,
"narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs",
"spacetime": "spacetime"
}
},
"spacetime": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1747153592,
"narHash": "sha256-LdqcDLzGzhP6JGdMPw9e/kfLrSYNc6ILZDSze+tEeMk=",
"owner": "mx42",
"repo": "nix_spacetimedb",
"rev": "205f52c60ab71daa92d1f4a667b0f9d915eda513",
"type": "github"
},
"original": {
"owner": "mx42",
"ref": "main",
"repo": "nix_spacetimedb",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

90
dev-flakes/flake.nix Normal file
View File

@@ -0,0 +1,90 @@
{
description = "Python dev shell";
# Flake inputs
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
spacetime = {
url = "github:mx42/nix_spacetimedb/main";
inputs.nixpkgs.follows = "nixpkgs";
};
};
# Flake outputs
outputs =
{
nixpkgs,
spacetime,
...
}:
let
system = "x86_64-linux";
pkgs = import nixpkgs { inherit system; };
spacetimedb = import spacetime { inherit pkgs; };
in
{
devShells.${system} = {
python = pkgs.mkShell {
packages = (
with pkgs;
[
python313
onefetch
uv
ruff
]
);
shellHook = ''
onefetch
uv sync
'';
};
scala = pkgs.mkShell {
packages = (
with pkgs;
[
sbt
coursier
onefetch
openjdk
]
);
shellHook = ''
onefetch
'';
};
docker = pkgs.mkShell {
packages = (
with pkgs;
[
podman
podman-compose
]
);
};
rust = pkgs.mkShell {
packages = (
with pkgs;
[
rustc
rust-analyzer
cargo
lld
pkg-config
openssl
onefetch
]
);
PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig";
shellHook = ''
onefetch
'';
};
spacetime = pkgs.mkShell {
packages = [
spacetimedb
];
};
};
};
}

View File

@@ -306,12 +306,12 @@ bind = ALT, Tab, bringactivetotop
# Example windowrule v2 # Example windowrule v2
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
windowrule = noborder,^(wofi)$ windowrulev2 = noborder,class:^(wofi)$,title:^(wofi)$
windowrule = center,^(wofi)$ windowrulev2 = center,class:^(wofi)$,title:^(wofi)$
windowrule = center,^(steam)$ windowrulev2 = center,class:^(steam)$,title:^(steam)$
windowrule = float, swayimg|vlc|Viewnior|pavucontrol windowrulev2 = float,class:swayimg|vlc|Viewnior|pavucontrol
windowrule = float, nwg-look|qt5ct|mpv windowrulev2 = float,class:nwg-look|qt5ct|mpv
windowrule = float, zoom windowrulev2 = float,class:zoom
# Ignore maximize requests from apps. You'll probably like this. # Ignore maximize requests from apps. You'll probably like this.
windowrulev2 = suppressevent maximize, class:.* windowrulev2 = suppressevent maximize, class:.*

View File

@@ -23,7 +23,10 @@
}@inputs: }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = import nixpkgs {
system = system;
config.allowUnfree = true;
};
in in
{ {
nixosConfigurations = { nixosConfigurations = {

View File

@@ -63,7 +63,10 @@
"nix-command" "nix-command"
"flakes" "flakes"
]; ];
trusted-users = [ "root" "yoru" ]; trusted-users = [
"root"
"yoru"
];
}; };
gc = { gc = {
automatic = true; automatic = true;
@@ -75,7 +78,11 @@
extra-substituters = https://devenv.cachix.org extra-substituters = https://devenv.cachix.org
extra-trusted-public-keys = devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw= extra-trusted-public-keys = devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=
''; '';
};
nixpkgs.config = {
allowUnfree = true;
allowBroken = true;
}; };
time.timeZone = "Europe/Paris"; time.timeZone = "Europe/Paris";
@@ -145,6 +152,15 @@
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
}; };
firefly-iii-data-importer = {
enable = true;
enableNginx = true;
settings = {
FIREFLY_III_URL_FILE = "/home/yoru/.firefly-url.txt";
VANITY_URL_FILE = "/home/yoru/.firefly-vanity-url.txt";
FIREFLY_III_CLIENT_ID = 2;
};
};
# my modules # my modules
cli-environment.enable = true; cli-environment.enable = true;
desktop-apps.enable = true; desktop-apps.enable = true;
@@ -164,6 +180,7 @@
"scanner" "scanner"
"lp" "lp"
"docker" "docker"
"cdrom"
]; ];
}; };
home-manager = { home-manager = {
@@ -172,7 +189,6 @@
"yoru" = import ./home.nix; "yoru" = import ./home.nix;
}; };
}; };
nixpkgs.config.allowUnfree = true;
stylix = { stylix = {
enable = true; enable = true;

View File

@@ -33,12 +33,17 @@ in
obs-studio obs-studio
prusa-slicer prusa-slicer
openscad openscad
ungoogled-chromium
inkscape
rawtherapee
godot_4 godot_4
gdtoolkit_4 gdtoolkit_4
sfxr sfxr
lmms lmms
audacity audacity
handbrake
vlc
]; ];
programs = { programs = {
firefox.enable = true; firefox.enable = true;