erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:3638fc6f857c7c5fbd744ec8292724a2bb04a155
Branches Tags
erwin:main
..
compare: erwin:aaa7456bfe1f9a2465e01bdf82ad821abc61f4b8
Branches Tags
erwin:main

No commits in common. "3638fc6f857c7c5fbd744ec8292724a2bb04a155" and "aaa7456bfe1f9a2465e01bdf82ad821abc61f4b8" have entirely different histories.
3638fc6f85 ... aaa7456bfe

7 changed files with 12 additions and 80 deletions
Show stats Expand all files Collapse all files

53
flake.lock
View file

@ -160,7 +160,7 @@
}, },
"crane_3": { "crane_3": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_6", "flake-compat": "flake-compat_5",
"flake-utils": [ "flake-utils": [
"ha-now-playing", "ha-now-playing",
"flake-utils" "flake-utils"
@ -188,30 +188,6 @@
"type": "github" "type": "github"
} }
}, },
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat_4",
"nixpkgs": [
"nixpkgs"
],
"utils": [
"flake-utils"
]
},
"locked": {
"lastModified": 1711973905,
"narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b",
"type": "github"
},
"original": {
"owner": "serokell",
"repo": "deploy-rs",
"type": "github"
}
},
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -258,7 +234,7 @@
}, },
"eww": { "eww": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -345,22 +321,6 @@
} }
}, },
"flake-compat_5": { "flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_6": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696267196, "lastModified": 1696267196,
@ -376,7 +336,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_7": { "flake-compat_6": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -392,7 +352,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_8": { "flake-compat_7": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -688,7 +648,7 @@
}, },
"nix-ld-rs": { "nix-ld-rs": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_7", "flake-compat": "flake-compat_6",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -867,7 +827,7 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_8", "flake-compat": "flake-compat_7",
"flake-utils": [ "flake-utils": [
"flake-utils" "flake-utils"
], ],
@ -898,7 +858,6 @@
"atuin": "atuin", "atuin": "atuin",
"caddy-with-plugins": "caddy-with-plugins", "caddy-with-plugins": "caddy-with-plugins",
"colmena": "colmena", "colmena": "colmena",
"deploy-rs": "deploy-rs",
"disko": "disko", "disko": "disko",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"eww": "eww", "eww": "eww",

23
flake.nix
View file

@ -106,12 +106,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
deploy-rs = {
url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils";
};
atuin = { atuin = {
url = "github:atuinsh/atuin"; url = "github:atuinsh/atuin";
inputs = { inputs = {
@ -203,22 +197,6 @@
}) (builtins.attrNames machines) }) (builtins.attrNames machines)
); );
deploy = {
nodes = {
neo = {
hostname = "10.0.0.213";
profiles = {
system = {
path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.neo;
};
};
};
};
sshUser = "erwin";
user = "root";
sshOpts = [ "-t" ];
};
colmena = colmena =
{ {
meta = { meta = {
@ -315,7 +293,6 @@
packages = [ packages = [
age age
config.packages.git-repo-go config.packages.git-repo-go
inputs'.deploy-rs.packages.deploy-rs
inputs'.colmena.packages.colmena inputs'.colmena.packages.colmena
just just
lswt lswt

2
machines/heimdall/caddy/default.nix
View file

@ -24,7 +24,7 @@
header /.well-known/matrix/* Content-Type application/json header /.well-known/matrix/* Content-Type application/json
header /.well-known/matrix/* Access-Control-Allow-Origin * header /.well-known/matrix/* Access-Control-Allow-Origin *
respond /.well-known/matrix/server `{"m.server":"matrix.boskma.frl:443"}` respond /.well-known/matrix/server `{"m.server":"matrix.boskma.frl:443"}`
respond /.well-known/matrix/client `{"m.homeserver": {"base_url":"https://matrix.boskma.frl"},"m.identity_server":{"base_url":"https://vector.im"},"org.matrix.msc3575.proxy":{"url":"https://syncv3.boskma.frl"}}` respond /.well-known/matrix/client `{"m.homeserver": {"base_url":"https://matrix.boskma.frl"},"org.matrix.msc3575.proxy":{"url":"https://syncv3.boskma.frl"}}`
''; '';
}; };

7
machines/neo/dendrite/default.nix
View file

@ -75,13 +75,6 @@ let
sync_api = { sync_api = {
real_ip_header = "X-Forwarded-For"; real_ip_header = "X-Forwarded-For";
}; };
mscs = {
mscs = [
"msc2444"
"msc2753"
"msc2836"
];
};
media_api = { media_api = {
base_path = "${workingDir}/media_store"; base_path = "${workingDir}/media_store";

2
machines/neo/matrix-sliding-sync/default.nix
View file

@ -8,7 +8,7 @@
environmentFile = config.sops.secrets.matrix-sliding-sync-env.path; environmentFile = config.sops.secrets.matrix-sliding-sync-env.path;
settings = { settings = {
SYNCV3_SERVER = "https://matrix.boskma.frl"; SYNCV3_SERVER = "http://127.0.0.1:8008";
SYNCV3_BINDADDR = "0.0.0.0:8009"; SYNCV3_BINDADDR = "0.0.0.0:8009";
}; };
}; };

2
users/erwin/home.nix
View file

@ -353,11 +353,13 @@ in
bookmarks = [ "file:///home/erwin/workspace" ]; bookmarks = [ "file:///home/erwin/workspace" ];
extraConfig = { extraConfig = {
gtk-application-prefer-dark-theme = 1; gtk-application-prefer-dark-theme = 1;
gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
}; };
}; };
gtk4.extraConfig = { gtk4.extraConfig = {
gtk-application-prefer-dark-theme = 1; gtk-application-prefer-dark-theme = 1;
gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
}; };
}; };

3
users/erwin/work.nix
View file

@ -302,7 +302,6 @@ in
package = pkgs.catppuccin-cursors.mochaDark; package = pkgs.catppuccin-cursors.mochaDark;
gtk.enable = true; gtk.enable = true;
x11.enable = true; x11.enable = true;
size = 48;
}; };
file.".wallpapers".source = ../../wallpapers; file.".wallpapers".source = ../../wallpapers;
@ -378,12 +377,14 @@ in
bookmarks = [ "file:///home/erwin/workspace" ]; bookmarks = [ "file:///home/erwin/workspace" ];
extraConfig = { extraConfig = {
gtk-application-prefer-dark-theme = 1; gtk-application-prefer-dark-theme = 1;
gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
}; };
}; };
gtk4 = { gtk4 = {
extraConfig = { extraConfig = {
gtk-application-prefer-dark-theme = 1; gtk-application-prefer-dark-theme = 1;
gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
}; };
}; };
}; };