mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-24 11:50:45 -06:00
Compare commits
7 commits
3a14d3bb7e
...
05196cc93b
Author | SHA1 | Date | |
---|---|---|---|
05196cc93b | |||
58825dc6eb | |||
de50002f38 | |||
5fc5e370be | |||
98fe8b392f | |||
1996233a7f | |||
4da9ef467c |
14 changed files with 107 additions and 85 deletions
22
flake.lock
22
flake.lock
|
@ -498,11 +498,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1721756973,
|
||||
"narHash": "sha256-M7Zb3UfjQ0o3qXHolhykIk+QzfhEBcEYK9QAPSiBtW4=",
|
||||
"rev": "53f3e39815c3357c6465963359e94a6318b54af7",
|
||||
"lastModified": 1721841700,
|
||||
"narHash": "sha256-5aO0cXENUI/38xsG0ww0QSsVSlkvMvKfxbeYXYH08Es=",
|
||||
"rev": "8d12e0fbb7306cbc58b12ef051d7067d703738de",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/53f3e39815c3357c6465963359e94a6318b54af7.tar.gz"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8d12e0fbb7306cbc58b12ef051d7067d703738de.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
@ -679,11 +679,11 @@
|
|||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721691437,
|
||||
"narHash": "sha256-z3h4XqAdE1sqCdZxI9+gxLDEEbgGOVHIWZRMIjQheDo=",
|
||||
"lastModified": 1721918221,
|
||||
"narHash": "sha256-y5whWNY6QegCurAwLAGkpRYL+9vjrQquVXC4Jfel1bU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "79e1f9e956c60af6520c5f9d9e451e555a82da6f",
|
||||
"rev": "0d5730fd37f70c4e56f37ba6e81bfe0a89e9da26",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -774,11 +774,11 @@
|
|||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1721562059,
|
||||
"narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
|
||||
"lastModified": 1721743106,
|
||||
"narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
|
||||
"rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1160,6 +1160,7 @@
|
|||
"original": {
|
||||
"owner": "Cloudef",
|
||||
"repo": "zig2nix",
|
||||
"rev": "9ec43c3e2cfd195bc7cbe3924037788e72a958e3",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
@ -1184,6 +1185,7 @@
|
|||
"original": {
|
||||
"owner": "zigtools",
|
||||
"repo": "zls",
|
||||
"rev": "adf3b839b19df88c09877526007d8347ec982abb",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -27,12 +27,13 @@
|
|||
hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1&rev=300228b503b36e5977b0d58713c5b4cf1f07b8a9";
|
||||
hyprland-contrib.url = "github:hyprwm/contrib";
|
||||
|
||||
# zls build failure?
|
||||
zig2nix = {
|
||||
url = "github:Cloudef/zig2nix";
|
||||
url = "github:Cloudef/zig2nix/9ec43c3e2cfd195bc7cbe3924037788e72a958e3";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
zls = {
|
||||
url = "github:zigtools/zls";
|
||||
url = "github:zigtools/zls/adf3b839b19df88c09877526007d8347ec982abb";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
roc = {
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
enabled,
|
||||
...
|
||||
}:
|
||||
|
|
|
@ -1,35 +1,46 @@
|
|||
{ inputs, system }:
|
||||
{
|
||||
inputs,
|
||||
system,
|
||||
lib,
|
||||
}:
|
||||
let
|
||||
inherit (builtins) map;
|
||||
inherit (lib) pkgFromSystem pkgsFromSystem overlayFrom;
|
||||
pkgs = import inputs.nixpkgs {
|
||||
inherit system;
|
||||
overlays = [
|
||||
inputs.lix-module.overlays.default
|
||||
inputs.hyprland-contrib.overlays.default
|
||||
inputs.nixpkgs-wayland.overlay
|
||||
];
|
||||
overlays = map [
|
||||
"lix-module"
|
||||
"hyprland-contrib"
|
||||
"nixpkgs-wayland"
|
||||
] overlayFrom;
|
||||
};
|
||||
pkgsFrom = pkgsFromSystem system;
|
||||
pkgFrom = pkgFromSystem system;
|
||||
in
|
||||
{
|
||||
makePackages =
|
||||
pkgs.runCommandLocal "build-third-party"
|
||||
{
|
||||
src = ./.;
|
||||
nativeBuildInputs = [
|
||||
pkgs.pixi
|
||||
pkgs.swww
|
||||
pkgs.nixVersions.stable
|
||||
|
||||
inputs.hyprland.packages.${pkgs.system}.default
|
||||
inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
|
||||
|
||||
inputs.tsm.packages.${pkgs.system}.default
|
||||
inputs.hyprman.packages.${pkgs.system}.default
|
||||
|
||||
inputs.roc.packages.${pkgs.system}.full # cli + lang_server
|
||||
|
||||
inputs.zls.outputs.packages.${pkgs.system}.default
|
||||
inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin
|
||||
];
|
||||
nativeBuildInputs =
|
||||
[
|
||||
pkgs.pixi
|
||||
pkgs.swww
|
||||
pkgs.nixVersions.stable
|
||||
]
|
||||
++ (map [
|
||||
"tsm"
|
||||
"hyprman"
|
||||
"zls"
|
||||
] pkgFrom)
|
||||
++ (with pkgsFrom "hyprland"; [
|
||||
default
|
||||
xdg-desktop-portal-hyprland
|
||||
])
|
||||
++ [
|
||||
(pkgsFrom "roc").full
|
||||
(pkgsFrom "zig2nix").zig.master.bin
|
||||
];
|
||||
}
|
||||
''
|
||||
mkdir "$out"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
inputs@{ nixpkgs, self, ... }:
|
||||
let
|
||||
lib = nixpkgs.lib.extend (import ./extended.nix);
|
||||
lib = nixpkgs.lib.extend (import ./extended.nix inputs);
|
||||
|
||||
inherit (builtins) mapAttrs readDir listToAttrs;
|
||||
inherit (lib) genAttrs;
|
||||
|
@ -30,7 +30,7 @@ let
|
|||
checks = forAllSystems (
|
||||
pkgs:
|
||||
import ./checks.nix {
|
||||
inherit inputs;
|
||||
inherit inputs lib;
|
||||
system = pkgs.system;
|
||||
}
|
||||
);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
final: prev:
|
||||
inputs: final: prev:
|
||||
let
|
||||
inherit (builtins) listToAttrs substring filter;
|
||||
inherit (final)
|
||||
|
@ -71,6 +71,11 @@ let
|
|||
filterNotDefaultNixFile = paths: filter (p: !(isDefaultNixFile p) && (isNixFile p)) paths;
|
||||
listNixFilesRecursive = dir: filterNotDefaultNixFile (listFilesRecursive dir);
|
||||
|
||||
# defaultLinuxPackage = flake: flake.packages.x86_64-linux.default;
|
||||
# defaultPackageGeneric = system: flake: "${flake}.packages.${system}.default";
|
||||
pkgsFromSystem = system: flake: inputs."${flake}".packages."${system}";
|
||||
pkgFromSystem = system: flake: (pkgsFromSystem system flake).default;
|
||||
overlayFrom = flake: inputs."${flake}".overlays.default;
|
||||
in
|
||||
{
|
||||
inherit
|
||||
|
@ -85,5 +90,8 @@ in
|
|||
isNixFile
|
||||
listNixFilesRecursive
|
||||
flakeVer
|
||||
pkgsFromSystem
|
||||
pkgFromSystem
|
||||
overlayFrom
|
||||
;
|
||||
}
|
||||
|
|
|
@ -13,24 +13,25 @@ let
|
|||
mkOizysModule
|
||||
enabled
|
||||
enableAttrs
|
||||
pkgsFromSystem
|
||||
pkgFromSystem
|
||||
overlayFrom
|
||||
;
|
||||
inherit (lib.filesystem) listFilesRecursive;
|
||||
|
||||
pkgFrom = pkgFromSystem "x86_64-linux";
|
||||
pkgsFrom = pkgsFromSystem "x86_64-linux";
|
||||
|
||||
mkIso = nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
self.nixosModules.nix
|
||||
self.nixosModules.essentials
|
||||
(
|
||||
{
|
||||
self,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
{ pkgs, modulesPath, ... }:
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ];
|
||||
environment.systemPackages = (with pkgs; [ neovim ]) ++ [ self.packages.${pkgs.system}.default ];
|
||||
environment.systemPackages = (with pkgs; [ neovim ]) ++ [ (pkgFrom "self") ];
|
||||
}
|
||||
)
|
||||
];
|
||||
|
@ -64,6 +65,9 @@ let
|
|||
enabled
|
||||
enableAttrs
|
||||
hostName
|
||||
pkgFrom
|
||||
pkgsFrom
|
||||
overlayFrom
|
||||
;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
pkgFrom,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
@ -10,26 +10,26 @@ let
|
|||
in
|
||||
{
|
||||
config = mkIf config.oizys.desktop.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
wezterm
|
||||
alacritty
|
||||
environment.systemPackages =
|
||||
[ (pkgFrom "f1multiviewer") ]
|
||||
++ (with pkgs; [
|
||||
wezterm
|
||||
alacritty
|
||||
|
||||
xfce.thunar
|
||||
xfce.thunar
|
||||
|
||||
inkscape
|
||||
gimp
|
||||
inkscape
|
||||
gimp
|
||||
|
||||
zotero
|
||||
zotero
|
||||
|
||||
libreoffice-qt
|
||||
hunspell # spell check for libreoffice
|
||||
libreoffice-qt
|
||||
hunspell # spell check for libreoffice
|
||||
|
||||
(catppuccin-gtk.override {
|
||||
accents = [ "rosewater" ];
|
||||
variant = "mocha";
|
||||
})
|
||||
|
||||
inputs.f1multiviewer.outputs.packages.${pkgs.system}.default
|
||||
];
|
||||
(catppuccin-gtk.override {
|
||||
accents = [ "rosewater" ];
|
||||
variant = "mocha";
|
||||
})
|
||||
]);
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
config,
|
||||
mkOizysModule,
|
||||
enabled,
|
||||
pkgFrom,
|
||||
pkgsFrom,
|
||||
overlayFrom,
|
||||
...
|
||||
}:
|
||||
|
||||
|
@ -41,12 +43,10 @@ mkOizysModule config "hyprland" {
|
|||
|
||||
catppuccin-cursors.mochaDark
|
||||
])
|
||||
++ [
|
||||
inputs.hyprman.packages.${pkgs.system}.default
|
||||
]
|
||||
++ [ (pkgFrom "hyprman") ]
|
||||
|
||||
# swww-git is broken
|
||||
++ (with inputs.nixpkgs-wayland.packages.${pkgs.system}; [
|
||||
++ (with (pkgsFrom "nixpkgs-wayland"); [
|
||||
mako
|
||||
eww
|
||||
wlr-randr
|
||||
|
@ -56,8 +56,8 @@ mkOizysModule config "hyprland" {
|
|||
]);
|
||||
|
||||
nixpkgs.overlays = [
|
||||
inputs.hyprland-contrib.overlays.default
|
||||
# inputs.nixpkgs-wayland.overlay
|
||||
# inputs.hyprland.overlays.default
|
||||
(overlayFrom "hyprland-contrib")
|
||||
# (overlayFrom "nixpkgs-wayland")
|
||||
# (overlayFrom "hyprland")
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
config,
|
||||
enabled,
|
||||
mkDefaultOizysModule,
|
||||
pkgFrom,
|
||||
...
|
||||
}:
|
||||
mkDefaultOizysModule config "cli" {
|
||||
|
@ -35,5 +35,5 @@ mkDefaultOizysModule config "cli" {
|
|||
btop
|
||||
gdu
|
||||
])
|
||||
++ [ inputs.tsm.packages.${pkgs.system}.tsm ];
|
||||
++ [ (pkgFrom "tsm") ];
|
||||
}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
inputs,
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
pkgFrom,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
@ -10,7 +10,7 @@ let
|
|||
cfg = config.oizys.languages;
|
||||
|
||||
python = pkgs.python3.withPackages (ps: with ps; [ pip ]);
|
||||
pixi = inputs.pixi.packages.${pkgs.system}.default;
|
||||
pixi = pkgFrom "pixi";
|
||||
in
|
||||
{
|
||||
config = mkIfIn "python" cfg {
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
pkgsFrom,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
@ -10,14 +10,13 @@ let
|
|||
|
||||
version = flakeVer inputs.roc;
|
||||
cfg = config.oizys.languages;
|
||||
rocPkgs = inputs.roc.packages.${pkgs.system};
|
||||
rocPkgs = pkgsFrom "roc";
|
||||
# I'm setting the versions so the changes are more apparent as flake is updated
|
||||
roc = rocPkgs.cli.overrideAttrs {
|
||||
inherit version;
|
||||
|
||||
};
|
||||
lang-server = rocPkgs.lang-server.overrideAttrs { inherit version; };
|
||||
|
||||
in
|
||||
{
|
||||
config = mkIfIn "roc" cfg {
|
||||
|
|
|
@ -1,17 +1,15 @@
|
|||
{
|
||||
inputs,
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
pkgsFrom,
|
||||
pkgFrom,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) mkIfIn;
|
||||
cfg = config.oizys.languages;
|
||||
zig = inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin;
|
||||
zls = inputs.zls.outputs.packages.${pkgs.system}.default.overrideAttrs {
|
||||
nativeBuildInputs = [ zig ];
|
||||
};
|
||||
zig = (pkgsFrom "zig2nix").zig.master.bin;
|
||||
zls = (pkgFrom "zls").overrideAttrs { nativeBuildInputs = [ zig ]; };
|
||||
in
|
||||
{
|
||||
config = mkIfIn "zig" cfg {
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
inputs,
|
||||
self,
|
||||
pkgs,
|
||||
lib,
|
||||
enabled,
|
||||
pkgFrom,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
@ -31,7 +31,7 @@ in
|
|||
pkgs.nixfmt-rfc-style
|
||||
pkgs.nix-output-monitor
|
||||
|
||||
self.packages.${pkgs.system}.default
|
||||
(pkgFrom "self")
|
||||
];
|
||||
|
||||
programs.nix-index-database.comma = enabled;
|
||||
|
|
Loading…
Reference in a new issue