mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-23 06:50:45 -06:00
Compare commits
1 commit
4e9951b3ad
...
276283657f
| Author | SHA1 | Date | |
|---|---|---|---|
| 276283657f |
8 changed files with 57 additions and 173 deletions
112
flake.lock
112
flake.lock
|
|
@ -249,11 +249,11 @@
|
|||
"systems": "systems_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -363,11 +363,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729378105,
|
||||
"narHash": "sha256-pcrrLHaHXct4I985PZhNZVYLghwZvQnnjGNToL56DFY=",
|
||||
"lastModified": 1729195555,
|
||||
"narHash": "sha256-nTMzcwH5eFX2JM5Lrtw1469BRe6hGgWWxLqJBynEdvo=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "08cc063e175e48cea44d26b7e3762f4b8611f0c5",
|
||||
"revCount": 5362,
|
||||
"rev": "0e630e9e74ad34683194a07cfe6afe55a2c0685f",
|
||||
"revCount": 5352,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
|
@ -452,17 +452,16 @@
|
|||
},
|
||||
"hyprman": {
|
||||
"inputs": {
|
||||
"nim2nix": "nim2nix",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729435058,
|
||||
"narHash": "sha256-eGikARBVu4R3Lf9jltmJ6u/z1vf2JOiUhvPsOXhZkcE=",
|
||||
"lastModified": 1718917071,
|
||||
"narHash": "sha256-Ub3xTWzWry05O+Kqxdeob+Zp5mq4tI8KTbvwDzEHINE=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "795e6941f83daef55ac957a7136a45abf050fb78",
|
||||
"revCount": 6,
|
||||
"rev": "bc50f371874a64749209bfb6e650b87c4067b0e2",
|
||||
"revCount": 16,
|
||||
"type": "git",
|
||||
"url": "https://git.dayl.in/daylin/hyprman.git"
|
||||
},
|
||||
|
|
@ -527,11 +526,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729426412,
|
||||
"narHash": "sha256-VGbpECf35W4LtWLfx2+ue8zZEPwKQnadJadlT8E1Ceo=",
|
||||
"lastModified": 1728821524,
|
||||
"narHash": "sha256-Tc4g0n0WxGLLUJYJwrhSE3/l05xUcREEx9y+R4Gi4RA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lib-aggregate",
|
||||
"rev": "736c43de3c953104e1610183d56e90b419c6344e",
|
||||
"rev": "8921856c37862428741a29cfd4c98c4893ca407d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -543,11 +542,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1729367266,
|
||||
"narHash": "sha256-2MMOfmsdggnzNeJ3KseUYZfSFoV7AOacB8sKXC6OqmE=",
|
||||
"rev": "0ff8f9132552e03497b07e1e5c068660a7a04515",
|
||||
"lastModified": 1729273043,
|
||||
"narHash": "sha256-fyy79VMuwOrcWYMywKQAIkyxP12sq2kXoiEXQ8b4FHE=",
|
||||
"rev": "e2d00ac3a805bef7af8e7ec765af0d8ba34f4b3c",
|
||||
"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": {
|
||||
"type": "tarball",
|
||||
|
|
@ -580,7 +579,6 @@
|
|||
"nim2nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprman",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
|
|
@ -599,26 +597,6 @@
|
|||
}
|
||||
},
|
||||
"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": {
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
|
|
@ -636,7 +614,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nim2nix_4": {
|
||||
"nim2nix_3": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"utils",
|
||||
|
|
@ -707,11 +685,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729394935,
|
||||
"narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=",
|
||||
"lastModified": 1728790083,
|
||||
"narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "04f8a11f247ba00263b060fbcdc95484fd046104",
|
||||
"rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -752,11 +730,11 @@
|
|||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729300178,
|
||||
"narHash": "sha256-mkAPu2o5u7F/glAAfBzDji726iL1u2pm2fyN1SPWRQk=",
|
||||
"lastModified": 1729203674,
|
||||
"narHash": "sha256-WKB5NhenAnCXLK4zb5+qXYaBdh6th1DrdUj599HwvCw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"rev": "42c23a6d5a2a1cbfd3fd137a7ff3d47c6d718033",
|
||||
"rev": "c75a9a62b283c67f5805ea5fd65de994c45872bc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -783,11 +761,11 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1729386149,
|
||||
"lastModified": 1728781282,
|
||||
"narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "cce4521b6df014e79a7b7afc58c703ed683c916e",
|
||||
"rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -820,11 +798,11 @@
|
|||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729437727,
|
||||
"narHash": "sha256-T7R1ZmK8H8LH4losXinI/CvX2mvrt9bGDDdoUdUzp6g=",
|
||||
"lastModified": 1729280453,
|
||||
"narHash": "sha256-zPaNAvtXKxBbowFof5v6yQLbZWSkUBchHeh4VdO+8MQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "d867d1b9f8adc3178db34ae309cf7c6e840991b2",
|
||||
"rev": "2535bdde0505a065b46a68218fc1a1e7ef075c93",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -867,11 +845,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1729256560,
|
||||
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
|
||||
"lastModified": 1729070438,
|
||||
"narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
|
||||
"rev": "5785b6bb5eaae44e627d541023034e1601455827",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -899,11 +877,11 @@
|
|||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1729256560,
|
||||
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
|
||||
"lastModified": 1729070438,
|
||||
"narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
|
||||
"rev": "5785b6bb5eaae44e627d541023034e1601455827",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1021,7 +999,7 @@
|
|||
"hyprman": "hyprman",
|
||||
"lix": "lix",
|
||||
"lix-module": "lix-module",
|
||||
"nim2nix": "nim2nix_2",
|
||||
"nim2nix": "nim2nix",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixos-wsl": "nixos-wsl",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
|
|
@ -1201,7 +1179,7 @@
|
|||
},
|
||||
"tsm": {
|
||||
"inputs": {
|
||||
"nim2nix": "nim2nix_3",
|
||||
"nim2nix": "nim2nix_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
|
|
@ -1224,7 +1202,7 @@
|
|||
},
|
||||
"utils": {
|
||||
"inputs": {
|
||||
"nim2nix": "nim2nix_4",
|
||||
"nim2nix": "nim2nix_3",
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -1291,11 +1269,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729339835,
|
||||
"narHash": "sha256-E7BK/IY4j9aLcWyo290ya5MmfBhFWgBBkHg69AqRcJw=",
|
||||
"lastModified": 1729211368,
|
||||
"narHash": "sha256-AXe8rHABlJ0oS89L8vNJs//vjkZKqDpAE1kQc5XX40U=",
|
||||
"owner": "mitchellh",
|
||||
"repo": "zig-overlay",
|
||||
"rev": "5aa48f75dcfd6a4f46bd6e0a1cb263652e25e4ec",
|
||||
"rev": "9e394110c194a39eb3120845a2d9a1ffaea01394",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1316,11 +1294,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729353227,
|
||||
"narHash": "sha256-0WkHLHLxgFVgNJi32zcrrx3O+n83dupdleIVJlnHL/k=",
|
||||
"lastModified": 1728753797,
|
||||
"narHash": "sha256-VRqZE/2pItRwHdAMNvVJC9zy8FpROMQ3whps4m8tea8=",
|
||||
"owner": "zigtools",
|
||||
"repo": "zls",
|
||||
"rev": "a6bdd0bb5653ca316d96aa8f94395c98a9ffb4e1",
|
||||
"rev": "66f0f90ec5468fbea1f7b65451eff5ca70d8f305",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@
|
|||
// (
|
||||
''
|
||||
vpn|desktop|hyprland|chrome
|
||||
backups|hp-scanner|llm
|
||||
podman|docker|vbox
|
||||
docker|vbox|backups|hp-scanner|llm
|
||||
''
|
||||
|> listify
|
||||
|> enableAttrs
|
||||
);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
environment.systemPackages =
|
||||
[ (flake.pkg "utils") ]
|
||||
++ (with pkgs; [
|
||||
distrobox
|
||||
zk
|
||||
quarto
|
||||
cachix
|
||||
|
|
|
|||
|
|
@ -32,13 +32,12 @@ mkOizysModule config "hyprland" {
|
|||
ksnip
|
||||
wl-clipboard
|
||||
rofi-wayland
|
||||
pwvucontrol
|
||||
pavucontrol
|
||||
|
||||
#hypr ecosystem
|
||||
hyprlock
|
||||
hypridle
|
||||
|
||||
# wallpapers
|
||||
swww
|
||||
|
||||
catppuccin-cursors.mochaDark
|
||||
|
|
@ -53,21 +52,22 @@ mkOizysModule config "hyprland" {
|
|||
mako
|
||||
eww
|
||||
wlr-randr
|
||||
# swww
|
||||
#
|
||||
# dunst
|
||||
]);
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(flake.overlay "hyprland-contrib")
|
||||
# (overlayFrom "nixpkgs-wayland")
|
||||
# (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}";
|
||||
# };
|
||||
|
||||
services.getty = {
|
||||
extraArgs = [ "--skip-login" ];
|
||||
loginOptions = "-p -- ${config.oizys.user}";
|
||||
};
|
||||
|
||||
# environment.etc =
|
||||
# let
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ in
|
|||
|
||||
virtualbox
|
||||
docker
|
||||
podman
|
||||
|
||||
gui
|
||||
fonts
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
}
|
||||
|
|
@ -3,5 +3,4 @@
|
|||
nph = pkgs.callPackage ./nim/nph { }; # doesn't compile with 2.2.0 :/
|
||||
nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
|
||||
nimble = pkgs.callPackage ./nim/nimble { };
|
||||
distrobox = pkgs.callPackage ./distrobox {};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
};
|
||||
})
|
||||
Loading…
Reference in a new issue