Merge branch 'main' of github.com:asosnovsky/nixos-setup

This commit is contained in:
ari committed 2025-12-25 15:30:03 -05:00
commit bf643c6db2
23 files changed
+489 -350

No files matched your search

+14
View File
@@ -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
}
}
File renamed without changes.
+51 -1
View File
@@ -97,7 +97,7 @@ layout {
default-column-width { proportion 0.5; } default-column-width { proportion 0.5; }
focus-ring { focus-ring {
width 4 width 4
active-gradient from="#f00f" to="#0f05" angle=45 in="oklch longer hue" active-gradient from="#ff06" to="#af0f" angle=45 in="oklch longer hue"
inactive-color "#505050" inactive-color "#505050"
} }
border { border {
@@ -163,6 +163,10 @@ window-rule {
match is-active=false match is-active=false
opacity 0.85 opacity 0.85
} }
window-rule {
match is-urgent=true
open-focused true
}
window-rule { window-rule {
match app-id="satty" match app-id="satty"
open-focused true open-focused true
@@ -186,6 +190,20 @@ window-rule {
open-focused true open-focused true
opacity 0.95 opacity 0.95
} }
window-rule {
match app-id=r"Bitwarden"
match app-id="Sparrow"
match title="Bitwarden"
block-out-from "screen-capture"
shadow {
on
}
focus-ring {
width 4
active-color "#f00f"
inactive-color "#f00f"
}
}
// ========================= // =========================
// General Stuff // General Stuff
// ========================= // =========================
@@ -259,3 +277,35 @@ binds {
} }
spawn-at-startup "/home/ari/.config/niri/start-up-script.sh" spawn-at-startup "/home/ari/.config/niri/start-up-script.sh"
recent-windows {
// off
debounce-ms 750
open-delay-ms 150
highlight {
active-color "#999999ff"
urgent-color "#ff9999ff"
padding 30
corner-radius 0
}
previews {
max-height 480
max-scale 0.5
}
binds {
Alt+Tab { next-window; }
Alt+Shift+Tab { previous-window; }
Alt+grave { next-window filter="app-id"; }
Alt+Shift+grave { previous-window filter="app-id"; }
Mod+Tab { next-window; }
Mod+Shift+Tab { previous-window; }
Mod+grave { next-window filter="app-id"; }
Mod+Shift+grave { previous-window filter="app-id"; }
}
}
Generated
+93 -118
View File
@@ -38,11 +38,11 @@
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
}, },
"locked": { "locked": {
"lastModified": 1746562888, "lastModified": 1755819240,
"narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "base16.nix", "repo": "base16.nix",
"rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -54,28 +54,28 @@
"base16-fish": { "base16-fish": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1754405784, "lastModified": 1765809053,
"narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
"owner": "tomyun", "owner": "tomyun",
"repo": "base16-fish", "repo": "base16-fish",
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "tomyun", "owner": "tomyun",
"repo": "base16-fish", "repo": "base16-fish",
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
"type": "github" "type": "github"
} }
}, },
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748408240, "lastModified": 1760703920,
"narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "rev": "d646af9b7d14bff08824538164af99d0c521b185",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -105,21 +105,17 @@
"inputs": { "inputs": {
"determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin",
"determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux",
"determinate-nixd-x86_64-darwin": [
"determinate",
"determinate-nixd-aarch64-darwin"
],
"determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux",
"nix": "nix", "nix": "nix",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1761251546, "lastModified": 1766177528,
"narHash": "sha256-I/TDYHCKui0K62f2cEk2UJf6N9rO/hdsa65kpEJMhSo=", "narHash": "sha256-Bl+p766mM7qNCZtMqmTz13RuUbOMKsFa+/vnGYoxgPk=",
"rev": "70beec406153496943274f59cb2ded76be49fcd7", "rev": "b159c082f0f9bdefa6c386189a13c5fa0734d8d8",
"revCount": 306, "revCount": 317,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.12.0/019a12c8-c95c-7c68-8da4-d8cc92608fbf/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.15.0/019b3865-57a1-7d80-98c5-962fac29c404/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@@ -129,47 +125,47 @@
"determinate-nixd-aarch64-darwin": { "determinate-nixd-aarch64-darwin": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-TORlljq+wwn8XWLoN0giLY15pNiIAXuU0igpIXjLhMY=", "narHash": "sha256-vDaEQ5T4eA7kEPREmm68IVWGR6zT0aDL5slZxA6dkSc=",
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/macOS" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/macOS"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/macOS" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/macOS"
} }
}, },
"determinate-nixd-aarch64-linux": { "determinate-nixd-aarch64-linux": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-1HEvUQcG0mVdEQrEqcLEdB9nHpMNbb39bdNxdvyizqk=", "narHash": "sha256-Hf4JsIv5G3IR0Q0RHGLSNdmDzFv97sVQQKwzY6A0vV4=",
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/aarch64-linux" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/aarch64-linux"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/aarch64-linux" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/aarch64-linux"
} }
}, },
"determinate-nixd-x86_64-linux": { "determinate-nixd-x86_64-linux": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-WrXQbrXVisAdZl/hh49PsErSPHwzks1Vw+O3jarVjDo=", "narHash": "sha256-J+J4E02XpEl0ZkpzMbUmGCf6S4yk0gYCYmiGzZ058ik=",
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/x86_64-linux" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/x86_64-linux"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/x86_64-linux" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/x86_64-linux"
} }
}, },
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748383148, "lastModified": 1764724327,
"narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -223,11 +219,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749398372, "lastModified": 1763759067,
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -281,18 +277,20 @@
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1744584021, "host": "gitlab.gnome.org",
"narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "lastModified": 1764524476,
"narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
"owner": "GNOME", "owner": "GNOME",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
"type": "github" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.gnome.org",
"owner": "GNOME", "owner": "GNOME",
"ref": "48.1", "ref": "gnome-49",
"repo": "gnome-shell", "repo": "gnome-shell",
"type": "github" "type": "gitlab"
} }
}, },
"home-manager": { "home-manager": {
@@ -302,16 +300,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758463745, "lastModified": 1766292113,
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -419,11 +417,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1763819300, "lastModified": 1765891583,
"narHash": "sha256-WBTSRJ0PrVW+zDmTraJFXsAKPrYn01VgXvEtcixIEsQ=", "narHash": "sha256-M9tRbYnLx/3d3YwepFu0KvhiZ53i1hX+tLJLNeNYeaQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlauncher", "repo": "hyprlauncher",
"rev": "53a6b3f2d7f6e3981347ddaaf469b16964287fc2", "rev": "e50b5e0797915533c81cb95a6c3623541bfb5d7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -562,12 +560,12 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1761238235, "lastModified": 1766174426,
"narHash": "sha256-BvEZ31+FQKJz2XH8PTXpJqGZ1eT9bhMQ2wBj2ehBYvM=", "narHash": "sha256-0ZofAQZNgg5nfIKsVb7g4It6ufmIyLtfFRPOf+6WRkk=",
"rev": "9512828397f684d0f732ea76b7631f69a0db34f7", "rev": "15d6091194b5b90d292e8d6283db77f09c303b1e",
"revCount": 23138, "revCount": 24285,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.12.0/019a1277-d4c6-7dca-9d55-ee5165fd0bf6/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": { "original": {
"type": "tarball", "type": "tarball",
@@ -581,11 +579,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761339987, "lastModified": 1766038392,
"narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=", "narHash": "sha256-ht/GuKaw5NT3M12xM+mkUtkSBVtzjJ8IHIy6R/ncv9g=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de", "rev": "5fb45ece6129bd7ad8f7310df0ae9c00bae7c562",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -612,11 +610,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1761933221, "lastModified": 1764440730,
"narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7467f155fcba189eb088a7601f44fbef7688669b", "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -628,12 +626,12 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1755922037, "lastModified": 1761597516,
"narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
"rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
"revCount": 808723, "revCount": 811874,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.808723%2Brev-b1b3291469652d5a2edb0becc4ef0246fff97a7c/0198daf7-011a-7703-95d7-57146e794342/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@@ -674,12 +672,12 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1761672384, "lastModified": 1766309749,
"narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
"rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
"revCount": 886100, "revCount": 914755,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.886100%2Brev-08dacfca559e1d7da38f3cf05f1f45ee9bfd213c/019a329e-32b1-7e68-9599-4784bdd5f623/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": { "original": {
"type": "tarball", "type": "tarball",
@@ -688,12 +686,12 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1760965567, "lastModified": 1765772535,
"narHash": "sha256-0JDOal5P7xzzAibvD0yTE3ptyvoVOAL0rcELmDdtSKg=", "narHash": "sha256-aq+dQoaPONOSjtFIBnAXseDm9TUhIbe215TPmkfMYww=",
"rev": "cb82756ecc37fa623f8cf3e88854f9bf7f64af93", "rev": "09b8fda8959d761445f12b55f380d90375a1d6bb",
"revCount": 880602, "revCount": 911985,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.880602%2Brev-cb82756ecc37fa623f8cf3e88854f9bf7f64af93/019a0545-358b-78f4-97fe-88a7820eac2f/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": { "original": {
"type": "tarball", "type": "tarball",
@@ -718,12 +716,12 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1761597516, "lastModified": 1766201043,
"narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
"rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", "rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
"revCount": 811874, "revCount": 904049,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/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": { "original": {
"type": "tarball", "type": "tarball",
@@ -739,15 +737,14 @@
"nixpkgs": [ "nixpkgs": [
"stylix", "stylix",
"nixpkgs" "nixpkgs"
], ]
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1751320053, "lastModified": 1764773531,
"narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=", "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670", "rev": "1d9616689e98beded059ad0384b9951e967a17fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -791,16 +788,16 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1762295027, "lastModified": 1766418901,
"narHash": "sha256-5z5cGrp9F8g8iyQrM8WkB6pAwP4AaicljKZ15gx+X9Y=", "narHash": "sha256-zaISsfwlVaLTJrUIBJf1Mk83kKLp83bl1VOzf8QVczo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "91b9a270523361268ba6a8772152fde31103869f", "rev": "c51431509b7c8dec0cd0369ea3cc20a772c3dba1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "stylix", "repo": "stylix",
"type": "github" "type": "github"
} }
@@ -886,11 +883,11 @@
"tinted-schemes": { "tinted-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1750770351, "lastModified": 1763914658,
"narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "schemes", "repo": "schemes",
"rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -902,11 +899,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1751159871, "lastModified": 1764465359,
"narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", "rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -918,11 +915,11 @@
"tinted-zed": { "tinted-zed": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1751158968, "lastModified": 1764464512,
"narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-zed", "repo": "base16-zed",
"rev": "86a470d94204f7652b906ab0d378e4231a5b3384", "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -930,28 +927,6 @@
"repo": "base16-zed", "repo": "base16-zed",
"type": "github" "type": "github"
} }
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"stylix",
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",
+87 -67
View File
@@ -11,12 +11,12 @@
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=main"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=main";
# Home manager # Home manager
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# Themes # Themes
stylix = { stylix = {
url = "github:nix-community/stylix/release-25.05"; url = "github:nix-community/stylix/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# Macos # Macos
@@ -29,17 +29,18 @@
}; };
outputs = outputs =
{ self {
, nixpkgs-unstable self,
, determinate nixpkgs-unstable,
, nixos-hardware determinate,
, nixpkgs nixos-hardware,
, systems nixpkgs,
, home-manager systems,
, nix-darwin home-manager,
, nix-flatpak nix-darwin,
, stylix nix-flatpak,
, hyprlauncher stylix,
hyprlauncher,
}: }:
let let
user = { user = {
@@ -65,9 +66,13 @@
homeManagerVersion = homeManagerVersion; homeManagerVersion = homeManagerVersion;
os = { os = {
enable = true; enable = true;
firewall = { enable = false; }; firewall = {
enable = false;
};
enableFonts = true; enableFonts = true;
hardware = { enable = false; }; hardware = {
enable = false;
};
enablePrometheusExporters = true; enablePrometheusExporters = true;
containers = { containers = {
runtime = "docker"; runtime = "docker";
@@ -86,19 +91,22 @@
stylix stylix
; ;
specialArgs = { specialArgs = {
inputs = inherit
{ hyprlauncher
inherit nixpkgs-unstable
hyprlauncher ;
nixpkgs-unstable;
};
}; };
}; };
# Libs # Libs
lib = (import modules/lib.nix ({ lib = (
nixpkgs = nixpkgs; import modules/lib.nix (
home-manager = home-manager; {
} // libConfig)); nixpkgs = nixpkgs;
home-manager = home-manager;
}
// libConfig
)
);
homelabServices = ( homelabServices = (
(lib.makeHLServices { (lib.makeHLServices {
user = user; user = user;
@@ -115,26 +123,27 @@
{ {
# Dev Setups # Dev Setups
# ------------- # -------------
devShells = devShells = lib.eachSystem (
lib.eachSystem (system: system:
let pkgs = nixpkgs.legacyPackages.${system}; let
in pkgs = nixpkgs.legacyPackages.${system};
{ in
default = pkgs.mkShell { {
name = "nixos-setup"; default = pkgs.mkShell {
packages = with pkgs; [ name = "nixos-setup";
nixpkgs-fmt packages = with pkgs; [
nixd nixpkgs-fmt
nh nixd
]; nh
shellHook = '' ];
export PATH=$PATH:$(pwd)/bin shellHook = ''
''; export PATH=$PATH:$(pwd)/bin
}; '';
}); };
}
);
lib = lib; lib = lib;
formatter = formatter = lib.eachSystem (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt);
lib.eachSystem (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt);
# None-NIXOS LINUX Setups # None-NIXOS LINUX Setups
# ------------- # -------------
@@ -157,50 +166,61 @@
homeManagerVersion = homeManagerVersion; homeManagerVersion = homeManagerVersion;
os = { os = {
enable = true; enable = true;
firewall = { enable = false; }; firewall = {
enable = false;
};
enableFonts = true; enableFonts = true;
enableNetworking = true; enableNetworking = true;
enableSSH = false; enableSSH = false;
hardware = { enable = true; }; hardware = {
enable = true;
};
containers = { containers = {
localDockerRegistries = localDockerRegistries; localDockerRegistries = localDockerRegistries;
runtime = "docker"; runtime = "docker";
}; };
enablePrometheusExporters = true; enablePrometheusExporters = true;
}; };
configuration = { ... }: { configuration =
imports = [ { ... }:
nixos-hardware.nixosModules.framework-13-7040-amd {
(import ./hosts/fwbook.nix { imports = [
user = user; nixos-hardware.nixosModules.framework-13-7040-amd
}) (import ./hosts/fwbook.nix {
]; user = user;
}; })
];
};
}; };
# NIXOS Framework Homelab # NIXOS Framework Homelab
# ------------- # -------------
hl-fws1 = lib.makeHLService { hl-fws1 = lib.makeHLService {
hostName = "hl-fws1"; hostName = "hl-fws1";
configuration = { ... }: { configuration =
imports = [ { ... }:
nixos-hardware.nixosModules.framework-11th-gen-intel {
(import (./hosts/hl-fws1.nix) { user = user; }) imports = [
]; nixos-hardware.nixosModules.framework-11th-gen-intel
}; (import (./hosts/hl-fws1.nix) { user = user; })
];
};
systemStateVersion = "24.05"; systemStateVersion = "24.05";
}; };
# NIXOS Framework Desktop # NIXOS Framework Desktop
# ------------- # -------------
hl-fwdesk = lib.makeHLService { hl-fwdesk = lib.makeHLService {
hostName = "hl-fwdesk"; hostName = "hl-fwdesk";
configuration = { ... }: { configuration =
imports = [ { ... }:
nixos-hardware.nixosModules.framework-desktop-amd-ai-max-300-series {
(import (./hosts/hl-fwdesk.nix) { user = user; }) imports = [
]; nixos-hardware.nixosModules.framework-desktop-amd-ai-max-300-series
}; (import (./hosts/hl-fwdesk.nix) { user = user; })
];
};
systemStateVersion = "25.05"; systemStateVersion = "25.05";
}; };
} // homelabServices; }
// homelabServices;
}; };
} }
+68 -24
View File
@@ -1,5 +1,11 @@
{ user }: { user }:
{ pkgs, hyprlauncher, system, ... }: {
pkgs,
hyprlauncher,
system,
nixpkgs-unstable,
...
}:
let let
zshFWBook = builtins.filterSource (p: t: true) ./scripts/fwbook; zshFWBook = builtins.filterSource (p: t: true) ./scripts/fwbook;
zshFunctions = zshFWBook + "/functions.sh"; zshFunctions = zshFWBook + "/functions.sh";
@@ -7,6 +13,7 @@ let
8000 8000
8001 8001
]; ];
unstable = nixpkgs-unstable.legacyPackages.${system};
in in
{ {
imports = [ ./fwbook.hardware-configuration.nix ]; imports = [ ./fwbook.hardware-configuration.nix ];
@@ -27,7 +34,7 @@ in
}; };
desktop = { desktop = {
enable = true; enable = true;
cosmic.enable = true; cosmic.enable = false;
kde.enable = false; kde.enable = false;
crypto.enable = true; crypto.enable = true;
gnome.enable = false; gnome.enable = false;
@@ -63,12 +70,23 @@ in
nssmdns4 = true; nssmdns4 = true;
}; };
virtualisation.waydroid.enable = 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 # Tailscale
services.tailscale.enable = true; services.tailscale.enable = true;
# Desktop Env # Desktop Env
services.xserver.displayManager.gdm.enable = true; services.displayManager.gdm.enable = true;
services.xserver.displayManager.gdm.wayland = true; services.displayManager.gdm.wayland = true;
services.displayManager.defaultSession = "niri"; services.displayManager.defaultSession = "niri";
# home manager # home manager
home-manager.users.${user.name} = { home-manager.users.${user.name} = {
@@ -97,7 +115,9 @@ in
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
# Bluetooth # Bluetooth
hardware.bluetooth.settings.General = { ControllerMode = "bredr"; }; hardware.bluetooth.settings.General = {
ControllerMode = "bredr";
};
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true; hardware.bluetooth.powerOnBoot = true;
# Bootloader. # Bootloader.
@@ -110,11 +130,13 @@ in
# Packages # Packages
environment.systemPackages = environment.systemPackages =
let let
gdk = pkgs.google-cloud-sdk.withExtraComponents gdk = pkgs.google-cloud-sdk.withExtraComponents (
(with pkgs.google-cloud-sdk.components; [ with pkgs.google-cloud-sdk.components;
[
gke-gcloud-auth-plugin gke-gcloud-auth-plugin
kubectl kubectl
]); ]
);
in in
(with pkgs; [ (with pkgs; [
@@ -126,6 +148,7 @@ in
openfortivpn openfortivpn
openfortivpn-webview openfortivpn-webview
openfortivpn-webview-qt openfortivpn-webview-qt
nodejs
# Util # Util
libusb1 libusb1
@@ -167,13 +190,14 @@ in
# Development # Development
vscode vscode
zed-editor zed-editor-fhs
devenv devenv
just just
rpi-imager rpi-imager
rpiboot rpiboot
code-cursor-fhs code-cursor-fhs
nix-prefetch nix-prefetch
orca-slicer
# Run macos apps # Run macos apps
darling-dmg darling-dmg
@@ -183,12 +207,11 @@ in
bitwarden-cli bitwarden-cli
# documents # documents
onlyoffice-bin_latest onlyoffice-desktopeditors
# Work # Work
gdk gdk
slack slack
google-chrome
# IPhone Tethering # IPhone Tethering
libimobiledevice libimobiledevice
@@ -242,12 +265,15 @@ in
port = 11434; port = 11434;
acceleration = "rocm"; acceleration = "rocm";
rocmOverrideGfx = "11.0.2"; rocmOverrideGfx = "11.0.2";
package = unstable.ollama-rocm;
}; };
# # Brother Printer # # Brother Printer
hardware.sane.brscan5.enable = true; hardware.sane.brscan5.enable = true;
# # Display Managers # # Display Managers
services.xserver.videoDrivers = services.xserver.videoDrivers = [
[ "modesetting" "fbdev" ]; "modesetting"
"fbdev"
];
# Kernel # Kernel
boot.kernelPackages = pkgs.linuxPackages_zen; boot.kernelPackages = pkgs.linuxPackages_zen;
@@ -256,18 +282,36 @@ in
fileSystems."/mnt/EightTerra/FamilyStorage" = { fileSystems."/mnt/EightTerra/FamilyStorage" = {
device = "tnas1.lab.internal:/mnt/EightTerra/FamilyStorage"; device = "tnas1.lab.internal:/mnt/EightTerra/FamilyStorage";
fsType = "nfs"; fsType = "nfs";
options = [ "x-systemd.automount" "noauto" ]; options = [
"x-systemd.automount"
"noauto"
];
};
fileSystems."/mnt/EightTerra/k3s-cluster" = {
device = "tnas1.lab.internal:/mnt/EightTerra/k3s-cluster";
fsType = "nfs";
options = [
"x-systemd.automount"
"noauto"
];
}; };
# Remote Builder # Remote Builder
nix.buildMachines = [{ nix.buildMachines = [
hostName = "root@bigbox1.lab.internal"; {
system = "x86_64-linux"; hostName = "root@bigbox1.lab.internal";
protocol = "ssh-ng"; system = "x86_64-linux";
maxJobs = 1; protocol = "ssh-ng";
speedFactor = 2; maxJobs = 1;
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; speedFactor = 2;
mandatoryFeatures = [ ]; supportedFeatures = [
}]; "nixos-test"
"benchmark"
"big-parallel"
"kvm"
];
mandatoryFeatures = [ ];
}
];
nix.distributedBuilds = true; nix.distributedBuilds = true;
# optional, useful when the builder has a faster internet connection than yours # optional, useful when the builder has a faster internet connection than yours
nix.extraOptions = '' nix.extraOptions = ''
+4 -4
View File
@@ -56,8 +56,8 @@
networkDrives.enable = true; networkDrives.enable = true;
}; };
services.displayManager.defaultSession = "gnome"; services.displayManager.defaultSession = "gnome";
services.xserver.displayManager.gdm.enable = false; services.displayManager.gdm.enable = false;
services.xserver.displayManager.gdm.wayland = false; services.displayManager.gdm.wayland = false;
services.autosuspend.enable = false; services.autosuspend.enable = false;
services.displayManager.autoLogin = { services.displayManager.autoLogin = {
enable = true; enable = true;
@@ -70,8 +70,8 @@
systemd.targets.suspend.enable = false; systemd.targets.suspend.enable = false;
systemd.targets.hibernate.enable = false; systemd.targets.hibernate.enable = false;
systemd.targets.hybrid-sleep.enable = false; systemd.targets.hybrid-sleep.enable = false;
services.xserver.displayManager.gdm.autoSuspend = false; services.displayManager.gdm.autoSuspend = false;
services.xserver.displayManager.gdm.autoLogin.delay = 0; services.displayManager.gdm.autoLogin.delay = 0;
# Remote Desktop # Remote Desktop
services.xrdp.enable = true; services.xrdp.enable = true;
services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session"; services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session";
+2 -2
View File
@@ -58,8 +58,8 @@ in
# Tailscale # Tailscale
services.tailscale.enable = true; services.tailscale.enable = true;
# Desktop Env # Desktop Env
services.xserver.displayManager.gdm.enable = true; services.displayManager.gdm.enable = true;
services.xserver.displayManager.gdm.wayland = true; services.displayManager.gdm.wayland = true;
services.displayManager.defaultSession = "niri"; services.displayManager.defaultSession = "niri";
# Firmware updater # Firmware updater
services.fwupd.enable = true; services.fwupd.enable = true;
-4
View File
@@ -2,10 +2,6 @@ function start-windows() {
quickemu --vm /mnt/Data/vms/windows-11.conf --display spice --viewer remote-viewer 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() { function clean-file() {
grep -v '^\s*#' | grep -v '^$' grep -v '^\s*#' | grep -v '^$'
} }
+27 -18
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
with lib; with lib;
@@ -25,11 +30,13 @@ in
type = types.str; type = types.str;
}; };
extraGitConfigs = mkOption { extraGitConfigs = mkOption {
type = types.listOf (types.submodule { type = types.listOf (
path = mkOption { types.submodule {
type = types.str; path = mkOption {
}; type = types.str;
}); };
}
);
default = [ ]; default = [ ];
}; };
}; };
@@ -37,18 +44,20 @@ in
config = config =
let let
hm = (import ../home { hm = (
stateVersion = cfg.home-manager.version; import ../home {
}); stateVersion = cfg.home-manager.version;
}
);
in in
mkIf cfg.user.enable mkIf cfg.user.enable {
{ programs.zsh.enable = true;
programs.zsh.enable = true; home-manager.users.root = (hm.makeRootUser { hostName = config.skyg.core.hostName; }) {
home-manager.users.root = pkgs = pkgs;
(hm.makeRootUser { hostName = config.skyg.core.hostName; }) { pkgs = pkgs; };
home-manager.users.${cfg.user.name} =
((hm.makeCommonUser cfg.user) { pkgs = pkgs; }) // {
imports = cfg.home-manager.extraImports;
};
}; };
home-manager.backupFileExtension = ".bak";
home-manager.users.${cfg.user.name} = ((hm.makeCommonUser cfg.user) { pkgs = pkgs; }) // {
imports = cfg.home-manager.extraImports;
};
};
} }
+55 -49
View File
@@ -16,68 +16,74 @@ let
}; };
in in
{ {
makeRootUser = { hostName }: { pkgs, ... }: { makeRootUser =
home = homeModule // { { hostName }:
packages = with pkgs; [ { pkgs, ... }:
jq {
kubectl home = homeModule // {
kubectx packages = with pkgs; [
htop jq
btop kubectl
duf kubectx
]; htop
}; btop
programs = (programsModule { duf
pkgs = pkgs; ];
user = {
name = "root";
}; };
}) // { programs =
git = (makeCommonGitConfigs { (programsModule {
userName = "root"; pkgs = pkgs;
userEmail = "root@${hostName}"; user = {
extraGitConfigs = [ ]; name = "root";
}); };
})
// (makeCommonGitConfigs {
userName = "root";
userEmail = "root@${hostName}";
extraGitConfigs = [ ];
});
services = servicesModule { pkgs = pkgs; };
fonts = fontsModule;
}; };
services = servicesModule { pkgs = pkgs; };
fonts = fontsModule;
};
makeCommonUser = makeCommonUser =
{ fullName {
, email fullName,
, extraGitConfigs ? [ ] email,
, name extraGitConfigs ? [ ],
, ... name,
}@user: { pkgs, ... }: { ...
}@user:
{ pkgs, ... }:
{
fonts = fontsModule; fonts = fontsModule;
# xdg.configFile."mimeapps.list".force = true;
home = homeModule // { home = homeModule // {
username = name; username = name;
homeDirectory = "/home/${name}"; homeDirectory = "/home/${name}";
packages = with pkgs; packages = with pkgs; [
[ jq
jq nixpkgs-fmt
nixpkgs-fmt ipfetch
ipfetch nixd
nixd htop
htop btop
btop fastfetch
fastfetch kubectl
kubectl kubectx
kubectx terraform
terraform dust
dust ];
];
}; };
programs = (programsModule { programs =
inherit pkgs user; (programsModule {
}) // { inherit pkgs user;
git = (makeCommonGitConfigs { })
// (makeCommonGitConfigs {
userName = fullName; userName = fullName;
userEmail = email; userEmail = email;
extraGitConfigs = extraGitConfigs; extraGitConfigs = extraGitConfigs;
}); });
};
services = servicesModule { pkgs = pkgs; }; services = servicesModule { pkgs = pkgs; };
}; };
} }
+20 -13
View File
@@ -7,21 +7,28 @@ let
, userEmail , userEmail
, extraGitConfigs ? [ ] , extraGitConfigs ? [ ]
}: { }: {
enable = true; delta = {
userName = userName; enable = true;
userEmail = userEmail; enableGitIntegration = true;
delta = { enable = true; }; };
extraConfig = { git = {
color = { ui = "auto"; }; enable = true;
push = { settings = {
default = "upstream"; user = {
autoSetupRemote = true; name = userName;
email = userEmail;
};
color = { ui = "auto"; };
push = {
default = "upstream";
autoSetupRemote = true;
};
init = { defaultBranch = "main"; };
}; };
init = { defaultBranch = "main"; }; includes =
(builtins.map (f: { path = gitconfigs + "/" + f; }) gitconfigFiles)
++ extraGitConfigs;
}; };
includes =
(builtins.map (f: { path = gitconfigs + "/" + f; }) gitconfigFiles)
++ extraGitConfigs;
}; };
in in
{ {
+1 -1
View File
@@ -80,7 +80,7 @@
''; '';
plugins = with pkgs.nushellPlugins; [ plugins = with pkgs.nushellPlugins; [
polars polars
net # net
highlight highlight
]; ];
}; };
-1
View File
@@ -13,6 +13,5 @@
]; ];
config = { config = {
environment.sessionVariables.EDITOR = "vi"; environment.sessionVariables.EDITOR = "vi";
programs.thefuck.enable = true;
}; };
} }
+1 -3
View File
@@ -9,10 +9,9 @@ let
font-awesome font-awesome
mplus-outline-fonts.githubRelease mplus-outline-fonts.githubRelease
jetbrains-mono jetbrains-mono
ubuntu_font_family ubuntu-classic
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-emoji
noto-fonts-color-emoji noto-fonts-color-emoji
]; ];
in in
@@ -32,4 +31,3 @@ in
}; };
}; };
} }
+4 -4
View File
@@ -14,10 +14,10 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];
services.xserver.videoDrivers = [ "amdgpu" ]; services.xserver.videoDrivers = [ "amdgpu" ];
hardware.graphics = { # hardware.graphics = {
extraPackages = [ pkgs.amdvlk ]; # extraPackages = [ pkgs.amdvlk ];
extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; # extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
}; # };
environment.systemPackages = (with pkgs; [ environment.systemPackages = (with pkgs; [
rocmPackages.rocm-smi rocmPackages.rocm-smi
rocmPackages.rpp rocmPackages.rpp
+13 -9
View File
@@ -56,15 +56,19 @@ in
systemd.sleep.extraConfig = "HibernateDelaySec=30m"; systemd.sleep.extraConfig = "HibernateDelaySec=30m";
# Logind # Logind
services.logind = { services.logind = {
lidSwitchExternalPower = "suspend-then-hibernate"; settings = {
lidSwitch = "suspend-then-hibernate"; Login = {
powerKey = "lock"; HandleLidSwitchExternalPower = "suspend-then-hibernate";
extraConfig = '' HandleLidSwitch = "suspend-then-hibernate";
LidSwitchIgnoreInhibited=yes HandlePowerKey = "lock";
HandlePowerKey=suspend-then-hibernate };
IdleAction=suspend-then-hibernate };
IdleActionSec=2m # extraConfig = ''
''; # LidSwitchIgnoreInhibited=yes
# HandlePowerKey=suspend-then-hibernate
# IdleAction=suspend-then-hibernate
# IdleActionSec=2m
# '';
}; };
}; };
} }
+5 -3
View File
@@ -1,6 +1,7 @@
{ lib {
, config lib,
, ... config,
...
}: }:
let let
cfg = config.skyg.nixos.common.hardware.pipewire; cfg = config.skyg.nixos.common.hardware.pipewire;
@@ -18,6 +19,7 @@ in
wireplumber.enable = true; wireplumber.enable = true;
pulse.enable = true; pulse.enable = true;
systemWide = false; systemWide = false;
socketActivation = true;
}; };
services.jack = { services.jack = {
alsa.enable = true; alsa.enable = true;
+7 -6
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.skyg.nixos; cfg = config.skyg.nixos;
in in
@@ -17,8 +22,7 @@ in
options = { options = {
skyg.nixos.desktop = { skyg.nixos.desktop = {
enable = lib.mkEnableOption enable = lib.mkEnableOption "Enable Desktop";
"Enable Desktop";
}; };
}; };
config = lib.mkIf cfg.desktop.enable { config = lib.mkIf cfg.desktop.enable {
@@ -37,9 +41,6 @@ in
terminal-exec.enable = true; terminal-exec.enable = true;
portal = { portal = {
enable = true; enable = true;
extraPortals = [
pkgs.kdePackages.xdg-desktop-portal-kde
];
}; };
}; };
}; };
+1 -1
View File
@@ -15,7 +15,7 @@ in
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services.xserver.desktopManager.gnome.enable = true; services.desktopManager.gnome.enable = true;
environment.gnome.excludePackages = with pkgs; [ environment.gnome.excludePackages = with pkgs; [
gnome-tour gnome-tour
gnome-text-editor gnome-text-editor
-1
View File
@@ -32,7 +32,6 @@ in
mako mako
wofi wofi
rofi rofi
rofi-wayland
# Control Tools # Control Tools
pavucontrol pavucontrol
playerctl playerctl
+17 -13
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.skyg.nixos.desktop.tiler.hyprland; cfg = config.skyg.nixos.desktop.tiler.hyprland;
# hypr-plugin-dir = pkgs.symlinkJoin { # hypr-plugin-dir = pkgs.symlinkJoin {
@@ -13,8 +18,7 @@ in
{ {
options = { options = {
skyg.nixos.desktop.tiler.hyprland = { skyg.nixos.desktop.tiler.hyprland = {
enable = lib.mkEnableOption enable = lib.mkEnableOption "hyprland";
"hyprland";
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
@@ -25,19 +29,19 @@ in
xwayland.enable = true; xwayland.enable = true;
}; };
programs.uwsm.enable = true; programs.uwsm.enable = true;
environment.systemPackages = with pkgs; [ # environment.systemPackages = with pkgs; [
hyprls # hyprls
]; # ];
xdg.portal = { xdg.portal = {
enable = true; enable = true;
extraPortals = with pkgs; [ xdg-desktop-portal-hyprland ]; extraPortals = with pkgs; [ xdg-desktop-portal-hyprland ];
}; };
home-manager.users."${config.skyg.user.name}".wayland.windowManager.hyprland = { # home-manager.users."${config.skyg.user.name}".wayland.windowManager.hyprland = {
enable = true; # enable = true;
plugins = with pkgs; [ # plugins = with pkgs; [
hyprlandPlugins.hyprexpo # hyprlandPlugins.hyprexpo
hyprlandPlugins.hyprbars # hyprlandPlugins.hyprbars
]; # ];
}; # };
}; };
} }
+19 -8
View File
@@ -1,16 +1,20 @@
{ config, lib, pkgs, skygUtils, system, nixpkgs-unstable, ... }: {
config,
lib,
pkgs,
skygUtils,
system,
nixpkgs-unstable,
...
}:
let let
cfg = config.skyg.nixos.desktop.tiler.niri; cfg = config.skyg.nixos.desktop.tiler.niri;
# unstable = import nixpkgs-unstable { unstable = nixpkgs-unstable.legacyPackages.${system};
# inherit system;
# config.allowUnfree = true;
# };
in in
{ {
options = { options = {
skyg.nixos.desktop.tiler.niri = { skyg.nixos.desktop.tiler.niri = {
enable = lib.mkEnableOption enable = lib.mkEnableOption "niri";
"niri";
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
@@ -30,6 +34,13 @@ in
filePath = "niri"; filePath = "niri";
configSource = "/home/${config.skyg.user.name}/nixos-setup/configs"; 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
];
};
}; };
} }