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

Compare commits

base: daylin:b275fb7f9c59e6e1e45b4235a8b7b69d3565a522
Branches Tags
daylin:main
daylin:flake-lock
...
compare: daylin:be860401e32e34fd8118c6d0ce239744c29fa046
Branches Tags
daylin:flake-lock
daylin:main

6 commits
b275fb7f9c ... be860401e3

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

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=77cf651825c2afac69e3a827ff910a62c73e1218' (2024-08-12)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=197f8807900afc81c1c92ad17e621d1998ee268b' (2024-08-14)
• Updated input 'lix':
    'f9a3bf6ccc.tar.gz?narHash=sha256-XDcqLVPcsMhORerIPuQ1XNALtDvG6QRA2dKyNrccXyg%3D&rev=f9a3bf6ccccf8ac6b1604c1a2980e3a565ae4f44' (2024-08-13)
  → 'b016eb0895.tar.gz?narHash=sha256-kOpGI9WPmte1L4QWHviuXsr8jxmGn27zwi82jtzYObM%3D&rev=b016eb0895bb6714a4f6530d9a2bb6577ac6c3cf' (2024-08-13)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/154bcb95ad51bc257c2ce4043a725de6ca700ef6' (2024-08-09)
  → 'github:nixos/nixpkgs/daf7bb95821b789db24fc1ac21f613db0c1bf2cb' (2024-08-14)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/e551336e36b8e275cdbdfc08ea6d1182239263b3' (2024-08-12)
  → 'github:nix-community/nixpkgs-wayland/d281d56bda9456bb8c0a22a608575926fb9a656d' (2024-08-13)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b' (2024-08-09)
  → 'github:nixos/nixpkgs/a58bc8ad779655e790115244571758e8de055e3d' (2024-08-11)
• Updated input 'roc':
    'github:roc-lang/roc/3ebff4348ff8a361e59b9ca3997c41ac8076a201' (2024-08-12)
  → 'github:roc-lang/roc/2423ce2272670be592d3ce0091c3ddf665358c88' (2024-08-14)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/4dbfd05d2d1382eaf40ff1ebab854abe7e30702f' (2024-08-13)
  → 'github:mitchellh/zig-overlay/ec73dc4a8b9a30b16da979e0bac67e457d5be933' (2024-08-15)
• Updated input 'zls':
    'github:zigtools/zls/3ec8ad16337e5fc391fbdfb394f68f155b2a7a69' (2024-08-11)
  → 'github:zigtools/zls/599f9da8785f1cd3ac23595b910372e20c530a6d' (2024-08-14)
 2024-08-15 00:34:36 +00:00
Daylin Morgan
b156aa63f9
tryout a new file manager 2024-08-14 13:14:38 -05:00
Daylin Morgan
32564f4fdc
formatting 2024-08-14 10:25:49 -05:00
Daylin Morgan
2e87afc0f8
add todo 2024-08-14 09:50:29 -05:00
Daylin Morgan
480ca0c41e
use pipes because why not 2024-08-14 09:50:26 -05:00
Daylin Morgan
6fb8365c03
auto set username 2024-08-14 09:49:15 -05:00
7 changed files with 55 additions and 43 deletions
Show stats Expand all files Collapse all files

52
flake.lock
View file

@ -323,11 +323,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1723488592, "lastModified": 1723656907,
"narHash": "sha256-nPYQrQD8rldLIhrz6px0YHGB4WwIaWLdmBtWsMgLLNI=", "narHash": "sha256-11tgstIQZP3RRrBEF3ym9L6oS+vzqZJ7Mp6eB2PaN+0=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "77cf651825c2afac69e3a827ff910a62c73e1218", "rev": "197f8807900afc81c1c92ad17e621d1998ee268b",
"revCount": 5083, "revCount": 5088,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -516,11 +516,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723511168, "lastModified": 1723577950,
"narHash": "sha256-XDcqLVPcsMhORerIPuQ1XNALtDvG6QRA2dKyNrccXyg=", "narHash": "sha256-kOpGI9WPmte1L4QWHviuXsr8jxmGn27zwi82jtzYObM=",
"rev": "f9a3bf6ccccf8ac6b1604c1a2980e3a565ae4f44", "rev": "b016eb0895bb6714a4f6530d9a2bb6577ac6c3cf",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f9a3bf6ccccf8ac6b1604c1a2980e3a565ae4f44.tar.gz?rev=f9a3bf6ccccf8ac6b1604c1a2980e3a565ae4f44" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b016eb0895bb6714a4f6530d9a2bb6577ac6c3cf.tar.gz?rev=b016eb0895bb6714a4f6530d9a2bb6577ac6c3cf"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -697,11 +697,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1723504763, "lastModified": 1723573444,
"narHash": "sha256-q+Leb6hrkfc5cwysvYcGVslr6tBtSC9ggIjqpV9wmy0=", "narHash": "sha256-5R7cF01OqkULUZ/qpAjgs712UGM+N0xFqOk/eYd3V+4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "e551336e36b8e275cdbdfc08ea6d1182239263b3", "rev": "d281d56bda9456bb8c0a22a608575926fb9a656d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -744,11 +744,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1723221148, "lastModified": 1723603349,
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", "narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", "rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -776,11 +776,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1723175592, "lastModified": 1723362943,
"narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "rev": "a58bc8ad779655e790115244571758e8de055e3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -839,11 +839,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1723447286, "lastModified": 1723671539,
"narHash": "sha256-P3YvswRWaPlBr6YOkeNOVs4P/IcjPC24FfN8gUM7VkY=", "narHash": "sha256-fOKiZhYGnIU2F2Yrl9k4Evkv7mwrGvvPwI1f1grWmy4=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "3ebff4348ff8a361e59b9ca3997c41ac8076a201", "rev": "2423ce2272670be592d3ce0091c3ddf665358c88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1101,11 +1101,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723508807, "lastModified": 1723681531,
"narHash": "sha256-2j6u7X2ziCjpUgeZbP1h4/MNG6glc4sO2DzDXgw43o0=", "narHash": "sha256-e+5bmu3c03BLUza76f+Dm35rI008+fhZ9LlcfUJ79gc=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "4dbfd05d2d1382eaf40ff1ebab854abe7e30702f", "rev": "ec73dc4a8b9a30b16da979e0bac67e457d5be933",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1127,11 +1127,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723396350, "lastModified": 1723638628,
"narHash": "sha256-f5RTadUCYeGPDI6Y7xDYa6sJsdKFCdtD4WipGxuof3A=", "narHash": "sha256-QW4XHDWk2XsoRm/4tRP9AWvXVE8tCZHQ8pLRVMylhOs=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "3ec8ad16337e5fc391fbdfb394f68f155b2a7a69", "rev": "599f9da8785f1cd3ac23595b910372e20c530a6d",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
lib/default.nix
View file

@ -10,6 +10,7 @@ let
#supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; #supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
supportedSystems = [ "x86_64-linux" ]; supportedSystems = [ "x86_64-linux" ];
forAllSystems = f: genAttrs supportedSystems (system: f (import nixpkgs { inherit system; })); forAllSystems = f: genAttrs supportedSystems (system: f (import nixpkgs { inherit system; }));
inheritFlakePkgs = inheritFlakePkgs =
pkgs: flakes: pkgs: flakes:
listToAttrs ( listToAttrs (

3
modules/desktop/gui.nix
View file

@ -13,11 +13,10 @@ in
environment.systemPackages = environment.systemPackages =
[ (flake.pkg "f1multiviewer") ] [ (flake.pkg "f1multiviewer") ]
++ (with pkgs; [ ++ (with pkgs; [
pcmanfm
wezterm wezterm
alacritty alacritty
xfce.thunar
inkscape inkscape
gimp gimp

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

@ -62,11 +62,12 @@ mkOizysModule config "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 = {
# extraArgs = [ "--skip-login" ]; services.getty = {
# loginOptions = "-p -- ${config.oizys.user}"; extraArgs = [ "--skip-login" ];
# }; loginOptions = "-p -- ${config.oizys.user}";
# };
# environment.etc = # environment.etc =
# let # let
# activate-snippet = '' # activate-snippet = ''

2
modules/networking/vpn.nix
View file

@ -21,7 +21,7 @@ mkOizysModule config "vpn" {
# updateResolvConf = true; # updateResolvConf = true;
# }; # };
# #
mullvad-chi = { mullvad-chi = {
config = '' config = ''
config /home/daylin/.config/openvpn/mullvad-chi/mullvad_us_chi.conf config /home/daylin/.config/openvpn/mullvad-chi/mullvad_us_chi.conf

27
overlays/default.nix
View file

@ -1,16 +1,25 @@
{ inputs, ... }: { inputs, ... }:
let let
defaultOverlays = inherit (builtins)
# execute and import all overlay files in the current map
# directory with the given args filter
builtins.map attrNames
# execute and import the overlay file readDir
(f: (import (./. + "/${f}") { inherit inputs; })) ;
# find all overlay files in the current directory # execute and import all overlay files in the current
(builtins.filter (f: f != "default.nix") (builtins.attrNames (builtins.readDir ./.))); # directory with the given args
# overlays =
# map
# (f: (import (./. + "/${f}") { inherit inputs; }))
# (filter (f: f != "default.nix") (attrNames (readDir ./.)));
overlays =
readDir ./.
|> attrNames
|> filter (f: f != "default.nix")
|> map (f: import (./. + "/${f}") { inherit inputs; });
in in
{ {
nixpkgs.overlays = defaultOverlays ++ [ nixpkgs.overlays = overlays ++ [
(final: _prev: { (final: _prev: {
stable = import inputs.stable { stable = import inputs.stable {
system = final.system; system = final.system;

2
todo.md
View file

@ -2,6 +2,8 @@
## oizys ## oizys
- [ ] write a flake template that includes the systems boilerplate
## software ## software
- [ ] lid closed does not engage hyprlock? - [ ] lid closed does not engage hyprlock?