stable place
This commit is contained in:
1 parent
f1613955f7
commit
5632f1fbe5
10 files changed
+214
-153
No files matched your search
@@ -0,0 +1,14 @@
|
||||
def rocm-monitor [
|
||||
cacheFile: string = "/tmp/rocm-monitor.jsonl",
|
||||
timeout: duration = 1sec
|
||||
] {
|
||||
if ($cacheFile | path exists) {
|
||||
rm $cacheFile
|
||||
}
|
||||
loop {
|
||||
clear
|
||||
rocm-smi --showmemuse --showuse --json | save --append $cacheFile
|
||||
tail -n1 $cacheFile | from json --objects | flatten | print
|
||||
sleep $timeout
|
||||
}
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
/nix/store/rkwj8mcdsv8gsmw2nlr52cfh3gkb5179-home-manager-files/.config/hypr/hyprland.conf
|
||||
Generated
+50
-50
@@ -54,17 +54,17 @@
|
||||
"base16-fish": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1754405784,
|
||||
"narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
|
||||
"lastModified": 1765809053,
|
||||
"narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
|
||||
"owner": "tomyun",
|
||||
"repo": "base16-fish",
|
||||
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
|
||||
"rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "tomyun",
|
||||
"repo": "base16-fish",
|
||||
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
|
||||
"rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
@@ -110,12 +110,12 @@
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765254444,
|
||||
"narHash": "sha256-kAO/ZeBnjaF+uqOP6qweXlRk2ylocLuv/9Dn8FsuPlU=",
|
||||
"rev": "3ccc0297525e51ac3d7905509e0616c9c8350108",
|
||||
"revCount": 316,
|
||||
"lastModified": 1766177528,
|
||||
"narHash": "sha256-Bl+p766mM7qNCZtMqmTz13RuUbOMKsFa+/vnGYoxgPk=",
|
||||
"rev": "b159c082f0f9bdefa6c386189a13c5fa0734d8d8",
|
||||
"revCount": 317,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.14.0/019b0160-c5de-7941-9c26-cb47bc17eec3/source.tar.gz"
|
||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.15.0/019b3865-57a1-7d80-98c5-962fac29c404/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
@@ -125,37 +125,37 @@
|
||||
"determinate-nixd-aarch64-darwin": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-6PWoqx52nvlWzlElTjcn7KAPKitfcKZYEFSsC3PoEoE=",
|
||||
"narHash": "sha256-vDaEQ5T4eA7kEPREmm68IVWGR6zT0aDL5slZxA6dkSc=",
|
||||
"type": "file",
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/macOS"
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/macOS"
|
||||
},
|
||||
"original": {
|
||||
"type": "file",
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/macOS"
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/macOS"
|
||||
}
|
||||
},
|
||||
"determinate-nixd-aarch64-linux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-b1e25BUPL7Qf0QVbYlfZ/+QiClrP/SHIjMPtA47aOLc=",
|
||||
"narHash": "sha256-Hf4JsIv5G3IR0Q0RHGLSNdmDzFv97sVQQKwzY6A0vV4=",
|
||||
"type": "file",
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/aarch64-linux"
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/aarch64-linux"
|
||||
},
|
||||
"original": {
|
||||
"type": "file",
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/aarch64-linux"
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/aarch64-linux"
|
||||
}
|
||||
},
|
||||
"determinate-nixd-x86_64-linux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-8EI2f8IftPcRFlR6K4+cpIEAVf5UIeMCjHysEtVqDw0=",
|
||||
"narHash": "sha256-J+J4E02XpEl0ZkpzMbUmGCf6S4yk0gYCYmiGzZ058ik=",
|
||||
"type": "file",
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/x86_64-linux"
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/x86_64-linux"
|
||||
},
|
||||
"original": {
|
||||
"type": "file",
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/x86_64-linux"
|
||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/x86_64-linux"
|
||||
}
|
||||
},
|
||||
"firefox-gnome-theme": {
|
||||
@@ -300,11 +300,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765605144,
|
||||
"narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=",
|
||||
"lastModified": 1766292113,
|
||||
"narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "90b62096f099b73043a747348c11dbfcfbdea949",
|
||||
"rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -417,11 +417,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765324959,
|
||||
"narHash": "sha256-Odz0We13yF+cHNeymyy1Xx+1fVg6f/oi8BWQZ+Qwyl4=",
|
||||
"lastModified": 1765891583,
|
||||
"narHash": "sha256-M9tRbYnLx/3d3YwepFu0KvhiZ53i1hX+tLJLNeNYeaQ=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlauncher",
|
||||
"rev": "e380fdc517aacdf93a60a8ac648e88eda5e499cd",
|
||||
"rev": "e50b5e0797915533c81cb95a6c3623541bfb5d7a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -560,12 +560,12 @@
|
||||
"nixpkgs-regression": "nixpkgs-regression"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765252170,
|
||||
"narHash": "sha256-p98D44tYJMgB5Qet5S8cTQFdffk/GmoaGkpQtZ3hqJU=",
|
||||
"rev": "1ddd28880651054346c34009d7bb9de36f1db2c1",
|
||||
"revCount": 23362,
|
||||
"lastModified": 1766174426,
|
||||
"narHash": "sha256-0ZofAQZNgg5nfIKsVb7g4It6ufmIyLtfFRPOf+6WRkk=",
|
||||
"rev": "15d6091194b5b90d292e8d6283db77f09c303b1e",
|
||||
"revCount": 24285,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.14.0/019b0159-8907-7fab-a120-9d287c7e6d2e/source.tar.gz"
|
||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.15.0/019b3854-cca6-7298-a91c-0fd8551a7270/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
@@ -579,11 +579,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765684049,
|
||||
"narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=",
|
||||
"lastModified": 1766038392,
|
||||
"narHash": "sha256-ht/GuKaw5NT3M12xM+mkUtkSBVtzjJ8IHIy6R/ncv9g=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33",
|
||||
"rev": "5fb45ece6129bd7ad8f7310df0ae9c00bae7c562",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -672,12 +672,12 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1765779637,
|
||||
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
|
||||
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
|
||||
"revCount": 912002,
|
||||
"lastModified": 1766309749,
|
||||
"narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
|
||||
"rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
|
||||
"revCount": 914755,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.912002%2Brev-1306659b587dc277866c7b69eb97e5f07864d8c4/019b2463-7b8e-7042-8b7e-490d08a3cd7a/source.tar.gz"
|
||||
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.914755%2Brev-a6531044f6d0bef691ea18d4d4ce44d0daa6e816/019b4613-7276-7c80-8e57-953e4698fb6e/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
@@ -686,12 +686,12 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1764611609,
|
||||
"narHash": "sha256-yU9BNcP0oadUKupw0UKmO9BKDOVIg9NStdJosEbXf8U=",
|
||||
"rev": "8c29968b3a942f2903f90797f9623737c215737c",
|
||||
"revCount": 905078,
|
||||
"lastModified": 1765772535,
|
||||
"narHash": "sha256-aq+dQoaPONOSjtFIBnAXseDm9TUhIbe215TPmkfMYww=",
|
||||
"rev": "09b8fda8959d761445f12b55f380d90375a1d6bb",
|
||||
"revCount": 911985,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.905078%2Brev-8c29968b3a942f2903f90797f9623737c215737c/019add91-3add-7a0d-8a25-9569cbe01efe/source.tar.gz"
|
||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.911985%2Brev-09b8fda8959d761445f12b55f380d90375a1d6bb/019b25ab-7c11-79e0-a0b0-c94d455b7190/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
@@ -716,12 +716,12 @@
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1765762245,
|
||||
"narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=",
|
||||
"rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d",
|
||||
"revCount": 903561,
|
||||
"lastModified": 1766201043,
|
||||
"narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
|
||||
"rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
|
||||
"revCount": 904049,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.903561%2Brev-c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d/019b231b-8461-7fef-af86-fa7662ea16ad/source.tar.gz"
|
||||
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.904049%2Brev-b3aad468604d3e488d627c0b43984eb60e75e782/019b3f6c-8b33-7edb-b858-9979590f270b/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
@@ -788,11 +788,11 @@
|
||||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765802640,
|
||||
"narHash": "sha256-rLGl6MaC4pwGcLJ14sfFb8r5rbvWb6ZRTfztcLJHwIU=",
|
||||
"lastModified": 1766418901,
|
||||
"narHash": "sha256-zaISsfwlVaLTJrUIBJf1Mk83kKLp83bl1VOzf8QVczo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "stylix",
|
||||
"rev": "4e63fa32d8beefd2f222181e8ca8d41eb9a7e153",
|
||||
"rev": "c51431509b7c8dec0cd0369ea3cc20a772c3dba1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -29,17 +29,18 @@
|
||||
};
|
||||
|
||||
outputs =
|
||||
{ self
|
||||
, nixpkgs-unstable
|
||||
, determinate
|
||||
, nixos-hardware
|
||||
, nixpkgs
|
||||
, systems
|
||||
, home-manager
|
||||
, nix-darwin
|
||||
, nix-flatpak
|
||||
, stylix
|
||||
, hyprlauncher
|
||||
{
|
||||
self,
|
||||
nixpkgs-unstable,
|
||||
determinate,
|
||||
nixos-hardware,
|
||||
nixpkgs,
|
||||
systems,
|
||||
home-manager,
|
||||
nix-darwin,
|
||||
nix-flatpak,
|
||||
stylix,
|
||||
hyprlauncher,
|
||||
}:
|
||||
let
|
||||
user = {
|
||||
@@ -65,9 +66,13 @@
|
||||
homeManagerVersion = homeManagerVersion;
|
||||
os = {
|
||||
enable = true;
|
||||
firewall = { enable = false; };
|
||||
firewall = {
|
||||
enable = false;
|
||||
};
|
||||
enableFonts = true;
|
||||
hardware = { enable = false; };
|
||||
hardware = {
|
||||
enable = false;
|
||||
};
|
||||
enablePrometheusExporters = true;
|
||||
containers = {
|
||||
runtime = "docker";
|
||||
@@ -86,19 +91,22 @@
|
||||
stylix
|
||||
;
|
||||
specialArgs = {
|
||||
inputs =
|
||||
{
|
||||
inherit
|
||||
hyprlauncher
|
||||
nixpkgs-unstable;
|
||||
};
|
||||
inherit
|
||||
hyprlauncher
|
||||
nixpkgs-unstable
|
||||
;
|
||||
};
|
||||
};
|
||||
# Libs
|
||||
lib = (import modules/lib.nix ({
|
||||
nixpkgs = nixpkgs;
|
||||
home-manager = home-manager;
|
||||
} // libConfig));
|
||||
lib = (
|
||||
import modules/lib.nix (
|
||||
{
|
||||
nixpkgs = nixpkgs;
|
||||
home-manager = home-manager;
|
||||
}
|
||||
// libConfig
|
||||
)
|
||||
);
|
||||
homelabServices = (
|
||||
(lib.makeHLServices {
|
||||
user = user;
|
||||
@@ -115,26 +123,27 @@
|
||||
{
|
||||
# Dev Setups
|
||||
# -------------
|
||||
devShells =
|
||||
lib.eachSystem (system:
|
||||
let pkgs = nixpkgs.legacyPackages.${system};
|
||||
in
|
||||
{
|
||||
default = pkgs.mkShell {
|
||||
name = "nixos-setup";
|
||||
packages = with pkgs; [
|
||||
nixpkgs-fmt
|
||||
nixd
|
||||
nh
|
||||
];
|
||||
shellHook = ''
|
||||
export PATH=$PATH:$(pwd)/bin
|
||||
'';
|
||||
};
|
||||
});
|
||||
devShells = lib.eachSystem (
|
||||
system:
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in
|
||||
{
|
||||
default = pkgs.mkShell {
|
||||
name = "nixos-setup";
|
||||
packages = with pkgs; [
|
||||
nixpkgs-fmt
|
||||
nixd
|
||||
nh
|
||||
];
|
||||
shellHook = ''
|
||||
export PATH=$PATH:$(pwd)/bin
|
||||
'';
|
||||
};
|
||||
}
|
||||
);
|
||||
lib = lib;
|
||||
formatter =
|
||||
lib.eachSystem (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt);
|
||||
formatter = lib.eachSystem (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt);
|
||||
|
||||
# None-NIXOS LINUX Setups
|
||||
# -------------
|
||||
@@ -157,50 +166,61 @@
|
||||
homeManagerVersion = homeManagerVersion;
|
||||
os = {
|
||||
enable = true;
|
||||
firewall = { enable = false; };
|
||||
firewall = {
|
||||
enable = false;
|
||||
};
|
||||
enableFonts = true;
|
||||
enableNetworking = true;
|
||||
enableSSH = false;
|
||||
hardware = { enable = true; };
|
||||
hardware = {
|
||||
enable = true;
|
||||
};
|
||||
containers = {
|
||||
localDockerRegistries = localDockerRegistries;
|
||||
runtime = "docker";
|
||||
};
|
||||
enablePrometheusExporters = true;
|
||||
};
|
||||
configuration = { ... }: {
|
||||
imports = [
|
||||
nixos-hardware.nixosModules.framework-13-7040-amd
|
||||
(import ./hosts/fwbook.nix {
|
||||
user = user;
|
||||
})
|
||||
];
|
||||
};
|
||||
configuration =
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
nixos-hardware.nixosModules.framework-13-7040-amd
|
||||
(import ./hosts/fwbook.nix {
|
||||
user = user;
|
||||
})
|
||||
];
|
||||
};
|
||||
};
|
||||
# NIXOS Framework Homelab
|
||||
# -------------
|
||||
hl-fws1 = lib.makeHLService {
|
||||
hostName = "hl-fws1";
|
||||
configuration = { ... }: {
|
||||
imports = [
|
||||
nixos-hardware.nixosModules.framework-11th-gen-intel
|
||||
(import (./hosts/hl-fws1.nix) { user = user; })
|
||||
];
|
||||
};
|
||||
configuration =
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
nixos-hardware.nixosModules.framework-11th-gen-intel
|
||||
(import (./hosts/hl-fws1.nix) { user = user; })
|
||||
];
|
||||
};
|
||||
systemStateVersion = "24.05";
|
||||
};
|
||||
# NIXOS Framework Desktop
|
||||
# -------------
|
||||
hl-fwdesk = lib.makeHLService {
|
||||
hostName = "hl-fwdesk";
|
||||
configuration = { ... }: {
|
||||
imports = [
|
||||
nixos-hardware.nixosModules.framework-desktop-amd-ai-max-300-series
|
||||
(import (./hosts/hl-fwdesk.nix) { user = user; })
|
||||
];
|
||||
};
|
||||
configuration =
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
nixos-hardware.nixosModules.framework-desktop-amd-ai-max-300-series
|
||||
(import (./hosts/hl-fwdesk.nix) { user = user; })
|
||||
];
|
||||
};
|
||||
systemStateVersion = "25.05";
|
||||
};
|
||||
} // homelabServices;
|
||||
}
|
||||
// homelabServices;
|
||||
};
|
||||
}
|
||||
+17
-3
@@ -3,6 +3,7 @@
|
||||
pkgs,
|
||||
hyprlauncher,
|
||||
system,
|
||||
nixpkgs-unstable,
|
||||
...
|
||||
}:
|
||||
let
|
||||
@@ -12,6 +13,7 @@ let
|
||||
8000
|
||||
8001
|
||||
];
|
||||
unstable = nixpkgs-unstable.legacyPackages.${system};
|
||||
in
|
||||
{
|
||||
imports = [ ./fwbook.hardware-configuration.nix ];
|
||||
@@ -32,7 +34,7 @@ in
|
||||
};
|
||||
desktop = {
|
||||
enable = true;
|
||||
cosmic.enable = true;
|
||||
cosmic.enable = false;
|
||||
kde.enable = false;
|
||||
crypto.enable = true;
|
||||
gnome.enable = false;
|
||||
@@ -68,7 +70,18 @@ in
|
||||
nssmdns4 = true;
|
||||
};
|
||||
virtualisation.waydroid.enable = true;
|
||||
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
audio.enable = true;
|
||||
pulse.enable = true;
|
||||
jack.enable = true;
|
||||
};
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal
|
||||
];
|
||||
};
|
||||
# Tailscale
|
||||
services.tailscale.enable = true;
|
||||
# Desktop Env
|
||||
@@ -184,6 +197,7 @@ in
|
||||
rpiboot
|
||||
code-cursor-fhs
|
||||
nix-prefetch
|
||||
orca-slicer
|
||||
|
||||
# Run macos apps
|
||||
darling-dmg
|
||||
@@ -198,7 +212,6 @@ in
|
||||
# Work
|
||||
gdk
|
||||
slack
|
||||
google-chrome
|
||||
|
||||
# IPhone Tethering
|
||||
libimobiledevice
|
||||
@@ -252,6 +265,7 @@ in
|
||||
port = 11434;
|
||||
acceleration = "rocm";
|
||||
rocmOverrideGfx = "11.0.2";
|
||||
package = unstable.ollama-rocm;
|
||||
};
|
||||
# # Brother Printer
|
||||
hardware.sane.brscan5.enable = true;
|
||||
|
||||
@@ -2,10 +2,6 @@ function start-windows() {
|
||||
quickemu --vm /mnt/Data/vms/windows-11.conf --display spice --viewer remote-viewer
|
||||
}
|
||||
|
||||
function start-windows-app() {
|
||||
google-chrome-stable --app=https://windows365.microsoft.com/webclient --new-window
|
||||
}
|
||||
|
||||
function clean-file() {
|
||||
grep -v '^\s*#' | grep -v '^$'
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, config
|
||||
, ...
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.skyg.nixos.common.hardware.pipewire;
|
||||
@@ -18,6 +19,7 @@ in
|
||||
wireplumber.enable = true;
|
||||
pulse.enable = true;
|
||||
systemWide = false;
|
||||
socketActivation = true;
|
||||
};
|
||||
services.jack = {
|
||||
alsa.enable = true;
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.skyg.nixos;
|
||||
in
|
||||
@@ -17,8 +22,7 @@ in
|
||||
|
||||
options = {
|
||||
skyg.nixos.desktop = {
|
||||
enable = lib.mkEnableOption
|
||||
"Enable Desktop";
|
||||
enable = lib.mkEnableOption "Enable Desktop";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.desktop.enable {
|
||||
@@ -37,9 +41,6 @@ in
|
||||
terminal-exec.enable = true;
|
||||
portal = {
|
||||
enable = true;
|
||||
extraPortals = [
|
||||
pkgs.kdePackages.xdg-desktop-portal-kde
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.skyg.nixos.desktop.tiler.hyprland;
|
||||
# hypr-plugin-dir = pkgs.symlinkJoin {
|
||||
@@ -13,8 +18,7 @@ in
|
||||
{
|
||||
options = {
|
||||
skyg.nixos.desktop.tiler.hyprland = {
|
||||
enable = lib.mkEnableOption
|
||||
"hyprland";
|
||||
enable = lib.mkEnableOption "hyprland";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
@@ -25,19 +29,19 @@ in
|
||||
xwayland.enable = true;
|
||||
};
|
||||
programs.uwsm.enable = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
hyprls
|
||||
];
|
||||
# environment.systemPackages = with pkgs; [
|
||||
# hyprls
|
||||
# ];
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = with pkgs; [ xdg-desktop-portal-hyprland ];
|
||||
};
|
||||
home-manager.users."${config.skyg.user.name}".wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
plugins = with pkgs; [
|
||||
hyprlandPlugins.hyprexpo
|
||||
hyprlandPlugins.hyprbars
|
||||
];
|
||||
};
|
||||
# home-manager.users."${config.skyg.user.name}".wayland.windowManager.hyprland = {
|
||||
# enable = true;
|
||||
# plugins = with pkgs; [
|
||||
# hyprlandPlugins.hyprexpo
|
||||
# hyprlandPlugins.hyprbars
|
||||
# ];
|
||||
# };
|
||||
};
|
||||
}
|
||||
@@ -1,16 +1,20 @@
|
||||
{ config, lib, pkgs, skygUtils, system, nixpkgs-unstable, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
skygUtils,
|
||||
system,
|
||||
nixpkgs-unstable,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.skyg.nixos.desktop.tiler.niri;
|
||||
# unstable = import nixpkgs-unstable {
|
||||
# inherit system;
|
||||
# config.allowUnfree = true;
|
||||
# };
|
||||
unstable = nixpkgs-unstable.legacyPackages.${system};
|
||||
in
|
||||
{
|
||||
options = {
|
||||
skyg.nixos.desktop.tiler.niri = {
|
||||
enable = lib.mkEnableOption
|
||||
"niri";
|
||||
enable = lib.mkEnableOption "niri";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
@@ -30,6 +34,13 @@ in
|
||||
filePath = "niri";
|
||||
configSource = "/home/${config.skyg.user.name}/nixos-setup/configs";
|
||||
};
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = with pkgs; [
|
||||
xdg-desktop-portal-gtk
|
||||
xdg-desktop-portal-gnome
|
||||
gnome-keyring
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user