daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-09-19 14:37:19 -05:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:98dc2b807b2f9fefce8052abfd9c855082343e4a
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master
...
compare: daylin:ea0f6262a861b196c66af875637e2ad5805b6dc8
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master

6 commits
98dc2b807b ... ea0f6262a8

Author SHA1 Message Date
Daylin Morgan
ea0f6262a8
log message instead of noisy command ouptut 2024-08-08 15:08:11 -05:00
Daylin Morgan
a21b4b3c18
these packages weren't being used 2024-08-08 15:06:10 -05:00
Daylin Morgan
b5de96ccbf
don't autostart hyprland 2024-08-08 15:06:10 -05:00
Daylin Morgan
222ca60f3c
move derivations to module 2024-08-08 15:06:10 -05:00
Daylin Morgan
cf43fc941a
use optionals 2024-08-08 15:06:10 -05:00
daylin-bot
6de469a365 flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=ea728315410e220d73a993f17c83ae9dc9be9015' (2024-08-07)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=4b4971c06fb02df00a2bd20b6b47b5d0e7d799a7' (2024-08-08)
• Updated input 'lix':
    'ec7552ff74.tar.gz?narHash=sha256-fn8r4zVTCfLo1ruMbmzDB08N2giu3zWw/na2Jn/X6GQ%3D' (2024-08-07)
  → 'e03cd8b3a6.tar.gz?narHash=sha256-WRt4kYvg6cpnatF5zUCIUeurU67M7b4dk3oYdZ0cu9M%3D' (2024-08-08)
• Updated input 'nixos-wsl':
    'github:nix-community/NixOS-WSL/f373ad59ae5866f0f98216bd5c71526b373450d2' (2024-07-29)
  → 'github:nix-community/NixOS-WSL/be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690' (2024-08-08)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/2a13929e1f191b3690dd2f2db13098b04adb9043' (2024-08-06)
  → 'github:nixos/nixpkgs/f5129fb42b9c262318130a97b47516946da3e7d7' (2024-08-07)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/5acf5ce79d80e23a2426b8a553a4d4b5996fef46' (2024-08-07)
  → 'github:nix-community/nixpkgs-wayland/b412353cee03010813974408d5ae63f7422b176d' (2024-08-08)
• Updated input 'zig2nix':
    'github:Cloudef/zig2nix/5a0307b91ad2cd6c60fd5817b6a88108e254730a' (2024-08-07)
  → 'github:Cloudef/zig2nix/7320da37a4d45afb0aa94d22861a0fe07152c038' (2024-08-08)
 2024-08-08 19:04:01 +00:00
8 changed files with 47 additions and 45 deletions
Show stats Expand all files Collapse all files

3
.github/workflows/update.yml vendored
View file

@ -34,7 +34,8 @@ jobs:
- name: Update nix flake - name: Update nix flake
run: | run: |
printf '# Flake Lock\n\n```txt\n' >> $GITHUB_STEP_SUMMARY printf '# Flake Lock\n\n```txt\n' >> $GITHUB_STEP_SUMMARY
nix flake update --commit-lock-file 2>> $GITHUB_STEP_SUMMARY nix flake update --commit-lock-file
git show -s --format='%B' >> $GITHUB_STEP_SUMMARY
printf '```\n' >> $GITHUB_STEP_SUMMARY printf '```\n' >> $GITHUB_STEP_SUMMARY
- name: Pre-build oizys - name: Pre-build oizys

40
flake.lock
View file

@ -341,11 +341,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1723043089, "lastModified": 1723143710,
"narHash": "sha256-b01LQD32/xakBOFxabj8Mtz37ekvFwrM74VKNssUnko=", "narHash": "sha256-qbjodK+UgnQ2YdtKmuI1XEG84SZlid39rQo6Ap9NTqI=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "ea728315410e220d73a993f17c83ae9dc9be9015", "rev": "4b4971c06fb02df00a2bd20b6b47b5d0e7d799a7",
"revCount": 5067, "revCount": 5071,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -534,11 +534,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723036070, "lastModified": 1723140921,
"narHash": "sha256-fn8r4zVTCfLo1ruMbmzDB08N2giu3zWw/na2Jn/X6GQ=", "narHash": "sha256-WRt4kYvg6cpnatF5zUCIUeurU67M7b4dk3oYdZ0cu9M=",
"rev": "ec7552ff7411592305d28ec4bfcb4ea55866ab36", "rev": "e03cd8b3a6f70c60f359fd683c2b25f8eba4da0d",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ec7552ff7411592305d28ec4bfcb4ea55866ab36.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e03cd8b3a6f70c60f359fd683c2b25f8eba4da0d.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -663,11 +663,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1722253092, "lastModified": 1723124175,
"narHash": "sha256-37vyqHPx57deHhwvi4jwyNQLYkhm/rlVTYKOG1iahsc=", "narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "f373ad59ae5866f0f98216bd5c71526b373450d2", "rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -715,11 +715,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1723043911, "lastModified": 1723137378,
"narHash": "sha256-JAYd5Tq1AmrGK9MBup+WK6dq3rIvkpUHFAgBJ3d8irY=", "narHash": "sha256-+MkYW9iZwi0D0hLeS5S1Ov3VNJ3twdTlHW7dRKeiCBY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "5acf5ce79d80e23a2426b8a553a4d4b5996fef46", "rev": "b412353cee03010813974408d5ae63f7422b176d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -762,11 +762,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1722957468, "lastModified": 1723019560,
"narHash": "sha256-SQ0TCC4aklOhN/OzcztrKqDLY8SjpIZcyvTulzhDXs0=", "narHash": "sha256-O/kxmybNecC3Efr6ITOdtCzFv90/B2Iiedavj5aRWt0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2a13929e1f191b3690dd2f2db13098b04adb9043", "rev": "f5129fb42b9c262318130a97b47516946da3e7d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1156,11 +1156,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722993798, "lastModified": 1723080195,
"narHash": "sha256-cXzpRh+nUTBqo4mU+jzG4otZcpTfo29DC0apTmH2gtU=", "narHash": "sha256-0g2ljOHZZtEZZG9GKusKiNx1+VKm+MEKzCOL2KdkLRg=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "5a0307b91ad2cd6c60fd5817b6a88108e254730a", "rev": "7320da37a4d45afb0aa94d22861a0fe07152c038",
"type": "github" "type": "github"
}, },
"original": { "original": {

39
modules/desktop/window-managers/hyprland.nix
View file

@ -6,13 +6,6 @@
flake, flake,
... ...
}: }:
let
activate-snippet = ''
if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
exec Hyprland
fi
'';
in
mkOizysModule config "hyprland" { mkOizysModule config "hyprland" {
programs.hyprland = enabled; programs.hyprland = enabled;
@ -62,20 +55,30 @@ mkOizysModule config "hyprland" {
# #
# dunst # dunst
]); ]);
services.getty = {
extraArgs = [ "--skip-login" ];
loginOptions = "-p -- ${config.oizys.user}";
};
environment.etc = {
"bashrc.local".text = activate-snippet;
"zshenv.local".text = activate-snippet;
};
nixpkgs.overlays = [ nixpkgs.overlays = [
(flake.overlay "hyprland-contrib") (flake.overlay "hyprland-contrib")
# (overlayFrom "nixpkgs-wayland") # (overlayFrom "nixpkgs-wayland")
# (overlayFrom "hyprland") # (overlayFrom "hyprland")
]; ];
# using the below to autostart Hyprland
# broke my keybindings that were working before
# services.getty = {
# extraArgs = [ "--skip-login" ];
# loginOptions = "-p -- ${config.oizys.user}";
# };
#
# environment.etc =
# let
# activate-snippet = ''
# if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
# exec Hyprland
# fi
# '';
# in
# {
# "bashrc.local".text = activate-snippet;
# "zshenv.local".text = activate-snippet;
# };
#
} }

2
modules/languages/nushell.nix
View file

@ -12,8 +12,6 @@ in
config = mkIfIn "nushell" cfg { config = mkIfIn "nushell" cfg {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
nushell nushell
nufmt
nushellPlugins.polars
]; ];
}; };
} }

4
modules/llm/default.nix
View file

@ -8,8 +8,8 @@
let let
inherit (pkgs) python3Packages; inherit (pkgs) python3Packages;
llm-ollama = python3Packages.callPackage ../../pkgs/llm-plugins/llm-ollama { }; llm-ollama = python3Packages.callPackage ./llm-plugins/llm-ollama { };
llm-claude3 = python3Packages.callPackage ../../pkgs/llm-plugins/llm-claude-3 { }; llm-claude3 = python3Packages.callPackage ./llm-plugins/llm-claude-3 { };
llm = ( llm = (
pkgs.llm.withPlugins [ pkgs.llm.withPlugins [
llm-ollama llm-ollama

0
pkgs/llm-plugins/llm-claude-3/default.nix → modules/llm/llm-plugins/llm-claude-3/default.nix
View file

0
pkgs/llm-plugins/llm-ollama/default.nix → modules/llm/llm-plugins/llm-ollama/default.nix
View file

4
modules/nix-ld.nix
View file

@ -12,6 +12,7 @@ let
mkOption mkOption
literalExpression literalExpression
types types
optionals
; ;
cfg = config.oizys.nix-ld; cfg = config.oizys.nix-ld;
@ -103,8 +104,7 @@ in
config = config =
let let
libs = libs = defaultLibraries ++ cfg.extra-libraries ++ (optionals cfg.overkill.enable overkillLibraries);
defaultLibraries ++ cfg.extra-libraries ++ (if cfg.overkill.enable then overkillLibraries else [ ]);
in in
mkIf cfg.enable { mkIf cfg.enable {
programs.nix-ld = enabled // { programs.nix-ld = enabled // {