blahai/nyx
1
0
Fork 0
mirror of https://github.com/blahai/nyx.git synced 2025-02-23 09:05:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

stuffies

Browse source
This commit is contained in:
blahai 2025-02-01 01:32:26 +02:00
parent ffae125fcf
commit d6c098bbbe
Signed by: blahai
SSH key fingerprint: SHA256:ZfCryi+V64yG+vC1ZIIsqgvBCmA31tTi7RJ6M8CvpRc
23 changed files with 92 additions and 587 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

348
flake.lock generated
View file

@ -78,29 +78,6 @@
"type": "github" "type": "github"
} }
}, },
"chaotic": {
"inputs": {
"fenix": "fenix",
"flake-schemas": "flake-schemas",
"home-manager": "home-manager_2",
"jovian": "jovian",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1737973837,
"narHash": "sha256-LrM+QVWUZhPKbjm2I5EkypupivGHjr/AM4rCaNbCFfE=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "f19af140dacd0e211a25cf907be46356347e190f",
"type": "github"
},
"original": {
"owner": "chaotic-cx",
"ref": "nyxpkgs-unstable",
"repo": "nyx",
"type": "github"
}
},
"darwin": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -192,11 +169,11 @@
}, },
"easy-hosts": { "easy-hosts": {
"locked": { "locked": {
"lastModified": 1738100717, "lastModified": 1738271711,
"narHash": "sha256-lzFTTEx70OMsBbmjX3MtJrx1KtwA8qBgVbCVEKLTbEQ=", "narHash": "sha256-KKnkJg6wV7bIc8dBB6jv8ODfWqCIvNdiuWtYviLzBzY=",
"owner": "tgirlcloud", "owner": "tgirlcloud",
"repo": "easy-hosts", "repo": "easy-hosts",
"rev": "1adbc48087a70b5a158f5fa882f7f9c89ca7c557", "rev": "0d5d68e498d44806f8d9f41554db68c891909349",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -205,28 +182,6 @@
"type": "github" "type": "github"
} }
}, },
"fenix": {
"inputs": {
"nixpkgs": [
"chaotic",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1737268357,
"narHash": "sha256-J3At8JDKpQGDeDUcz1eh0h5yFwNH7fPfm+N95TxiOq4=",
"owner": "nix-community",
"repo": "fenix",
"rev": "f9662e6ea6020671e1e17102bd20d6692bb38aba",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1733328505,
@ -315,41 +270,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-schemas": {
"locked": {
"lastModified": 1721999734,
"narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=",
"rev": "0a5c42297d870156d9c57d8f99e476b738dcd982",
"revCount": 75,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_3"
@ -554,11 +474,11 @@
"nixvim": "nixvim" "nixvim": "nixvim"
}, },
"locked": { "locked": {
"lastModified": 1738196122, "lastModified": 1738282532,
"narHash": "sha256-NF7pLviV9WudRVMPfE+C40Uau8IMK9FOc0FxyqegT2A=", "narHash": "sha256-LmcIQ9YNuTi5ncPOYTloqG42tcpfo2/TmUNE1qB7w/A=",
"owner": "blahai", "owner": "blahai",
"repo": "haivim", "repo": "haivim",
"rev": "af00c7051709daaffafb673bbd0d8f9fb4058f08", "rev": "f1feadd053613b12aa7d98bacf73286b7f5d987f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -614,11 +534,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738019458, "lastModified": 1738267499,
"narHash": "sha256-PGMnx3UyAYv7Sm/jRkU4hOhBSlOdiih+OuGux97b7oo=", "narHash": "sha256-qgOJU297NYvRiBSSnYcZikNq3R3FlN6HISFDwbCJK6E=",
"owner": "the-unnamed-nug", "owner": "the-unnamed-nug",
"repo": "hjem-rum", "repo": "hjem-rum",
"rev": "3409ae4577c1df57adb8e739a7f4055bd0575949", "rev": "52a0a8cb33e2194eb49d30e78aad99bc7787b213",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -649,27 +569,6 @@
} }
}, },
"home-manager_2": { "home-manager_2": {
"inputs": {
"nixpkgs": [
"chaotic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1737221749,
"narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "97d7946b5e107dd03cc82f21165251d4e0159655",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"haivim", "haivim",
@ -678,11 +577,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737968762, "lastModified": 1738228963,
"narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=", "narHash": "sha256-Ee5hVHM7AWxaq7XJN6xiZztTZX8csdXernjqaTW5r9I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e", "rev": "d963ed335b890a70ed53eecf14cdb21528eda9b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -759,17 +658,17 @@
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprutils": "hyprutils", "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"systems": "systems_6", "systems": "systems_6",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1738236612, "lastModified": 1738339723,
"narHash": "sha256-fJ6VwFCp1w/CA+ONo9Ix+0JuGef5kHnfy/KWzOpSkWc=", "narHash": "sha256-9VrozytYMyHa4g69QC8aexod4rE5TtGuHV4gXuFMnRo=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "32c0fa2f2fe02254d5887b38cf2cffa72ddfd769", "rev": "ddf180fa304e71b1d6eaa9f2b250a907131b05d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -980,28 +879,6 @@
"type": "github" "type": "github"
} }
}, },
"jovian": {
"inputs": {
"nix-github-actions": "nix-github-actions",
"nixpkgs": [
"chaotic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1737126697,
"narHash": "sha256-k1YhjONkiKBHzbjNy4ZsjysBac5UJSolCVq9cTKLeKM=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "27a0ddac1a14e10ba98530f59db728951495f2ce",
"type": "github"
},
"original": {
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"type": "github"
}
},
"libpng": { "libpng": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1076,52 +953,29 @@
"type": "github" "type": "github"
} }
}, },
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"chaotic",
"jovian",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729697500,
"narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=",
"owner": "zhaofengli",
"repo": "nix-github-actions",
"rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"ref": "matrix-name",
"repo": "nix-github-actions",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1737929020, "lastModified": 1738136902,
"narHash": "sha256-UC9ARAC8mRxQozZ6eO+KofV2Dd7KShl6X8XZz/ecNHg=", "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=",
"owner": "PedroHLC", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b200ab4d4c4bc99681909139b900f10ad70bc02b", "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "PedroHLC", "owner": "NixOS",
"ref": "revert-376078", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-smol": { "nixpkgs-smol": {
"locked": { "locked": {
"lastModified": 1738223116, "lastModified": 1738310300,
"narHash": "sha256-Igf0oHuV2W8tV2OQqDsm9Fg5ct9rLuBD9h5GPAiq/qc=", "narHash": "sha256-bRvUuk8A0O5jm/3fRN9Y5eFqLmO2b6bCC0YtPMxmWCI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c25903f220d0b558887672cc8321dddf91e99f7e", "rev": "e2807b247ea4704655f71a36403a68ee04b634db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1132,22 +986,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1737942377,
"narHash": "sha256-8Eo/jRAgT3CbAloyqOj6uPN1EqBvLI/Tv2g+RxHjkhU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "88a55dffa4d44d294c74c298daf75824dc0aafb5",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1737885589, "lastModified": 1737885589,
"narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
@ -1163,39 +1001,23 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": {
"locked": {
"lastModified": 1738142207,
"narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": { "nixpkgs_4": {
"locked": {
"lastModified": 1738142207,
"narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1738142207,
"narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1735821806, "lastModified": 1735821806,
"narHash": "sha256-cuNapx/uQeCgeuhUhdck3JKbgpsml259sjUQnWM7zW8=", "narHash": "sha256-cuNapx/uQeCgeuhUhdck3JKbgpsml259sjUQnWM7zW8=",
@ -1217,18 +1039,18 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"home-manager": "home-manager_3", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"nuschtosSearch": "nuschtosSearch", "nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1738188154, "lastModified": 1738272272,
"narHash": "sha256-2C0rEZ1l/X3nCwaQtulTXkmREZ/46TdWLYv1+BiCx3U=", "narHash": "sha256-zVw0JrvXJ29HnjEsNUInqi5Zw+J8QLHk2EuPN12dTXc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "f584d1d70d36cd29d45abce91776f8425398a97f", "rev": "93df574b42928d631d31fe312cadb3899eb5b1bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1237,26 +1059,6 @@
"type": "github" "type": "github"
} }
}, },
"nur": {
"inputs": {
"flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_5",
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1738238671,
"narHash": "sha256-WcHVGRdLMsrUjzgmStCUzR+5wTmnXgzYNP0Rccro6Xw=",
"owner": "nix-community",
"repo": "NUR",
"rev": "abab056b7631a40002033e97b2a8aee782b5abf8",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"nuschtosSearch": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
@ -1308,7 +1110,6 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"ags": "ags", "ags": "ags",
"chaotic": "chaotic",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"disko": "disko", "disko": "disko",
"easy-hosts": "easy-hosts", "easy-hosts": "easy-hosts",
@ -1319,32 +1120,14 @@
"hjem-rum": "hjem-rum", "hjem-rum": "hjem-rum",
"hyprland": "hyprland", "hyprland": "hyprland",
"lix-module": "lix-module", "lix-module": "lix-module",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"nixpkgs-smol": "nixpkgs-smol", "nixpkgs-smol": "nixpkgs-smol",
"nur": "nur",
"spicetify-nix": "spicetify-nix", "spicetify-nix": "spicetify-nix",
"systems": "systems_9", "systems": "systems_9",
"treefmt-nix": "treefmt-nix_3", "treefmt-nix": "treefmt-nix_2",
"wezterm": "wezterm" "wezterm": "wezterm"
} }
}, },
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1737215993,
"narHash": "sha256-W8xioeq+h9dzGvtXPlQAn2nXtgNDN6C8uA1/9F2JP5I=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "248bd511aee2c1c1cb2d5314649521d6d93b854a",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1375,11 +1158,11 @@
"systems": "systems_8" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1738099675, "lastModified": 1738364650,
"narHash": "sha256-q1oixDeEvoKm8t7Fr6vEGnv4sb8vRXCa6rF6YWIbGmk=", "narHash": "sha256-kDFuWQYCLOwZCGdkHLIDLLWR0B/XVi9VaW/55pUFSpk=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "2f0cc0c110c25804cd2f6c167ab66f567941452c", "rev": "1bee02567d993de62e5a4f61c26b074b4ee27c9b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1547,11 +1330,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737483750, "lastModified": 1738070913,
"narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", "narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", "rev": "bebf27d00f7d10ba75332a0541ac43676985dea3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1561,27 +1344,6 @@
} }
}, },
"treefmt-nix_2": { "treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -1607,7 +1369,7 @@
"freetype2": "freetype2", "freetype2": "freetype2",
"harfbuzz": "harfbuzz", "harfbuzz": "harfbuzz",
"libpng": "libpng", "libpng": "libpng",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",
"zlib": "zlib" "zlib": "zlib"
}, },

3
flake.nix
View file

@ -6,8 +6,6 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs-smol.url = "github:nixos/nixpkgs?ref=nixos-unstable-small"; nixpkgs-smol.url = "github:nixos/nixpkgs?ref=nixos-unstable-small";
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
nur.url = "github:nix-community/NUR";
wezterm.url = "github:wez/wezterm?dir=nix"; wezterm.url = "github:wez/wezterm?dir=nix";
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
lix-module = { lix-module = {
@ -66,6 +64,7 @@
url = "github:feel-co/hjem"; url = "github:feel-co/hjem";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hjem-rum = { hjem-rum = {
url = "github:the-unnamed-nug/hjem-rum"; url = "github:the-unnamed-nug/hjem-rum";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

5
home/base/default.nix
View file

@ -1,5 +0,0 @@
{
imports = [
./programs
];
}

7
home/base/programs/default.nix
View file

@ -1,7 +0,0 @@
{
imports = [
./defaults.nix
./shells.nix
./top-level.nix
];
}

93
home/base/programs/defaults.nix
View file

@ -1,93 +0,0 @@
{lib, ...}: let
inherit (lib.options) mkOption;
inherit (lib.types) enum nullOr;
in {
options.olympus.programs.defaults = {
shell = mkOption {
type = enum [
"bash"
"fish"
];
default = "bash";
};
terminal = mkOption {
type = enum [
"alacritty"
"kitty"
"wezterm"
"foot"
];
default = "wezterm";
};
fileManager = mkOption {
type = enum [
"cosmic-files"
"thunar"
"dolphin"
"nemo"
"nautilus"
];
default = "nautilus";
};
browser = mkOption {
type = enum [
"firefox"
"floorp"
"chromium"
"thorium"
];
default = "floorp";
};
editor = mkOption {
type = enum [
"nvim"
];
default = "nvim";
};
launcher = mkOption {
type = nullOr (enum [
"rofi"
"wofi"
"cosmic-launcher"
]);
default = "wofi";
};
bar = mkOption {
type = nullOr (enum [
"waybar"
"ags"
]);
default = "ags";
};
screenLocker = mkOption {
type = nullOr (enum [
"hyprlock"
"swaylock"
"gtklock"
"cosmic-greeter"
]);
default = "hyprlock";
description = ''
The lockscreen module to be loaded by hjem.
'';
};
noiseSuppressor = mkOption {
type = nullOr (enum [
"rnnoise"
"noisetorch"
]);
default = "rnnoise";
description = ''
The noise suppressor to be used for desktop systems with sound enabled.
'';
};
};
}

16
home/base/programs/shells.nix
View file

@ -1,16 +0,0 @@
{
lib,
pkgs,
...
}: let
inherit (lib.programs) mkProgram;
in {
options.olympus.programs = {
bash = mkProgram pkgs "bash" {
enable.default = true;
package.default = pkgs.bashInteractive;
};
fish = mkProgram pkgs "fish" {};
};
}

32
home/base/programs/top-level.nix
View file

@ -1,32 +0,0 @@
{
lib,
config,
...
}: let
inherit (lib.options) mkEnableOption;
cfg = config.olympus.programs;
in {
# these are options that will cause a mass rebuild by enabling multiple packages
options.olympus.programs = {
cli = {
enable =
mkEnableOption "Enable CLI programs"
// {
default = true;
};
modernShell.enable = mkEnableOption "Enable programs for a more modern shell";
};
tui.enable =
mkEnableOption "Enable TUI programs"
// {
default = cfg.cli.enable;
};
gui.enable = mkEnableOption "Enable GUI programs";
pentesting.enable = mkEnableOption "Enable packages designed for pentesting";
notes.enable = mkEnableOption "Enable note-taking programs";
};
}

21
home/default.nix
View file

@ -1,18 +1,25 @@
{ {
lib, lib,
self, pkgs,
self',
config, config,
inputs, inputs,
inputs',
... ...
}: let }: let
inherit (lib.modules) mkDefault; inherit (lib.modules) mkIf;
inherit (lib.attrsets) genAttrs; inherit (lib.attrsets) genAttrs;
inherit (lib.options) mkEnableOption;
in { in {
hjem = { options.olympus.system.enableHjem =
users = genAttrs config.olympus.system.users (name: ./${name}); mkEnableOption "Should hjem be enabled"
// {
default = true;
};
clobberByDefault = true; config = mkIf config.olympus.system.enableHjem {
hjem = {
users = genAttrs config.olympus.system.users (name: ./${name});
clobberByDefault = true;
specialArgs = {inherit inputs;};
};
}; };
} }

1
home/elissa/default.nix
View file

@ -1 +0,0 @@
{}

17
home/pingu/alacritty.nix Normal file
View file

@ -0,0 +1,17 @@
{
hjem.users.pingu.rum.programs.alacritty = {
enable = true;
settings = {
window = {
dimensions = {
lines = 28;
columns = 101;
};
padding = {
x = 6;
y = 3;
};
};
};
};
}

3
home/pingu/default.nix
View file

@ -1,6 +1,5 @@
{ {
imports = [ imports = [
#./packages ./alacritty.nix # this is a test for hjem-rum
#./system
]; ];
} }

5
home/pingu/packages/cli/default.nix
View file

@ -1,5 +0,0 @@
{
imports = [
./shell
];
}

5
home/pingu/packages/cli/shell/default.nix
View file

@ -1,5 +0,0 @@
{
imports = [
./fish.nix
];
}

96
home/pingu/packages/cli/shell/fish.nix
View file

@ -1,96 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.modules) mkIf;
in {
home.packages = with pkgs; [
neofetch
];
programs = mkIf config.olympus.programs.fish.enable {
fish = {
enable = true;
interactiveShellInit = ''
function fish_greeting
if test -z $DEVSHELL_NIX;
echo The time is (set_color purple; date +%T; set_color purple)
if test -z $SSH_CLIENT;
fastfetch
else
neofetch
end
end
end
'';
shellAliases = {
"ls" = "eza -l -a --group-directories-first --icons";
"grep" = "rg -p";
"rg" = "rg -p";
"cp" = "cp -rv";
":q" = "exit";
":qa" = "pkill fish";
".." = "z ..";
".2" = "z ../..";
".3" = "z ../../..";
".4" = "z ../../../..";
".5" = "z ../../../../..";
".r" = "z /";
".h" = "z ~";
".c" = "z ~/.config/";
".a" = "z ~/.config/ags/";
".n" = "z ~/.config/nixos/";
".d" = "z ~/Documents/";
".C" = "z ~/Documents/code/";
".D" = "z ~/Downloads/";
".p" = "z ~/Pictures/";
# git
"gc" = "git clone";
"gp" = "git push";
"ga" = "git add";
"gan" = "git add -N .";
"gcm" = "git commit -m";
"fetch" = "clear ; fastfetch --logo ~/Downloads/gay.png --logo-width 32";
"hvim" = "z ~/.config/hypr/ ; nvim ; z";
"fvim" = "nvim ~/.config/fish/config.fish";
"se" = "sudoedit";
"vim" = "nvim";
"nvide" = "env -u WAYLAND_DISPLAY neovide --multigrid";
"transcat" = "queercat -b -f 1 -v 0.45 -h 0.45";
"clock" = "tty-clock -s -C 5 -D -c -b";
};
functions = {
os-age = ''
stat / | awk '/Birth: /{print $2 " " substr($3,1,5)}'
'';
build-iso = ''
cd ~/.config/nixos
nix build .#nixosConfigurations.epimetheus.config.system.build.isoImage
'';
# Credit for these 3
# https://www.reddit.com/r/linux/comments/1fq0za8/comment/lp1ybdn
disks = ''
lsblk -o NAME,MOUNTPOINT,FSTYPE,FSUSE%,SIZE
'';
gr = ''
set GROOT (git rev-parse --show-toplevel 2>/dev/null); and cd $GROOT; or return $argv
'';
mkcd = ''
mkdir -p -- $argv[1] && cd $argv; or return $status
'';
};
};
};
}

7
home/pingu/packages/default.nix
View file

@ -1,7 +0,0 @@
{
imports = [
./cli
./gui
./misc
];
}

1
home/pingu/packages/gui/default.nix
View file

@ -1 +0,0 @@
{}

1
home/pingu/packages/misc/default.nix
View file

@ -1 +0,0 @@
{}

5
home/pingu/system/default.nix
View file

@ -1,5 +0,0 @@
{
imports = [
./env.nix
];
}

1
home/pingu/system/env.nix
View file

@ -1 +0,0 @@
{}

1
home/user/default.nix
View file

@ -1 +0,0 @@
{}

4
modules/flake/programs/deploy.nix
View file

@ -9,7 +9,7 @@
inherit (lib.attrsets) filterAttrs; inherit (lib.attrsets) filterAttrs;
# extract the names of the systems that we want to deploy # extract the names of the systems that we want to deploy
deployableSystems = attrNames (filterAttrs (_: attrs: attrs.deployable) config.easyHosts.hosts); deployableSystems = attrNames (filterAttrs (_: attrs: attrs.deployable) config.easy-hosts.hosts);
easyHostsFromDeployableSystems = easyHostsFromDeployableSystems =
filterAttrs ( filterAttrs (
@ -35,7 +35,7 @@ in {
profiles.system = { profiles.system = {
user = "root"; user = "root";
sshUser = node.config.olympus.system.mainUser or "root"; sshUser = node.config.olympus.system.mainUser or "root";
path = inputs.deploy-rs.lib.${config.easyHosts.hosts.${name}.system}.activate.nixos node; path = inputs.deploy-rs.lib.${config.easy-hosts.hosts.${name}.system}.activate.nixos node;
}; };
}) })
easyHostsFromDeployableSystems; easyHostsFromDeployableSystems;

4
systems/default.nix
View file

@ -18,7 +18,7 @@
in { in {
imports = [inputs.easy-hosts.flakeModule]; imports = [inputs.easy-hosts.flakeModule];
config.easyHosts = { config.easy-hosts = {
shared.specialArgs = {inherit lib;}; shared.specialArgs = {inherit lib;};
perClass = class: { perClass = class: {
@ -27,7 +27,7 @@ in {
"${self}/modules/${class}/default.nix" "${self}/modules/${class}/default.nix"
(optionals (class != "iso") [ (optionals (class != "iso") [
# import the home module, which is users for configuring users via home-manager # import the home module, which is users for configuring users via hjem
"${self}/home/default.nix" "${self}/home/default.nix"
# import the base module, this contains the common configurations between all systems # import the base module, this contains the common configurations between all systems

3
systems/nyx/default.nix
View file

@ -17,8 +17,5 @@
plymouth.enable = false; plymouth.enable = false;
}; };
}; };
programs = {
fish.enable = true;
};
}; };
} }