mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-24 07:50:43 -06:00
Compare commits
1 commit
be860401e3
...
b275fb7f9c
| Author | SHA1 | Date | |
|---|---|---|---|
| b275fb7f9c |
7 changed files with 33 additions and 45 deletions
32
flake.lock
32
flake.lock
|
|
@ -323,11 +323,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723656907,
|
||||
"narHash": "sha256-11tgstIQZP3RRrBEF3ym9L6oS+vzqZJ7Mp6eB2PaN+0=",
|
||||
"lastModified": 1723579231,
|
||||
"narHash": "sha256-PL9C3aOetj+TS+vXvNhh7q5bm3g70oakg+iSu5eQBUQ=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "197f8807900afc81c1c92ad17e621d1998ee268b",
|
||||
"revCount": 5088,
|
||||
"rev": "3b4aabe04c7756fb0a70d78b6f0e701228f46345",
|
||||
"revCount": 5087,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
|
@ -744,11 +744,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1723603349,
|
||||
"narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=",
|
||||
"lastModified": 1723572004,
|
||||
"narHash": "sha256-U5gKtbKuPahB02iGeGHFPlKr/HqrvSsHlEDEXoVyaPc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb",
|
||||
"rev": "19674872444bb3e0768249e724d99c8649c3bd78",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -839,11 +839,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723671539,
|
||||
"narHash": "sha256-fOKiZhYGnIU2F2Yrl9k4Evkv7mwrGvvPwI1f1grWmy4=",
|
||||
"lastModified": 1723589920,
|
||||
"narHash": "sha256-RvWCor8O3hivYsKVylP4GK4JmhE5KGwMxtLpXwfkC5o=",
|
||||
"owner": "roc-lang",
|
||||
"repo": "roc",
|
||||
"rev": "2423ce2272670be592d3ce0091c3ddf665358c88",
|
||||
"rev": "2dee5aea941ea04a4eabc5482d030fef1bd0c0e9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1101,11 +1101,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723681531,
|
||||
"narHash": "sha256-e+5bmu3c03BLUza76f+Dm35rI008+fhZ9LlcfUJ79gc=",
|
||||
"lastModified": 1723595170,
|
||||
"narHash": "sha256-qPUqxmrW/wXCDJI4jH1bIGJ19c6b2qK46lmu9Nfi3dI=",
|
||||
"owner": "mitchellh",
|
||||
"repo": "zig-overlay",
|
||||
"rev": "ec73dc4a8b9a30b16da979e0bac67e457d5be933",
|
||||
"rev": "f67c948100ccdc8066146e3fd489b176fd4f03fd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1127,11 +1127,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723638628,
|
||||
"narHash": "sha256-QW4XHDWk2XsoRm/4tRP9AWvXVE8tCZHQ8pLRVMylhOs=",
|
||||
"lastModified": 1723396350,
|
||||
"narHash": "sha256-f5RTadUCYeGPDI6Y7xDYa6sJsdKFCdtD4WipGxuof3A=",
|
||||
"owner": "zigtools",
|
||||
"repo": "zls",
|
||||
"rev": "599f9da8785f1cd3ac23595b910372e20c530a6d",
|
||||
"rev": "3ec8ad16337e5fc391fbdfb394f68f155b2a7a69",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ let
|
|||
#supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
|
||||
supportedSystems = [ "x86_64-linux" ];
|
||||
forAllSystems = f: genAttrs supportedSystems (system: f (import nixpkgs { inherit system; }));
|
||||
|
||||
inheritFlakePkgs =
|
||||
pkgs: flakes:
|
||||
listToAttrs (
|
||||
|
|
|
|||
|
|
@ -13,10 +13,11 @@ in
|
|||
environment.systemPackages =
|
||||
[ (flake.pkg "f1multiviewer") ]
|
||||
++ (with pkgs; [
|
||||
pcmanfm
|
||||
wezterm
|
||||
alacritty
|
||||
|
||||
xfce.thunar
|
||||
|
||||
inkscape
|
||||
gimp
|
||||
|
||||
|
|
|
|||
|
|
@ -62,12 +62,11 @@ mkOizysModule config "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
|
||||
# activate-snippet = ''
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ mkOizysModule config "vpn" {
|
|||
# updateResolvConf = true;
|
||||
# };
|
||||
#
|
||||
|
||||
|
||||
mullvad-chi = {
|
||||
config = ''
|
||||
config /home/daylin/.config/openvpn/mullvad-chi/mullvad_us_chi.conf
|
||||
|
|
|
|||
|
|
@ -1,25 +1,16 @@
|
|||
{ inputs, ... }:
|
||||
let
|
||||
inherit (builtins)
|
||||
map
|
||||
filter
|
||||
attrNames
|
||||
readDir
|
||||
;
|
||||
# execute and import all overlay files in the current
|
||||
# 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; });
|
||||
defaultOverlays =
|
||||
# execute and import all overlay files in the current
|
||||
# directory with the given args
|
||||
builtins.map
|
||||
# execute and import the overlay file
|
||||
(f: (import (./. + "/${f}") { inherit inputs; }))
|
||||
# find all overlay files in the current directory
|
||||
(builtins.filter (f: f != "default.nix") (builtins.attrNames (builtins.readDir ./.)));
|
||||
in
|
||||
{
|
||||
nixpkgs.overlays = overlays ++ [
|
||||
nixpkgs.overlays = defaultOverlays ++ [
|
||||
(final: _prev: {
|
||||
stable = import inputs.stable {
|
||||
system = final.system;
|
||||
|
|
|
|||
2
todo.md
2
todo.md
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
## oizys
|
||||
|
||||
- [ ] write a flake template that includes the systems boilerplate
|
||||
|
||||
## software
|
||||
|
||||
- [ ] lid closed does not engage hyprlock?
|
||||
|
|
|
|||
Loading…
Reference in a new issue