Merge branch 'main' of github.com:asosnovsky/nixos-setup
This commit is contained in:
commit
bf643c6db2
23 files changed
+489
-350
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
|
||||
}
|
||||
}
|
||||
File renamed without changes.
+51
-1
@@ -97,7 +97,7 @@ layout {
|
||||
default-column-width { proportion 0.5; }
|
||||
focus-ring {
|
||||
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"
|
||||
}
|
||||
border {
|
||||
@@ -163,6 +163,10 @@ window-rule {
|
||||
match is-active=false
|
||||
opacity 0.85
|
||||
}
|
||||
window-rule {
|
||||
match is-urgent=true
|
||||
open-focused true
|
||||
}
|
||||
window-rule {
|
||||
match app-id="satty"
|
||||
open-focused true
|
||||
@@ -186,6 +190,20 @@ window-rule {
|
||||
open-focused true
|
||||
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
|
||||
// =========================
|
||||
@@ -259,3 +277,35 @@ binds {
|
||||
}
|
||||
|
||||
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
@@ -38,11 +38,11 @@
|
||||
"fromYaml": "fromYaml"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746562888,
|
||||
"narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
|
||||
"lastModified": 1755819240,
|
||||
"narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
|
||||
"owner": "SenchoPens",
|
||||
"repo": "base16.nix",
|
||||
"rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
|
||||
"rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -54,28 +54,28 @@
|
||||
"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"
|
||||
}
|
||||
},
|
||||
"base16-helix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1748408240,
|
||||
"narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
|
||||
"lastModified": 1760703920,
|
||||
"narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-helix",
|
||||
"rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
|
||||
"rev": "d646af9b7d14bff08824538164af99d0c521b185",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -105,21 +105,17 @@
|
||||
"inputs": {
|
||||
"determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin",
|
||||
"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",
|
||||
"nix": "nix",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761251546,
|
||||
"narHash": "sha256-I/TDYHCKui0K62f2cEk2UJf6N9rO/hdsa65kpEJMhSo=",
|
||||
"rev": "70beec406153496943274f59cb2ded76be49fcd7",
|
||||
"revCount": 306,
|
||||
"lastModified": 1766177528,
|
||||
"narHash": "sha256-Bl+p766mM7qNCZtMqmTz13RuUbOMKsFa+/vnGYoxgPk=",
|
||||
"rev": "b159c082f0f9bdefa6c386189a13c5fa0734d8d8",
|
||||
"revCount": 317,
|
||||
"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": {
|
||||
"type": "tarball",
|
||||
@@ -129,47 +125,47 @@
|
||||
"determinate-nixd-aarch64-darwin": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-TORlljq+wwn8XWLoN0giLY15pNiIAXuU0igpIXjLhMY=",
|
||||
"narHash": "sha256-vDaEQ5T4eA7kEPREmm68IVWGR6zT0aDL5slZxA6dkSc=",
|
||||
"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": {
|
||||
"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": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-1HEvUQcG0mVdEQrEqcLEdB9nHpMNbb39bdNxdvyizqk=",
|
||||
"narHash": "sha256-Hf4JsIv5G3IR0Q0RHGLSNdmDzFv97sVQQKwzY6A0vV4=",
|
||||
"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": {
|
||||
"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": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-WrXQbrXVisAdZl/hh49PsErSPHwzks1Vw+O3jarVjDo=",
|
||||
"narHash": "sha256-J+J4E02XpEl0ZkpzMbUmGCf6S4yk0gYCYmiGzZ058ik=",
|
||||
"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": {
|
||||
"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": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1748383148,
|
||||
"narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
|
||||
"lastModified": 1764724327,
|
||||
"narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
|
||||
"owner": "rafaelmardojai",
|
||||
"repo": "firefox-gnome-theme",
|
||||
"rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
|
||||
"rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -223,11 +219,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749398372,
|
||||
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
|
||||
"lastModified": 1763759067,
|
||||
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
|
||||
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -281,18 +277,20 @@
|
||||
"gnome-shell": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1744584021,
|
||||
"narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
|
||||
"host": "gitlab.gnome.org",
|
||||
"lastModified": 1764524476,
|
||||
"narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
|
||||
"owner": "GNOME",
|
||||
"repo": "gnome-shell",
|
||||
"rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
|
||||
"type": "github"
|
||||
"rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"host": "gitlab.gnome.org",
|
||||
"owner": "GNOME",
|
||||
"ref": "48.1",
|
||||
"ref": "gnome-49",
|
||||
"repo": "gnome-shell",
|
||||
"type": "github"
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
@@ -302,16 +300,16 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1758463745,
|
||||
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
|
||||
"lastModified": 1766292113,
|
||||
"narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
|
||||
"rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.05",
|
||||
"ref": "release-25.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -419,11 +417,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763819300,
|
||||
"narHash": "sha256-WBTSRJ0PrVW+zDmTraJFXsAKPrYn01VgXvEtcixIEsQ=",
|
||||
"lastModified": 1765891583,
|
||||
"narHash": "sha256-M9tRbYnLx/3d3YwepFu0KvhiZ53i1hX+tLJLNeNYeaQ=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlauncher",
|
||||
"rev": "53a6b3f2d7f6e3981347ddaaf469b16964287fc2",
|
||||
"rev": "e50b5e0797915533c81cb95a6c3623541bfb5d7a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -562,12 +560,12 @@
|
||||
"nixpkgs-regression": "nixpkgs-regression"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761238235,
|
||||
"narHash": "sha256-BvEZ31+FQKJz2XH8PTXpJqGZ1eT9bhMQ2wBj2ehBYvM=",
|
||||
"rev": "9512828397f684d0f732ea76b7631f69a0db34f7",
|
||||
"revCount": 23138,
|
||||
"lastModified": 1766174426,
|
||||
"narHash": "sha256-0ZofAQZNgg5nfIKsVb7g4It6ufmIyLtfFRPOf+6WRkk=",
|
||||
"rev": "15d6091194b5b90d292e8d6283db77f09c303b1e",
|
||||
"revCount": 24285,
|
||||
"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": {
|
||||
"type": "tarball",
|
||||
@@ -581,11 +579,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761339987,
|
||||
"narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=",
|
||||
"lastModified": 1766038392,
|
||||
"narHash": "sha256-ht/GuKaw5NT3M12xM+mkUtkSBVtzjJ8IHIy6R/ncv9g=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de",
|
||||
"rev": "5fb45ece6129bd7ad8f7310df0ae9c00bae7c562",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -612,11 +610,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1761933221,
|
||||
"narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=",
|
||||
"lastModified": 1764440730,
|
||||
"narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "7467f155fcba189eb088a7601f44fbef7688669b",
|
||||
"rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -628,12 +626,12 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1755922037,
|
||||
"narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=",
|
||||
"rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c",
|
||||
"revCount": 808723,
|
||||
"lastModified": 1761597516,
|
||||
"narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
|
||||
"rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
|
||||
"revCount": 811874,
|
||||
"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": {
|
||||
"type": "tarball",
|
||||
@@ -674,12 +672,12 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1761672384,
|
||||
"narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
|
||||
"rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
|
||||
"revCount": 886100,
|
||||
"lastModified": 1766309749,
|
||||
"narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
|
||||
"rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
|
||||
"revCount": 914755,
|
||||
"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": {
|
||||
"type": "tarball",
|
||||
@@ -688,12 +686,12 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1760965567,
|
||||
"narHash": "sha256-0JDOal5P7xzzAibvD0yTE3ptyvoVOAL0rcELmDdtSKg=",
|
||||
"rev": "cb82756ecc37fa623f8cf3e88854f9bf7f64af93",
|
||||
"revCount": 880602,
|
||||
"lastModified": 1765772535,
|
||||
"narHash": "sha256-aq+dQoaPONOSjtFIBnAXseDm9TUhIbe215TPmkfMYww=",
|
||||
"rev": "09b8fda8959d761445f12b55f380d90375a1d6bb",
|
||||
"revCount": 911985,
|
||||
"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": {
|
||||
"type": "tarball",
|
||||
@@ -718,12 +716,12 @@
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1761597516,
|
||||
"narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
|
||||
"rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
|
||||
"revCount": 811874,
|
||||
"lastModified": 1766201043,
|
||||
"narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
|
||||
"rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
|
||||
"revCount": 904049,
|
||||
"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": {
|
||||
"type": "tarball",
|
||||
@@ -739,15 +737,14 @@
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"nixpkgs"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1751320053,
|
||||
"narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=",
|
||||
"lastModified": 1764773531,
|
||||
"narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670",
|
||||
"rev": "1d9616689e98beded059ad0384b9951e967a17fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -791,16 +788,16 @@
|
||||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762295027,
|
||||
"narHash": "sha256-5z5cGrp9F8g8iyQrM8WkB6pAwP4AaicljKZ15gx+X9Y=",
|
||||
"lastModified": 1766418901,
|
||||
"narHash": "sha256-zaISsfwlVaLTJrUIBJf1Mk83kKLp83bl1VOzf8QVczo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "stylix",
|
||||
"rev": "91b9a270523361268ba6a8772152fde31103869f",
|
||||
"rev": "c51431509b7c8dec0cd0369ea3cc20a772c3dba1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.05",
|
||||
"ref": "release-25.11",
|
||||
"repo": "stylix",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -886,11 +883,11 @@
|
||||
"tinted-schemes": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1750770351,
|
||||
"narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
|
||||
"lastModified": 1763914658,
|
||||
"narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "schemes",
|
||||
"rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
|
||||
"rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -902,11 +899,11 @@
|
||||
"tinted-tmux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1751159871,
|
||||
"narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
|
||||
"lastModified": 1764465359,
|
||||
"narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-tmux",
|
||||
"rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
|
||||
"rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -918,11 +915,11 @@
|
||||
"tinted-zed": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1751158968,
|
||||
"narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
|
||||
"lastModified": 1764464512,
|
||||
"narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-zed",
|
||||
"rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
|
||||
"rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -930,28 +927,6 @@
|
||||
"repo": "base16-zed",
|
||||
"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",
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=main";
|
||||
# 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";
|
||||
};
|
||||
# Themes
|
||||
stylix = {
|
||||
url = "github:nix-community/stylix/release-25.05";
|
||||
url = "github:nix-community/stylix/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
# Macos
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
+68
-24
@@ -1,5 +1,11 @@
|
||||
{ user }:
|
||||
{ pkgs, hyprlauncher, system, ... }:
|
||||
{
|
||||
pkgs,
|
||||
hyprlauncher,
|
||||
system,
|
||||
nixpkgs-unstable,
|
||||
...
|
||||
}:
|
||||
let
|
||||
zshFWBook = builtins.filterSource (p: t: true) ./scripts/fwbook;
|
||||
zshFunctions = zshFWBook + "/functions.sh";
|
||||
@@ -7,6 +13,7 @@ let
|
||||
8000
|
||||
8001
|
||||
];
|
||||
unstable = nixpkgs-unstable.legacyPackages.${system};
|
||||
in
|
||||
{
|
||||
imports = [ ./fwbook.hardware-configuration.nix ];
|
||||
@@ -27,7 +34,7 @@ in
|
||||
};
|
||||
desktop = {
|
||||
enable = true;
|
||||
cosmic.enable = true;
|
||||
cosmic.enable = false;
|
||||
kde.enable = false;
|
||||
crypto.enable = true;
|
||||
gnome.enable = false;
|
||||
@@ -63,12 +70,23 @@ 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
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.xserver.displayManager.gdm.wayland = true;
|
||||
services.displayManager.gdm.enable = true;
|
||||
services.displayManager.gdm.wayland = true;
|
||||
services.displayManager.defaultSession = "niri";
|
||||
# home manager
|
||||
home-manager.users.${user.name} = {
|
||||
@@ -97,7 +115,9 @@ in
|
||||
# Enable CUPS to print documents.
|
||||
services.printing.enable = true;
|
||||
# Bluetooth
|
||||
hardware.bluetooth.settings.General = { ControllerMode = "bredr"; };
|
||||
hardware.bluetooth.settings.General = {
|
||||
ControllerMode = "bredr";
|
||||
};
|
||||
hardware.bluetooth.enable = true;
|
||||
hardware.bluetooth.powerOnBoot = true;
|
||||
# Bootloader.
|
||||
@@ -110,11 +130,13 @@ in
|
||||
# Packages
|
||||
environment.systemPackages =
|
||||
let
|
||||
gdk = pkgs.google-cloud-sdk.withExtraComponents
|
||||
(with pkgs.google-cloud-sdk.components; [
|
||||
gdk = pkgs.google-cloud-sdk.withExtraComponents (
|
||||
with pkgs.google-cloud-sdk.components;
|
||||
[
|
||||
gke-gcloud-auth-plugin
|
||||
kubectl
|
||||
]);
|
||||
]
|
||||
);
|
||||
in
|
||||
(with pkgs; [
|
||||
|
||||
@@ -126,6 +148,7 @@ in
|
||||
openfortivpn
|
||||
openfortivpn-webview
|
||||
openfortivpn-webview-qt
|
||||
nodejs
|
||||
|
||||
# Util
|
||||
libusb1
|
||||
@@ -167,13 +190,14 @@ in
|
||||
|
||||
# Development
|
||||
vscode
|
||||
zed-editor
|
||||
zed-editor-fhs
|
||||
devenv
|
||||
just
|
||||
rpi-imager
|
||||
rpiboot
|
||||
code-cursor-fhs
|
||||
nix-prefetch
|
||||
orca-slicer
|
||||
|
||||
# Run macos apps
|
||||
darling-dmg
|
||||
@@ -183,12 +207,11 @@ in
|
||||
bitwarden-cli
|
||||
|
||||
# documents
|
||||
onlyoffice-bin_latest
|
||||
onlyoffice-desktopeditors
|
||||
|
||||
# Work
|
||||
gdk
|
||||
slack
|
||||
google-chrome
|
||||
|
||||
# IPhone Tethering
|
||||
libimobiledevice
|
||||
@@ -242,12 +265,15 @@ in
|
||||
port = 11434;
|
||||
acceleration = "rocm";
|
||||
rocmOverrideGfx = "11.0.2";
|
||||
package = unstable.ollama-rocm;
|
||||
};
|
||||
# # Brother Printer
|
||||
hardware.sane.brscan5.enable = true;
|
||||
# # Display Managers
|
||||
services.xserver.videoDrivers =
|
||||
[ "modesetting" "fbdev" ];
|
||||
services.xserver.videoDrivers = [
|
||||
"modesetting"
|
||||
"fbdev"
|
||||
];
|
||||
# Kernel
|
||||
boot.kernelPackages = pkgs.linuxPackages_zen;
|
||||
|
||||
@@ -256,18 +282,36 @@ in
|
||||
fileSystems."/mnt/EightTerra/FamilyStorage" = {
|
||||
device = "tnas1.lab.internal:/mnt/EightTerra/FamilyStorage";
|
||||
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
|
||||
nix.buildMachines = [{
|
||||
hostName = "root@bigbox1.lab.internal";
|
||||
system = "x86_64-linux";
|
||||
protocol = "ssh-ng";
|
||||
maxJobs = 1;
|
||||
speedFactor = 2;
|
||||
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
|
||||
mandatoryFeatures = [ ];
|
||||
}];
|
||||
nix.buildMachines = [
|
||||
{
|
||||
hostName = "root@bigbox1.lab.internal";
|
||||
system = "x86_64-linux";
|
||||
protocol = "ssh-ng";
|
||||
maxJobs = 1;
|
||||
speedFactor = 2;
|
||||
supportedFeatures = [
|
||||
"nixos-test"
|
||||
"benchmark"
|
||||
"big-parallel"
|
||||
"kvm"
|
||||
];
|
||||
mandatoryFeatures = [ ];
|
||||
}
|
||||
];
|
||||
nix.distributedBuilds = true;
|
||||
# optional, useful when the builder has a faster internet connection than yours
|
||||
nix.extraOptions = ''
|
||||
|
||||
@@ -56,8 +56,8 @@
|
||||
networkDrives.enable = true;
|
||||
};
|
||||
services.displayManager.defaultSession = "gnome";
|
||||
services.xserver.displayManager.gdm.enable = false;
|
||||
services.xserver.displayManager.gdm.wayland = false;
|
||||
services.displayManager.gdm.enable = false;
|
||||
services.displayManager.gdm.wayland = false;
|
||||
services.autosuspend.enable = false;
|
||||
services.displayManager.autoLogin = {
|
||||
enable = true;
|
||||
@@ -70,8 +70,8 @@
|
||||
systemd.targets.suspend.enable = false;
|
||||
systemd.targets.hibernate.enable = false;
|
||||
systemd.targets.hybrid-sleep.enable = false;
|
||||
services.xserver.displayManager.gdm.autoSuspend = false;
|
||||
services.xserver.displayManager.gdm.autoLogin.delay = 0;
|
||||
services.displayManager.gdm.autoSuspend = false;
|
||||
services.displayManager.gdm.autoLogin.delay = 0;
|
||||
# Remote Desktop
|
||||
services.xrdp.enable = true;
|
||||
services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session";
|
||||
|
||||
+2
-2
@@ -58,8 +58,8 @@ in
|
||||
# Tailscale
|
||||
services.tailscale.enable = true;
|
||||
# Desktop Env
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.xserver.displayManager.gdm.wayland = true;
|
||||
services.displayManager.gdm.enable = true;
|
||||
services.displayManager.gdm.wayland = true;
|
||||
services.displayManager.defaultSession = "niri";
|
||||
# Firmware updater
|
||||
services.fwupd.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 '^$'
|
||||
}
|
||||
|
||||
+27
-18
@@ -1,4 +1,9 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
@@ -25,11 +30,13 @@ in
|
||||
type = types.str;
|
||||
};
|
||||
extraGitConfigs = mkOption {
|
||||
type = types.listOf (types.submodule {
|
||||
path = mkOption {
|
||||
type = types.str;
|
||||
};
|
||||
});
|
||||
type = types.listOf (
|
||||
types.submodule {
|
||||
path = mkOption {
|
||||
type = types.str;
|
||||
};
|
||||
}
|
||||
);
|
||||
default = [ ];
|
||||
};
|
||||
};
|
||||
@@ -37,18 +44,20 @@ in
|
||||
|
||||
config =
|
||||
let
|
||||
hm = (import ../home {
|
||||
stateVersion = cfg.home-manager.version;
|
||||
});
|
||||
hm = (
|
||||
import ../home {
|
||||
stateVersion = cfg.home-manager.version;
|
||||
}
|
||||
);
|
||||
in
|
||||
mkIf cfg.user.enable
|
||||
{
|
||||
programs.zsh.enable = true;
|
||||
home-manager.users.root =
|
||||
(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;
|
||||
};
|
||||
mkIf cfg.user.enable {
|
||||
programs.zsh.enable = true;
|
||||
home-manager.users.root = (hm.makeRootUser { hostName = config.skyg.core.hostName; }) {
|
||||
pkgs = pkgs;
|
||||
};
|
||||
home-manager.backupFileExtension = ".bak";
|
||||
home-manager.users.${cfg.user.name} = ((hm.makeCommonUser cfg.user) { pkgs = pkgs; }) // {
|
||||
imports = cfg.home-manager.extraImports;
|
||||
};
|
||||
};
|
||||
}
|
||||
+55
-49
@@ -16,68 +16,74 @@ let
|
||||
};
|
||||
in
|
||||
{
|
||||
makeRootUser = { hostName }: { pkgs, ... }: {
|
||||
home = homeModule // {
|
||||
packages = with pkgs; [
|
||||
jq
|
||||
kubectl
|
||||
kubectx
|
||||
htop
|
||||
btop
|
||||
duf
|
||||
];
|
||||
};
|
||||
programs = (programsModule {
|
||||
pkgs = pkgs;
|
||||
user = {
|
||||
name = "root";
|
||||
makeRootUser =
|
||||
{ hostName }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home = homeModule // {
|
||||
packages = with pkgs; [
|
||||
jq
|
||||
kubectl
|
||||
kubectx
|
||||
htop
|
||||
btop
|
||||
duf
|
||||
];
|
||||
};
|
||||
}) // {
|
||||
git = (makeCommonGitConfigs {
|
||||
userName = "root";
|
||||
userEmail = "root@${hostName}";
|
||||
extraGitConfigs = [ ];
|
||||
});
|
||||
programs =
|
||||
(programsModule {
|
||||
pkgs = pkgs;
|
||||
user = {
|
||||
name = "root";
|
||||
};
|
||||
})
|
||||
// (makeCommonGitConfigs {
|
||||
userName = "root";
|
||||
userEmail = "root@${hostName}";
|
||||
extraGitConfigs = [ ];
|
||||
});
|
||||
services = servicesModule { pkgs = pkgs; };
|
||||
fonts = fontsModule;
|
||||
};
|
||||
services = servicesModule { pkgs = pkgs; };
|
||||
fonts = fontsModule;
|
||||
};
|
||||
|
||||
makeCommonUser =
|
||||
{ fullName
|
||||
, email
|
||||
, extraGitConfigs ? [ ]
|
||||
, name
|
||||
, ...
|
||||
}@user: { pkgs, ... }: {
|
||||
{
|
||||
fullName,
|
||||
email,
|
||||
extraGitConfigs ? [ ],
|
||||
name,
|
||||
...
|
||||
}@user:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
fonts = fontsModule;
|
||||
# xdg.configFile."mimeapps.list".force = true;
|
||||
home = homeModule // {
|
||||
username = name;
|
||||
homeDirectory = "/home/${name}";
|
||||
packages = with pkgs;
|
||||
[
|
||||
jq
|
||||
nixpkgs-fmt
|
||||
ipfetch
|
||||
nixd
|
||||
htop
|
||||
btop
|
||||
fastfetch
|
||||
kubectl
|
||||
kubectx
|
||||
terraform
|
||||
dust
|
||||
];
|
||||
packages = with pkgs; [
|
||||
jq
|
||||
nixpkgs-fmt
|
||||
ipfetch
|
||||
nixd
|
||||
htop
|
||||
btop
|
||||
fastfetch
|
||||
kubectl
|
||||
kubectx
|
||||
terraform
|
||||
dust
|
||||
];
|
||||
};
|
||||
programs = (programsModule {
|
||||
inherit pkgs user;
|
||||
}) // {
|
||||
git = (makeCommonGitConfigs {
|
||||
programs =
|
||||
(programsModule {
|
||||
inherit pkgs user;
|
||||
})
|
||||
// (makeCommonGitConfigs {
|
||||
userName = fullName;
|
||||
userEmail = email;
|
||||
extraGitConfigs = extraGitConfigs;
|
||||
});
|
||||
};
|
||||
services = servicesModule { pkgs = pkgs; };
|
||||
};
|
||||
}
|
||||
+20
-13
@@ -7,21 +7,28 @@ let
|
||||
, userEmail
|
||||
, extraGitConfigs ? [ ]
|
||||
}: {
|
||||
enable = true;
|
||||
userName = userName;
|
||||
userEmail = userEmail;
|
||||
delta = { enable = true; };
|
||||
extraConfig = {
|
||||
color = { ui = "auto"; };
|
||||
push = {
|
||||
default = "upstream";
|
||||
autoSetupRemote = true;
|
||||
delta = {
|
||||
enable = true;
|
||||
enableGitIntegration = true;
|
||||
};
|
||||
git = {
|
||||
enable = true;
|
||||
settings = {
|
||||
user = {
|
||||
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
|
||||
{
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
'';
|
||||
plugins = with pkgs.nushellPlugins; [
|
||||
polars
|
||||
net
|
||||
# net
|
||||
highlight
|
||||
];
|
||||
};
|
||||
|
||||
@@ -13,6 +13,5 @@
|
||||
];
|
||||
config = {
|
||||
environment.sessionVariables.EDITOR = "vi";
|
||||
programs.thefuck.enable = true;
|
||||
};
|
||||
}
|
||||
@@ -9,10 +9,9 @@ let
|
||||
font-awesome
|
||||
mplus-outline-fonts.githubRelease
|
||||
jetbrains-mono
|
||||
ubuntu_font_family
|
||||
ubuntu-classic
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-emoji
|
||||
noto-fonts-color-emoji
|
||||
];
|
||||
in
|
||||
@@ -32,4 +31,3 @@ in
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,10 +14,10 @@ in
|
||||
config = lib.mkIf cfg.enable {
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
services.xserver.videoDrivers = [ "amdgpu" ];
|
||||
hardware.graphics = {
|
||||
extraPackages = [ pkgs.amdvlk ];
|
||||
extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
|
||||
};
|
||||
# hardware.graphics = {
|
||||
# extraPackages = [ pkgs.amdvlk ];
|
||||
# extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
|
||||
# };
|
||||
environment.systemPackages = (with pkgs; [
|
||||
rocmPackages.rocm-smi
|
||||
rocmPackages.rpp
|
||||
|
||||
@@ -56,15 +56,19 @@ in
|
||||
systemd.sleep.extraConfig = "HibernateDelaySec=30m";
|
||||
# Logind
|
||||
services.logind = {
|
||||
lidSwitchExternalPower = "suspend-then-hibernate";
|
||||
lidSwitch = "suspend-then-hibernate";
|
||||
powerKey = "lock";
|
||||
extraConfig = ''
|
||||
LidSwitchIgnoreInhibited=yes
|
||||
HandlePowerKey=suspend-then-hibernate
|
||||
IdleAction=suspend-then-hibernate
|
||||
IdleActionSec=2m
|
||||
'';
|
||||
settings = {
|
||||
Login = {
|
||||
HandleLidSwitchExternalPower = "suspend-then-hibernate";
|
||||
HandleLidSwitch = "suspend-then-hibernate";
|
||||
HandlePowerKey = "lock";
|
||||
};
|
||||
};
|
||||
# extraConfig = ''
|
||||
# LidSwitchIgnoreInhibited=yes
|
||||
# HandlePowerKey=suspend-then-hibernate
|
||||
# IdleAction=suspend-then-hibernate
|
||||
# IdleActionSec=2m
|
||||
# '';
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -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
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -15,7 +15,7 @@ in
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.desktopManager.gnome.enable = true;
|
||||
environment.gnome.excludePackages = with pkgs; [
|
||||
gnome-tour
|
||||
gnome-text-editor
|
||||
|
||||
@@ -32,7 +32,6 @@ in
|
||||
mako
|
||||
wofi
|
||||
rofi
|
||||
rofi-wayland
|
||||
# Control Tools
|
||||
pavucontrol
|
||||
playerctl
|
||||
|
||||
@@ -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