Jan
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Jan:c6cd3018db6adf017dd7516d270fb5ae20eeeed8
Branches Tags
Jan:main
..
compare: Jan:036f6196731c75aeff147bf20d544e7e42177248
Branches Tags
Jan:main

No commits in common. "c6cd3018db6adf017dd7516d270fb5ae20eeeed8" and "036f6196731c75aeff147bf20d544e7e42177248" have entirely different histories.
c6cd3018db ... 036f619673

4 changed files with 19 additions and 41 deletions
Show Stats Expand all files Collapse all files

30
flake.lock
View File

@ -385,11 +385,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739790043, "lastModified": 1739458725,
"narHash": "sha256-4gK4zdNDQ4PyGFs7B6zp9iPIBy9E+bVJiZ0XAmncvgQ=", "narHash": "sha256-k9AeUzs3phaTgfljRslR4iNTX9svBNhxoIw4QLd/V70=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c1ea92cdfb85bd7b0995b550581d9fd1c3370bf9", "rev": "22b418c13fb0be43f4bc5c185f323a3237028594",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -497,11 +497,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739718118, "lastModified": 1739458916,
"narHash": "sha256-ZRO+3o8g3gjgA0gIfp08ygy++IhQsmfU7afxnJwEV6o=", "narHash": "sha256-J1tAJ0hAeUaP9T1DDrqA5JCPXEKW/rPnkLgHmu0cUlA=",
"owner": "doronbehar", "owner": "doronbehar",
"repo": "nix-matlab", "repo": "nix-matlab",
"rev": "b0a43e3c5cac996d646596a338e38632936d96bc", "rev": "3ca3c00572f7da3018b8955a285b50e44949394f",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -512,11 +512,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1739698114, "lastModified": 1739419412,
"narHash": "sha256-8S9n69Dnpg8DhfFlP0YvMGmSOY2X4kImGSPWXYNpaHM=", "narHash": "sha256-NCWZQg4DbYVFWg+MOFrxWRaVsLA7yvRWAf6o0xPR1hI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b1b43d32be000928cc71250ed77f4a0a5f2bc23a", "rev": "2d55b4c1531187926c2a423f6940b3b1301399b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -571,11 +571,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1739751913, "lastModified": 1739353096,
"narHash": "sha256-H72wNdLOl9CzfimXjDdKWnV0Mr8lpVF4m3HZ2m+fuck=", "narHash": "sha256-w/T2uYCoq4k6K46GX2CMGWsKfMvcqnxC41LIgnvGifE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "3a66c8a33001d8bd79388c6b15eb1039f43f4192", "rev": "78b6f8e1e5b37a7789216e17a96ebc117660f0e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -593,11 +593,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1739792859, "lastModified": 1739464528,
"narHash": "sha256-Em/PKyBgW5xWjEE7u2P+aAeH3TrQpPyHJdYY5zHvv64=", "narHash": "sha256-zSEfwiIsrqMSi6wocIQ0h5y23gbyLABuMyXdDzfzUZI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "2320814fdba2500856c915569f39cc90ea562685", "rev": "1643a8a0acf93d6e8fd79b01bb2e53d84fae48c8",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View File

@ -33,16 +33,14 @@
}: }:
let let
mkConfig = mkConfig =
system: machineConfig: userConfig: machineConfig: userConfig:
(nixpkgs.lib.nixosSystem { (nixpkgs.lib.nixosSystem {
inherit system; system = "x86_64-linux";
specialArgs = { inherit system; };
modules = [ modules = [
machineConfig machineConfig
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
machine.users = userConfig; machine.users = userConfig;
home-manager.extraSpecialArgs = { inherit system; };
home-manager.sharedModules = [ home-manager.sharedModules = [
stylix.homeManagerModules.stylix stylix.homeManagerModules.stylix
nixvim.homeManagerModules.nixvim nixvim.homeManagerModules.nixvim
@ -59,7 +57,7 @@
in in
{ {
nixosConfigurations = { nixosConfigurations = {
"20212060" = mkConfig "x86_64-linux" ./machines/laptop.nix { "20212060" = mkConfig ./machines/laptop.nix {
jan = { jan = {
sudo = true; sudo = true;
configuration = ./users/jan.nix; configuration = ./users/jan.nix;

20
user-modules/gaming/launchers/es-de.nix
View File

@ -2,7 +2,6 @@
lib, lib,
config, config,
pkgs, pkgs,
system,
... ...
}: }:
@ -23,24 +22,5 @@ in
home.sessionVariables = { home.sessionVariables = {
ESDE_APPDATA_DIR = "$HOME/.config/ES-DE"; ESDE_APPDATA_DIR = "$HOME/.config/ES-DE";
}; };
# TODO: Remove exception once no longer required by es-de
nixpkgs.config.permittedInsecurePackages = [
"freeimage-unstable-2021-11-01"
];
# TODO: Remove once emulationstation-de fixes the issue
nixpkgs.overlays =
let
pkgs-stable = import (fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/nixos-24.11.tar.gz";
sha256 = "0pbvwix9vjkdan1nxxzqfg2yap28afqf8m2nlw1xkqp5c832bkkz";
}) { inherit system; };
in
[
(final: prev: {
libgit2 = pkgs-stable.libgit2;
})
];
}; };
} }

2
users/jan.nix
View File

@ -66,7 +66,7 @@
# Gaming # Gaming
steam.enable = true; steam.enable = true;
modrinth.enable = true; modrinth.enable = true;
es-de.enable = true; es-de.enable = false;
retroarch.enable = true; retroarch.enable = true;
ryujinx.enable = true; ryujinx.enable = true;