Skip to content

Commit 4b103fa

Browse files
committed
fuck it we ball
1 parent 24da727 commit 4b103fa

13 files changed

Lines changed: 330 additions & 106 deletions

File tree

flake.lock

Lines changed: 16 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,8 @@
6060
inputs = {
6161
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
6262

63-
apple-silicon-support.url = "github:nix-community/nixos-apple-silicon";
64-
dwl = {
65-
url = "path:///home/sioodmy/dev/dwl";
63+
apple-silicon-support = {
64+
url = "github:nix-community/nixos-apple-silicon";
6665
inputs.nixpkgs.follows = "nixpkgs";
6766
};
6867
helium-browser = {

system/nix/default.nix

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@
2929
builders-use-substitutes = true;
3030
# allow sudo users to mark the following values as trusted
3131
allowed-users = [ "@wheel" ];
32-
trusted-users = [ "@wheel" ];
32+
trusted-users = [ "root" "sioodmy" ];
3333
commit-lockfile-summary = "chore: Update flake.lock";
3434
accept-flake-config = true;
3535
keep-derivations = true;
3636
keep-outputs = true;
3737
warn-dirty = false;
38+
use-xdg-base-directories = true;
3839

3940
sandbox = true;
4041
max-jobs = "auto";
@@ -45,6 +46,8 @@
4546
"flakes"
4647
"nix-command"
4748
"pipe-operator"
49+
# "no-url-literals"
50+
# "ca-derivations"
4851
];
4952

5053
# use binary cache, its not gentoo
@@ -60,7 +63,13 @@
6063
};
6164
};
6265

63-
programs.nix-ld.enable = true;
66+
programs.nix-ld.enable = false;
67+
# programs.nix-ld.libraries = with pkgs; [
68+
# stdenv.cc.cc
69+
# openssl
70+
# curl
71+
# glib
72+
# ];
6473
programs.nh = {
6574
enable = true;
6675
flake = "/home/sioodmy/dev/dotfiles";
@@ -73,9 +82,8 @@
7382
};
7483

7584
nixpkgs = {
76-
7785
config = {
78-
allowUnfree = false;
86+
allowUnfree = true;
7987
allowBroken = true;
8088
};
8189
};

system/security/default.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{ pkgs, ... }:
22
{
3-
environment.systemPackages = [ (pkgs.writeShellScriptBin "sudo" "run0 --background= $@") ];
4-
53
services = {
64
networkd-dispatcher.enable = true;
75
pcscd.enable = true;

system/services/default.nix

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,5 @@
99

1010
openDefaultPorts = true;
1111
};
12-
services.mysql = {
13-
enable = true;
14-
package = pkgs.mariadb;
15-
};
16-
programs.adb.enable = true;
1712
boot.kernel.sysctl."fs.inotify.max_user_watches" = 1048576;
1813
}

system/users/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
security = {
4040
sudo = {
41-
enable = false;
41+
enable = true;
4242
extraRules = [
4343
{
4444
commands =

system/wayland/default.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131

3232
QT_QPA_PLATFORM = "wayland";
3333
};
34-
systemPackages = [
35-
inputs.dwl.packages.${pkgs.system}.default
36-
];
3734
};
3835

3936
systemd.services = {

user/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
rec {
22
theme = import ./theme;
33
packages =
4-
pkgs:
4+
pkgs:
55
let
66
inherit (pkgs) callPackage;
77
theme = import ./theme pkgs;

user/packages.nix

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ in
1919
attrValues {
2020
inherit (pkgs)
2121
clang-tools
22+
rust-analyzer
23+
firefox-devedition
2224
bear
25+
pastel
2326
nixfmt-rfc-style
2427
nixfmt-tree
2528
yazi
@@ -28,6 +31,9 @@ in
2831
ollama
2932
pandoc
3033
texliveMedium
34+
vscode-langservers-extracted
35+
tectonic-unwrapped
36+
typst
3137
texlab
3238
powershell
3339
niri
@@ -67,7 +73,6 @@ in
6773
fzf
6874
eza
6975
gping
70-
dogdns
7176
onefetch
7277
cpufetch
7378
microfetch
@@ -86,6 +91,6 @@ in
8691
unzip
8792
;
8893
}
89-
++ scripts
90-
++ [ inputs.helium-browser.packages."${pkgs.system}".helium ];
94+
++ scripts;
95+
# ++ [ inputs.helium-browser.packages."${pkgs.system}".helium ];
9196
}

user/wrapped/helix/default.nix

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,19 @@ let
9696

9797
toml = pkgs.formats.toml { };
9898

99-
config = toml.generate "config.toml" settings;
99+
config = pkgs.writeTextDir "/helix/config.toml" (builtins.readFile (toml.generate "/config.toml" settings));
100+
languages = pkgs.writeTextDir "/helix/langauges.toml" (builtins.readFile (import ./languages.nix {inherit pkgs;}));
101+
102+
xdgconfig = pkgs.buildEnv{
103+
name = "helix-config-xdg";
104+
paths = [ config languages];
105+
};
100106
in
101107
pkgs.symlinkJoin {
102108
name = "helix-wrapped";
103109
paths = [ pkgs.helix ];
104110
buildInputs = [ pkgs.makeWrapper ];
105111
postBuild = ''
106-
wrapProgram $out/bin/hx --add-flags "--config ${config}"
112+
wrapProgram $out/bin/hx --set XDG_CONFIG_HOME "${xdgconfig}"
107113
'';
108114
}

0 commit comments

Comments
 (0)