daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-23 11:00:44 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:4e9951b3ade7800456bd7fbc589db6d6608ceaf7
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:276283657f87f021ab2192a6375ec567403aa2c5
Branches Tags
daylin:flake-lock
daylin:main

1 commit
4e9951b3ad ... 276283657f

Author SHA1 Message Date
daylin-bot
276283657f flake.lock: Update 
Flake lock file updates:

• Updated input 'f1multiviewer':
    'github:daylinmorgan/f1multiviewer-flake/fb4a3f5dd59c80aa3a210d8ea1ae77f2da0d39ca' (2024-09-19)
  → 'github:daylinmorgan/f1multiviewer-flake/58cc1fd579116b7b49522dd35fe8eddef3e64ecd' (2024-10-18)
• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=01c2ff34ddcb5995409c33c2b549e93b98b56d6b' (2024-10-14)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=0e630e9e74ad34683194a07cfe6afe55a2c0685f' (2024-10-17)
• Updated input 'hyprland/aquamarine':
    'github:hyprwm/aquamarine/65dd97b5d21e917295159bbef1d52e06963f4eb0' (2024-10-07)
  → 'github:hyprwm/aquamarine/9874e08eec85b5542ca22494e127b0cdce46b786' (2024-10-14)
• Updated input 'hyprland/hyprcursor':
    'github:hyprwm/hyprcursor/d60e1e01e6e6633ef1c87148b9137cc1dd39263d' (2024-10-01)
  → 'github:hyprwm/hyprcursor/0264e698149fcb857a66a53018157b41f8d97bb0' (2024-10-11)
• Updated input 'hyprland/hyprutils':
    'github:hyprwm/hyprutils/3f5293432b6dc6a99f26aca2eba3876d2660665c' (2024-09-25)
  → 'github:hyprwm/hyprutils/fd4be8b9ca932f7384e454bcd923c5451ef2aa85' (2024-10-14)
• Updated input 'hyprland/nixpkgs':
    'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb' (2024-10-04)
  → 'github:NixOS/nixpkgs/a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c' (2024-10-14)
• Updated input 'hyprland/pre-commit-hooks':
    'github:cachix/git-hooks.nix/1211305a5b237771e13fcca0c51e60ad47326a9a' (2024-10-05)
  → 'github:cachix/git-hooks.nix/ff68f91754be6f3427e4986d7949e6273659be1d' (2024-10-13)
• Updated input 'hyprland-contrib':
    'github:hyprwm/contrib/1e531dc49ad36c88b45bf836081a7a2c8927e072' (2024-09-05)
  → 'github:hyprwm/contrib/d72bc8b1cd30d448bd438e8328f8eeb4c0f2ddb6' (2024-10-18)
• Updated input 'lix':
    'f6077314fa.tar.gz?narHash=sha256-vUBgL8zJBDyj2serxdEVbNqe6pBN4YgWwhtg3XP8mpQ%3D&rev=f6077314fa6aff862758095bb55fe844e9162a1d' (2024-10-15)
  → 'e2d00ac3a8.tar.gz?narHash=sha256-fyy79VMuwOrcWYMywKQAIkyxP12sq2kXoiEXQ8b4FHE%3D&rev=e2d00ac3a805bef7af8e7ec765af0d8ba34f4b3c' (2024-10-18)
• Updated input 'nixos-wsl':
    'github:nix-community/NixOS-WSL/66bbd8fb32b6bb513ec093323081747945bb5f08' (2024-10-14)
  → 'github:nix-community/NixOS-WSL/c75a9a62b283c67f5805ea5fd65de994c45872bc' (2024-10-17)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c' (2024-10-14)
  → 'github:nixos/nixpkgs/5785b6bb5eaae44e627d541023034e1601455827' (2024-10-16)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/9b5a5691436324f6b4eed2211af688551a6071e9' (2024-10-15)
  → 'github:nix-community/nixpkgs-wayland/2535bdde0505a065b46a68218fc1a1e7ef075c93' (2024-10-18)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c' (2024-10-14)
  → 'github:nixos/nixpkgs/5785b6bb5eaae44e627d541023034e1601455827' (2024-10-16)
• Updated input 'pixi':
    'github:daylinmorgan/pixi-flake/3f32c9b543a97f16a754958bb9c39e4656393e66' (2024-10-08)
  → 'github:daylinmorgan/pixi-flake/6b3c0d4fcc548210c24f3728ab855f60c05ef159' (2024-10-17)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/5ac92b761d82da9234331db0cf03dba231f59f50' (2024-10-15)
  → 'github:mitchellh/zig-overlay/9e394110c194a39eb3120845a2d9a1ffaea01394' (2024-10-18)
 2024-10-18 23:20:22 +00:00
8 changed files with 57 additions and 173 deletions
Show stats Expand all files Collapse all files

112
flake.lock
View file

@ -249,11 +249,11 @@
"systems": "systems_7" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1710146030,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -363,11 +363,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1729378105, "lastModified": 1729195555,
"narHash": "sha256-pcrrLHaHXct4I985PZhNZVYLghwZvQnnjGNToL56DFY=", "narHash": "sha256-nTMzcwH5eFX2JM5Lrtw1469BRe6hGgWWxLqJBynEdvo=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "08cc063e175e48cea44d26b7e3762f4b8611f0c5", "rev": "0e630e9e74ad34683194a07cfe6afe55a2c0685f",
"revCount": 5362, "revCount": 5352,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -452,17 +452,16 @@
}, },
"hyprman": { "hyprman": {
"inputs": { "inputs": {
"nim2nix": "nim2nix",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1729435058, "lastModified": 1718917071,
"narHash": "sha256-eGikARBVu4R3Lf9jltmJ6u/z1vf2JOiUhvPsOXhZkcE=", "narHash": "sha256-Ub3xTWzWry05O+Kqxdeob+Zp5mq4tI8KTbvwDzEHINE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "795e6941f83daef55ac957a7136a45abf050fb78", "rev": "bc50f371874a64749209bfb6e650b87c4067b0e2",
"revCount": 6, "revCount": 16,
"type": "git", "type": "git",
"url": "https://git.dayl.in/daylin/hyprman.git" "url": "https://git.dayl.in/daylin/hyprman.git"
}, },
@ -527,11 +526,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1729426412, "lastModified": 1728821524,
"narHash": "sha256-VGbpECf35W4LtWLfx2+ue8zZEPwKQnadJadlT8E1Ceo=", "narHash": "sha256-Tc4g0n0WxGLLUJYJwrhSE3/l05xUcREEx9y+R4Gi4RA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "736c43de3c953104e1610183d56e90b419c6344e", "rev": "8921856c37862428741a29cfd4c98c4893ca407d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -543,11 +542,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729367266, "lastModified": 1729273043,
"narHash": "sha256-2MMOfmsdggnzNeJ3KseUYZfSFoV7AOacB8sKXC6OqmE=", "narHash": "sha256-fyy79VMuwOrcWYMywKQAIkyxP12sq2kXoiEXQ8b4FHE=",
"rev": "0ff8f9132552e03497b07e1e5c068660a7a04515", "rev": "e2d00ac3a805bef7af8e7ec765af0d8ba34f4b3c",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/0ff8f9132552e03497b07e1e5c068660a7a04515.tar.gz?rev=0ff8f9132552e03497b07e1e5c068660a7a04515" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e2d00ac3a805bef7af8e7ec765af0d8ba34f4b3c.tar.gz?rev=e2d00ac3a805bef7af8e7ec765af0d8ba34f4b3c"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -580,7 +579,6 @@
"nim2nix": { "nim2nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprman",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -599,26 +597,6 @@
} }
}, },
"nim2nix_2": { "nim2nix_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1725469705,
"narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=",
"owner": "daylinmorgan",
"repo": "nim2nix",
"rev": "42af12ca45025c7146bc24e27f5d8b65b003d663",
"type": "github"
},
"original": {
"owner": "daylinmorgan",
"repo": "nim2nix",
"type": "github"
}
},
"nim2nix_3": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
@ -636,7 +614,7 @@
"type": "github" "type": "github"
} }
}, },
"nim2nix_4": { "nim2nix_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"utils", "utils",
@ -707,11 +685,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729394935, "lastModified": 1728790083,
"narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=", "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "04f8a11f247ba00263b060fbcdc95484fd046104", "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -752,11 +730,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1729300178, "lastModified": 1729203674,
"narHash": "sha256-mkAPu2o5u7F/glAAfBzDji726iL1u2pm2fyN1SPWRQk=", "narHash": "sha256-WKB5NhenAnCXLK4zb5+qXYaBdh6th1DrdUj599HwvCw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "42c23a6d5a2a1cbfd3fd137a7ff3d47c6d718033", "rev": "c75a9a62b283c67f5805ea5fd65de994c45872bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -783,11 +761,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1729386149, "lastModified": 1728781282,
"narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -820,11 +798,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1729437727, "lastModified": 1729280453,
"narHash": "sha256-T7R1ZmK8H8LH4losXinI/CvX2mvrt9bGDDdoUdUzp6g=", "narHash": "sha256-zPaNAvtXKxBbowFof5v6yQLbZWSkUBchHeh4VdO+8MQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "d867d1b9f8adc3178db34ae309cf7c6e840991b2", "rev": "2535bdde0505a065b46a68218fc1a1e7ef075c93",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -867,11 +845,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1729256560, "lastModified": 1729070438,
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "rev": "5785b6bb5eaae44e627d541023034e1601455827",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -899,11 +877,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1729256560, "lastModified": 1729070438,
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "rev": "5785b6bb5eaae44e627d541023034e1601455827",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1021,7 +999,7 @@
"hyprman": "hyprman", "hyprman": "hyprman",
"lix": "lix", "lix": "lix",
"lix-module": "lix-module", "lix-module": "lix-module",
"nim2nix": "nim2nix_2", "nim2nix": "nim2nix",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
@ -1201,7 +1179,7 @@
}, },
"tsm": { "tsm": {
"inputs": { "inputs": {
"nim2nix": "nim2nix_3", "nim2nix": "nim2nix_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -1224,7 +1202,7 @@
}, },
"utils": { "utils": {
"inputs": { "inputs": {
"nim2nix": "nim2nix_4", "nim2nix": "nim2nix_3",
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
@ -1291,11 +1269,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729339835, "lastModified": 1729211368,
"narHash": "sha256-E7BK/IY4j9aLcWyo290ya5MmfBhFWgBBkHg69AqRcJw=", "narHash": "sha256-AXe8rHABlJ0oS89L8vNJs//vjkZKqDpAE1kQc5XX40U=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "5aa48f75dcfd6a4f46bd6e0a1cb263652e25e4ec", "rev": "9e394110c194a39eb3120845a2d9a1ffaea01394",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1316,11 +1294,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729353227, "lastModified": 1728753797,
"narHash": "sha256-0WkHLHLxgFVgNJi32zcrrx3O+n83dupdleIVJlnHL/k=", "narHash": "sha256-VRqZE/2pItRwHdAMNvVJC9zy8FpROMQ3whps4m8tea8=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "a6bdd0bb5653ca316d96aa8f94395c98a9ffb4e1", "rev": "66f0f90ec5468fbea1f7b65451eff5ca70d8f305",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
hosts/othalan/default.nix
View file

@ -18,10 +18,10 @@
// ( // (
'' ''
vpn|desktop|hyprland|chrome vpn|desktop|hyprland|chrome
backups|hp-scanner|llm docker|vbox|backups|hp-scanner|llm
podman|docker|vbox
'' ''
|> listify |> listify
|> enableAttrs |> enableAttrs
); );
} }

1
hosts/othalan/pkgs.nix
View file

@ -3,7 +3,6 @@
environment.systemPackages = environment.systemPackages =
[ (flake.pkg "utils") ] [ (flake.pkg "utils") ]
++ (with pkgs; [ ++ (with pkgs; [
distrobox
zk zk
quarto quarto
cachix cachix

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

@ -32,13 +32,12 @@ mkOizysModule config "hyprland" {
ksnip ksnip
wl-clipboard wl-clipboard
rofi-wayland rofi-wayland
pwvucontrol pavucontrol
#hypr ecosystem #hypr ecosystem
hyprlock hyprlock
hypridle hypridle
# wallpapers
swww swww
catppuccin-cursors.mochaDark catppuccin-cursors.mochaDark
@ -53,21 +52,22 @@ mkOizysModule config "hyprland" {
mako mako
eww eww
wlr-randr wlr-randr
# swww
#
# dunst
]); ]);
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 # using the below to autostart Hyprland
# broke my keybindings that were working before # broke my keybindings that were working before
#
# services.getty = { services.getty = {
# extraArgs = [ "--skip-login" ]; extraArgs = [ "--skip-login" ];
# loginOptions = "-p -- ${config.oizys.user}"; loginOptions = "-p -- ${config.oizys.user}";
# }; };
# environment.etc = # environment.etc =
# let # let

1
modules/oizys.nix
View file

@ -26,7 +26,6 @@ in
virtualbox virtualbox
docker docker
podman
gui gui
fonts fonts

27
modules/virtualization/podman.nix
View file

@ -1,27 +0,0 @@
{
config,
pkgs,
mkOizysModule,
enabled,
...
}:
mkOizysModule config "podman" {
# I'm not sure what this is doing, but it was in the old wiki...
# Enable common container config files in /etc/containers
virtualisation.containers = enabled;
virtualisation = {
podman = enabled // {
# Create a `docker` alias for podman, to use it as a drop-in replacement
# dockerCompat = true;
# Required for containers under podman-compose to be able to talk to each other.
defaultNetwork.settings.dns_enabled = true;
};
};
environment.systemPackages = with pkgs; [
podman-tui # status of containers in the terminal
podman-compose # start group of containers for dev
];
}

1
pkgs/default.nix
View file

@ -3,5 +3,4 @@
nph = pkgs.callPackage ./nim/nph { }; # doesn't compile with 2.2.0 :/ nph = pkgs.callPackage ./nim/nph { }; # doesn't compile with 2.2.0 :/
nimlangserver = pkgs.callPackage ./nim/nimlangserver { }; nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
nimble = pkgs.callPackage ./nim/nimble { }; nimble = pkgs.callPackage ./nim/nimble { };
distrobox = pkgs.callPackage ./distrobox {};
} }

64
pkgs/distrobox/default.nix
View file

@ -1,64 +0,0 @@
{
stdenvNoCC,
lib,
fetchFromGitHub,
makeWrapper,
wget,
installShellFiles,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "distrobox";
version = "1.8.0";
src = fetchFromGitHub {
owner = "89luca89";
repo = "distrobox";
rev = finalAttrs.version;
hash = "sha256-e9oSTk+UlkrkRSipqjjMqwtxEvEZffVBmlSTmsIT7cU=";
};
dontConfigure = true;
dontBuild = true;
nativeBuildInputs = [ makeWrapper installShellFiles];
installPhase = ''
runHook preInstall
# https://github.com/89luca89/distrobox/issues/408
substituteInPlace ./distrobox-generate-entry \
--replace-fail 'icon_default="''${XDG_DATA_HOME:-''${HOME}/.local/share}' "icon_default=\"$out"
./install -P $out
runHook postInstall
'';
# https://github.com/89luca89/distrobox/issues/407
postFixup = ''
wrapProgram "$out/bin/distrobox-generate-entry" \
--prefix PATH ":" ${lib.makeBinPath [ wget ]}
mkdir -p $out/share/distrobox
echo 'container_additional_volumes="/nix:/nix"' > $out/share/distrobox/distrobox.conf
'';
postInstall = ''
ls completions/zsh
installShellCompletion --cmd distrbox --zsh completions/zsh/_distrobox
'';
meta = with lib; {
description = "Wrapper around podman or docker to create and start containers";
longDescription = ''
Use any linux distribution inside your terminal. Enable both backward and
forward compatibility with software and freedom to use whatever distribution
you’re more comfortable with
'';
homepage = "https://distrobox.it/";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ atila ];
};
})