This commit is contained in:
Matt Nish-Lapidus 2024-09-30 00:55:41 -04:00
parent 26e096f020
commit 6527333226
3 changed files with 23 additions and 83 deletions

75
flake.lock generated
View file

@ -1,44 +1,5 @@
{
"nodes": {
"affinity-nix": {
"inputs": {
"elemental-wine-source": "elemental-wine-source",
"nixpkgs": "nixpkgs",
"winetricks-source": "winetricks-source"
},
"locked": {
"lastModified": 1727655411,
"narHash": "sha256-0JWYShfwtE9hfHOggfbovEVHQeh84xfDE2p0fLXGzl4=",
"owner": "mrshmllow",
"repo": "affinity-nix",
"rev": "d57cc00e0cc09d05652f93df5167d8d165eb7efa",
"type": "github"
},
"original": {
"owner": "mrshmllow",
"repo": "affinity-nix",
"type": "github"
}
},
"elemental-wine-source": {
"flake": false,
"locked": {
"host": "gitlab.winehq.org",
"lastModified": 1693121664,
"narHash": "sha256-eMN4SN8980yteYODN2DQIVNEJMsGQE8OIdPs/7DbvqQ=",
"owner": "ElementalWarrior",
"repo": "wine",
"rev": "c12ed1469948f764817fa17efd2299533cf3fe1c",
"type": "gitlab"
},
"original": {
"host": "gitlab.winehq.org",
"owner": "ElementalWarrior",
"ref": "c12ed1469948f764817fa17efd2299533cf3fe1c",
"repo": "wine",
"type": "gitlab"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -167,50 +128,16 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1727348695,
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"affinity-nix": "affinity-nix",
"home-manager": "home-manager",
"kmonad": "kmonad",
"musnix": "musnix",
"nix-flatpak": "nix-flatpak",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable"
}
},
"winetricks-source": {
"flake": false,
"locked": {
"lastModified": 1704453875,
"narHash": "sha256-YTEgb19aoM54KK8/IjrspoChzVnWAEItDlTxpfpS52w=",
"owner": "winetricks",
"repo": "winetricks",
"rev": "bc91718a5cad45e9f33de9b351a5960d5395bed5",
"type": "github"
},
"original": {
"owner": "winetricks",
"ref": "20240105",
"repo": "winetricks",
"type": "github"
}
}
},
"root": "root",

View file

@ -13,8 +13,6 @@
nix-flatpak.url = "github:gmodena/nix-flatpak"; # unstable branch. Use github:gmodena/nix-flatpak/?ref=<tag> to pin releases.
affinity-nix.url = "github:mrshmllow/affinity-nix";
kmonad = {
url = "git+https://github.com/kmonad/kmonad?submodules=1&dir=nix";
inputs.nixpkgs.follows = "nixpkgs";
@ -26,7 +24,7 @@
};
};
outputs = inputs @ {self, nixpkgs, nixpkgs-stable, home-manager, nix-flatpak, kmonad, musnix, affinity-nix, ... }: {
outputs = inputs @ {self, nixpkgs, nixpkgs-stable, home-manager, nix-flatpak, kmonad, musnix, ... }: {
nixosConfigurations = {
eddie = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
@ -41,9 +39,21 @@
homeConfigurations = {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
"emenel" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
# pkgs = import nixpkgs {
# system = "x86_64-linux"; # whatever your system name is
# config = {
# allowUnfree = true;
# allowUnfreePredicate = _: true;
# };
# };
extraSpecialArgs = { inherit inputs; };
modules = [

View file

@ -1,5 +1,8 @@
{ nix-flatpak, lib, pkgs, inputs, affinity-nix, ... }:
{ nix-flatpak, lib, pkgs, inputs, ... }:
{
nixpkgs.config.allowUnfree = true;
home = {
packages = with pkgs; [
gnupg
@ -18,7 +21,8 @@
ffmpeg
rlwrap
pinentry
unrar
#unrar
gnutar
unzip
zip
htop
@ -97,8 +101,8 @@
protonplus
gnomeExtensions.just-perfection
gnomeExtensions.dash-to-dock
gnomeExtensions.pano
#gnomeExtensions.dash-to-dock
#gnomeExtensions.pano
gnome-software
gnome-tweaks
gnome-photos
@ -163,8 +167,6 @@
guitarix
FIL-plugins
geonkick
inputs.affinity-nix.packages.x86_64-linux.designer
];
username = "emenel";
@ -189,6 +191,7 @@
programs = {
home-manager.enable = true;
direnv = {
enable = true;
#enableFishIntegration = true; # see note on other shells below