Compare commits
4 commits
2f6a961d28
...
ec923b007f
Author | SHA1 | Date | |
---|---|---|---|
ec923b007f | |||
d185e489cf | |||
3f7d0e58fe | |||
d37ff3ecf6 |
10 changed files with 91 additions and 18 deletions
2
Justfile
2
Justfile
|
@ -7,7 +7,7 @@ defuser := env_var('USER')
|
|||
alias dh := deployhome
|
||||
[group('home')]
|
||||
deployhome user=defuser host=defhost:
|
||||
nh home switch -c {{user}}@{{host}} -b bak .
|
||||
nh home switch -c {{user}}@{{host}} -b bak . -- --impure
|
||||
|
||||
[group('home')]
|
||||
refreshhome:
|
||||
|
|
53
flake.lock
53
flake.lock
|
@ -7,11 +7,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732016537,
|
||||
"narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=",
|
||||
"lastModified": 1732324260,
|
||||
"narHash": "sha256-0xzQvoId/P008QkTSAdFVv465P9rL9nYkIOWXL5pdsY=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4",
|
||||
"rev": "698a62c628c2ec423aa770d8ec0e1d0bcf4fca1a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -149,7 +149,7 @@
|
|||
},
|
||||
"flake-utils-plus_2": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_4"
|
||||
"flake-utils": "flake-utils_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715533576,
|
||||
|
@ -203,6 +203,21 @@
|
|||
}
|
||||
},
|
||||
"flake-utils_4": {
|
||||
"locked": {
|
||||
"lastModified": 1659877975,
|
||||
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_5": {
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
},
|
||||
|
@ -298,11 +313,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732025103,
|
||||
"narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
|
||||
"lastModified": 1732303962,
|
||||
"narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "a46e702093a5c46e192243edbd977d5749e7f294",
|
||||
"rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -377,7 +392,7 @@
|
|||
"narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
|
||||
"rev": "9098ac95768f7006d7e070b88bae76939f6034e6",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
@ -445,6 +460,27 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixgl": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713543440,
|
||||
"narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixGL",
|
||||
"rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixGL",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1732014248,
|
||||
|
@ -536,6 +572,7 @@
|
|||
"home-manager": "home-manager",
|
||||
"lix": "lix",
|
||||
"marleyvim": "marleyvim",
|
||||
"nixgl": "nixgl",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"rofi-themes": "rofi-themes",
|
||||
"rose-pine": "rose-pine",
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
overlays = with inputs; [
|
||||
lix.overlays.default
|
||||
marleyvim.overlays.default
|
||||
marleyvim.overlays.default
|
||||
];
|
||||
|
||||
systems.modules.darwin = with inputs; [
|
||||
|
@ -62,6 +62,11 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nixgl = {
|
||||
url = "github:nix-community/nixGL";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
rose-pine.url = "git+https://codewith.babesonthe.net/punkfairie/rose-pine-nix";
|
||||
|
||||
marleyvim = {
|
||||
|
|
|
@ -22,6 +22,7 @@ in
|
|||
|
||||
marleyos = {
|
||||
isDesktop = true;
|
||||
nixGL = enabled;
|
||||
|
||||
appearance = {
|
||||
base = enabled;
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
|
@ -9,8 +7,6 @@ let
|
|||
inherit (lib) mkIf;
|
||||
inherit (lib.snowfall.system) is-linux;
|
||||
inherit (lib.marleyos) enabled;
|
||||
|
||||
isGenericLinux = config.targets.genericLinux.enable;
|
||||
in
|
||||
{
|
||||
# Anything in this folder should not include an enable/disable option. This is
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
_:
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
config = {
|
||||
nix = {
|
||||
package = pkgs.lix;
|
||||
|
||||
# Enable flakes.
|
||||
settings.experimental-features = [
|
||||
"nix-command"
|
||||
|
@ -17,5 +19,13 @@ _:
|
|||
gc.automatic = true;
|
||||
};
|
||||
|
||||
nixpkgs.config.import = "${config.xdg.configHome}/nixpkgs/config.nix";
|
||||
|
||||
xdg.configFile."nixpkgs/config.nix".text = # nix
|
||||
''
|
||||
{
|
||||
allowUnfree = true;
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
21
modules/home/nixgl/default.nix
Normal file
21
modules/home/nixgl/default.nix
Normal file
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) mkEnableOption mkIf;
|
||||
|
||||
cfg = config.marleyos.nixGL;
|
||||
in
|
||||
{
|
||||
options.marleyos.nixGL.enable = mkEnableOption "nixGL";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
nixGL = {
|
||||
inherit (inputs.nixgl) packages;
|
||||
defaultWrapper = "nvidia";
|
||||
};
|
||||
};
|
||||
}
|
|
@ -15,7 +15,9 @@ in
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
programs.cava = {
|
||||
enable = true;
|
||||
# FIX: Re-enable once https://github.com/NixOS/nixpkgs/pull/355948 is
|
||||
# ported to nixpkgs/unstable
|
||||
enable = false;
|
||||
|
||||
rose-pine = mkIf colors.isRosePine enabled;
|
||||
|
||||
|
|
|
@ -22,8 +22,8 @@ in
|
|||
programs.wezterm = {
|
||||
enable = true;
|
||||
|
||||
# Non-NixOS Linux systems don't have proper GPU integration, so we
|
||||
# unfortunately need to use the native package manager version.
|
||||
# Generic linux: NixGL makes Wezterm shit the bed for some reason.
|
||||
# macOS: Prefer brew cask so a proper Applications shortcut is made.
|
||||
package = mkIf isNotNixOS pkgs.emptyDirectory;
|
||||
|
||||
# TODO: create `local config` & return it seperately, so other modules can
|
||||
|
|
|
@ -20,6 +20,7 @@ in
|
|||
|
||||
services.polybar = {
|
||||
enable = true;
|
||||
package = config.lib.nixGL.wrap pkgs.polybar;
|
||||
|
||||
script = # bash
|
||||
''
|
||||
|
|
Loading…
Reference in a new issue