fix desktop config
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
{ pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
folder = ./cachix;
|
||||
folder = ../cachix;
|
||||
toImport = name: value: folder + ("/" + name);
|
||||
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
|
||||
imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
|
||||
|
||||
30
flake.lock
generated
30
flake.lock
generated
@@ -173,11 +173,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708031129,
|
||||
"narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=",
|
||||
"lastModified": 1708988456,
|
||||
"narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8",
|
||||
"rev": "1d085ea4444d26aa52297758b333b449b2aa6fca",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -188,11 +188,11 @@
|
||||
},
|
||||
"impermanence": {
|
||||
"locked": {
|
||||
"lastModified": 1706639736,
|
||||
"narHash": "sha256-CaG4j9+UwBDfinxxvJMo6yOonSmSo0ZgnbD7aj2Put0=",
|
||||
"lastModified": 1708968331,
|
||||
"narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=",
|
||||
"owner": "nix-community",
|
||||
"repo": "impermanence",
|
||||
"rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045",
|
||||
"rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -250,11 +250,11 @@
|
||||
},
|
||||
"nix-flatpak": {
|
||||
"locked": {
|
||||
"lastModified": 1708268179,
|
||||
"narHash": "sha256-NNVuhf84AeDTxadfSGnFqPHR0ED+QyM2gmu+Wyz6PrY=",
|
||||
"lastModified": 1708781964,
|
||||
"narHash": "sha256-qbEZgB1mNuMADLmM64EtcRjDHXR3UFL4xVmoanv9wZU=",
|
||||
"owner": "gmodena",
|
||||
"repo": "nix-flatpak",
|
||||
"rev": "a243cb0522f6240c194b873dde68e25370b06034",
|
||||
"rev": "09d07c73b4d9771f527a168e0b1b6d8a1f39de28",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -265,11 +265,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1708091350,
|
||||
"narHash": "sha256-o28BJYi68qqvHipT7V2jkWxDiMS1LF9nxUsou+eFUPQ=",
|
||||
"lastModified": 1708594753,
|
||||
"narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "106d3fec43bcea19cb2e061ca02531d54b542ce3",
|
||||
"rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -329,11 +329,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1708118438,
|
||||
"narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
|
||||
"lastModified": 1708984720,
|
||||
"narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
|
||||
"rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -22,7 +22,7 @@ in
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
../../cachix/cachix.nix
|
||||
# ../../cachix/cachix.nix
|
||||
../default.nix
|
||||
];
|
||||
|
||||
@@ -126,6 +126,10 @@ in
|
||||
'';
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "NetworkManager.target" ];
|
||||
serviceConfig = {
|
||||
Type="oneshot";
|
||||
RemainAfterExit=true;
|
||||
};
|
||||
};
|
||||
|
||||
# Networking configs
|
||||
@@ -219,17 +223,20 @@ in
|
||||
mangohud
|
||||
goverlay
|
||||
heroic
|
||||
python3
|
||||
virt-manager
|
||||
orca-slicer
|
||||
];
|
||||
|
||||
# Force radv
|
||||
variables.AMD_VULKAN_ICD = "RADV";
|
||||
# variables.AMD_VULKAN_ICD = "RADV";
|
||||
};
|
||||
|
||||
# Configure programs
|
||||
programs = {
|
||||
fish.enable = true;
|
||||
java.enable = true;
|
||||
corectrl.enable = true;
|
||||
# corectrl.enable = true;
|
||||
|
||||
# Steam
|
||||
steam = {
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
# dashy
|
||||
virtualisation.oci-containers.containers."dashy" = {
|
||||
autoStart = true;
|
||||
image = " lissy93/dashy:latest";
|
||||
ports = [ "8888:80" ];
|
||||
volumes = [
|
||||
"/mnt/ssd/nix-app-data/dashy/conf.yaml:/app/public/conf.yaml"
|
||||
];
|
||||
environment = {
|
||||
PUID = "911";
|
||||
PGID = "1000";
|
||||
TZ = "America/Chicago";
|
||||
};
|
||||
};
|
||||
}
|
||||
# { config, pkgs, ... }:
|
||||
# {
|
||||
# # dashy
|
||||
# virtualisation.oci-containers.containers."dashy" = {
|
||||
# autoStart = true;
|
||||
# image = " lissy93/dashy:latest";
|
||||
# ports = [ "8888:80" ];
|
||||
# volumes = [
|
||||
# "/mnt/ssd/nix-app-data/dashy/conf.yaml:/app/public/conf.yaml"
|
||||
# ];
|
||||
# environment = {
|
||||
# PUID = "911";
|
||||
# PGID = "1000";
|
||||
# TZ = "America/Chicago";
|
||||
# };
|
||||
# };
|
||||
# }
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
imports = [
|
||||
./samba
|
||||
./apps/collabora
|
||||
./apps/dashy
|
||||
# ./apps/dashy
|
||||
./apps/jellyfin
|
||||
./apps/jellyseerr
|
||||
./apps/mariadb
|
||||
|
||||
Reference in New Issue
Block a user