Compare commits
11 Commits
261c1358e6
...
3510d178ba
Author | SHA1 | Date | |
---|---|---|---|
3510d178ba | |||
0fef08fbdd | |||
6cae4953ab | |||
b65e8fee7e | |||
eb19dbbb52 | |||
cb835c4858 | |||
58a147b4ba | |||
fa8ff99915 | |||
94159aa48f | |||
979a6c3901 | |||
b17b90df5b |
8
TODO.md
8
TODO.md
@ -64,4 +64,10 @@ vless://{uuid}@{server_ip}:{server_port}?encryption=none&flow=xtls-rprx-vision&s
|
|||||||
ssh-to-pgp -i $HOME/.ssh/id_rsa -o ~/nixos-config/keys/users/ataraxia.asc
|
ssh-to-pgp -i $HOME/.ssh/id_rsa -o ~/nixos-config/keys/users/ataraxia.asc
|
||||||
|
|
||||||
ssh root@ip "cat /etc/ssh/ssh_host_rsa_key" | ssh-to-pgp -o ~/nixos-config/keys/hosts/hostname.asc
|
ssh root@ip "cat /etc/ssh/ssh_host_rsa_key" | ssh-to-pgp -o ~/nixos-config/keys/hosts/hostname.asc
|
||||||
```
|
```
|
||||||
|
|
||||||
|
* remove all github workflows
|
||||||
|
|
||||||
|
```bash
|
||||||
|
gh run list --limit 100 --json databaseId -q '.[].databaseId' | xargs -IID gh api --silent "repos/$(gh repo view --json nameWithOwner -q .nameWithOwner)/actions/runs/ID" -X DELETE
|
||||||
|
```
|
||||||
|
859
flake.lock
generated
859
flake.lock
generated
File diff suppressed because it is too large
Load Diff
@ -15,6 +15,11 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
impermanence.url = "github:nix-community/impermanence";
|
impermanence.url = "github:nix-community/impermanence";
|
||||||
|
lix-module = {
|
||||||
|
# url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
|
||||||
|
url = "https://github.com/AtaraxiaSjel/lix-nixos-module/archive/fix-2.91.0.tar.gz";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
aagl = {
|
aagl = {
|
||||||
url = "github:ezKEa/aagl-gtk-on-nix";
|
url = "github:ezKEa/aagl-gtk-on-nix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@ -34,7 +39,6 @@
|
|||||||
catppuccin.url = "github:catppuccin/nix";
|
catppuccin.url = "github:catppuccin/nix";
|
||||||
catppuccin-vsc.url = "github:catppuccin/vscode";
|
catppuccin-vsc.url = "github:catppuccin/vscode";
|
||||||
deploy-rs.url = "github:serokell/deploy-rs";
|
deploy-rs.url = "github:serokell/deploy-rs";
|
||||||
devenv.url = "github:cachix/devenv";
|
|
||||||
disko = {
|
disko = {
|
||||||
url = "github:nix-community/disko";
|
url = "github:nix-community/disko";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@ -107,6 +111,7 @@
|
|||||||
{ device = name; mainuser = "ataraxia"; }
|
{ device = name; mainuser = "ataraxia"; }
|
||||||
{ nixpkgs.config.allowUnfree = true; }
|
{ nixpkgs.config.allowUnfree = true; }
|
||||||
inputs.sops-nix.nixosModules.sops
|
inputs.sops-nix.nixosModules.sops
|
||||||
|
inputs.lix-module.nixosModules.default
|
||||||
];
|
];
|
||||||
specialArgs = { inherit self inputs self-nixpkgs; secrets = ./secrets; };
|
specialArgs = { inherit self inputs self-nixpkgs; secrets = ./secrets; };
|
||||||
};
|
};
|
||||||
|
@ -27,12 +27,12 @@
|
|||||||
./nginx.nix
|
./nginx.nix
|
||||||
../Home-Hypervisor/usb-hdd.nix
|
../Home-Hypervisor/usb-hdd.nix
|
||||||
|
|
||||||
inputs.chaotic.nixosModules.default
|
# inputs.chaotic.nixosModules.default
|
||||||
];
|
];
|
||||||
|
|
||||||
chaotic.mesa-git.enable = true;
|
# chaotic.mesa-git.enable = true;
|
||||||
chaotic.mesa-git.fallbackSpecialisation = true;
|
# chaotic.mesa-git.fallbackSpecialisation = true;
|
||||||
chaotic.mesa-git.method = "GBM_BACKENDS_PATH";
|
# chaotic.mesa-git.method = "GBM_BACKENDS_PATH";
|
||||||
|
|
||||||
networking.extraHosts = ''
|
networking.extraHosts = ''
|
||||||
127.0.0.1 code.ataraxiadev.com
|
127.0.0.1 code.ataraxiadev.com
|
||||||
@ -132,32 +132,36 @@
|
|||||||
home-manager.users.${config.mainuser} = {
|
home-manager.users.${config.mainuser} = {
|
||||||
home.packages = [
|
home.packages = [
|
||||||
inputs.nixos-generators.packages.${pkgs.hostPlatform.system}.nixos-generate
|
inputs.nixos-generators.packages.${pkgs.hostPlatform.system}.nixos-generate
|
||||||
pkgs.prismlauncher
|
|
||||||
pkgs.piper
|
|
||||||
pkgs.nix-alien
|
|
||||||
# pkgs.nix-init
|
|
||||||
pkgs.nixpkgs-review
|
|
||||||
pkgs.anydesk
|
|
||||||
pkgs.winbox
|
|
||||||
pkgs.devenv
|
pkgs.devenv
|
||||||
pkgs.radeontop
|
pkgs.nh
|
||||||
pkgs.wayvnc
|
pkgs.nix-alien
|
||||||
pkgs.distrobox
|
|
||||||
pkgs.nix-fast-build
|
|
||||||
pkgs.mitmproxy
|
|
||||||
pkgs.exercism
|
|
||||||
pkgs.packwiz
|
|
||||||
pkgs.streamrip
|
|
||||||
pkgs.nix-diff
|
pkgs.nix-diff
|
||||||
pkgs.dig.dnsutils
|
pkgs.nix-eval-jobs
|
||||||
|
pkgs.nix-fast-build
|
||||||
|
# pkgs.nix-init
|
||||||
|
pkgs.nix-update
|
||||||
|
pkgs.nixfmt-rfc-style
|
||||||
|
pkgs.nixos-anywhere
|
||||||
|
pkgs.nixpkgs-review
|
||||||
|
|
||||||
|
pkgs.anydesk
|
||||||
|
pkgs.arduino-ide
|
||||||
|
pkgs.dig.dnsutils
|
||||||
|
pkgs.distrobox
|
||||||
|
pkgs.exercism
|
||||||
|
pkgs.kdePackages.merkuro
|
||||||
pkgs.libsForQt5.ark
|
pkgs.libsForQt5.ark
|
||||||
pkgs.libsForQt5.dolphin
|
pkgs.libsForQt5.dolphin
|
||||||
pkgs.nh
|
pkgs.mitmproxy
|
||||||
pkgs.yt-archivist
|
|
||||||
pkgs.modprobed-db
|
pkgs.modprobed-db
|
||||||
pkgs.nixos-anywhere
|
pkgs.packwiz
|
||||||
pkgs.arduino-ide
|
pkgs.piper
|
||||||
|
pkgs.prismlauncher
|
||||||
|
pkgs.radeontop
|
||||||
|
pkgs.streamrip
|
||||||
|
pkgs.wayvnc
|
||||||
|
pkgs.winbox
|
||||||
|
pkgs.yt-archivist
|
||||||
];
|
];
|
||||||
xdg.configFile."distrobox/distrobox.conf".text = ''
|
xdg.configFile."distrobox/distrobox.conf".text = ''
|
||||||
container_always_pull="1"
|
container_always_pull="1"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{ modulesPath, lib, inputs, pkgs, config, ... }: {
|
{ modulesPath, lib, inputs, pkgs, config, ... }: {
|
||||||
imports = with inputs.self; [
|
imports = with inputs.self; [
|
||||||
"${toString modulesPath}/installer/cd-dvd/installation-cd-graphical-plasma5.nix"
|
"${toString modulesPath}/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix"
|
||||||
# "${toString modulesPath}/installer/cd-dvd/installation-cd-base.nix"
|
# "${toString modulesPath}/installer/cd-dvd/installation-cd-base.nix"
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -38,7 +38,6 @@
|
|||||||
"https://nixpkgs-wayland.cachix.org"
|
"https://nixpkgs-wayland.cachix.org"
|
||||||
"https://hyprland.cachix.org"
|
"https://hyprland.cachix.org"
|
||||||
"https://ataraxiadev-foss.cachix.org"
|
"https://ataraxiadev-foss.cachix.org"
|
||||||
"https://cache.ataraxiadev.com/ataraxiadev"
|
|
||||||
"https://numtide.cachix.org"
|
"https://numtide.cachix.org"
|
||||||
];
|
];
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
@ -47,7 +46,6 @@
|
|||||||
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
|
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
|
||||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||||
"ataraxiadev-foss.cachix.org-1:ws/jmPRUF5R8TkirnV1b525lP9F/uTBsz2KraV61058="
|
"ataraxiadev-foss.cachix.org-1:ws/jmPRUF5R8TkirnV1b525lP9F/uTBsz2KraV61058="
|
||||||
"ataraxiadev:V/fCdvz1bMsQzYZcLltcAULST+MoChv53EfedmyJ8Uw="
|
|
||||||
"numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
|
"numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
|
||||||
];
|
];
|
||||||
trusted-users = [ "root" config.mainuser "@wheel" ];
|
trusted-users = [ "root" config.mainuser "@wheel" ];
|
||||||
@ -80,5 +78,7 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
users.users.root.openssh.authorizedKeys.keys = config.users.users.nixos.openssh.authorizedKeys.keys;
|
users.users.root.openssh.authorizedKeys.keys = config.users.users.nixos.openssh.authorizedKeys.keys;
|
||||||
|
|
||||||
|
isoImage.squashfsCompression = "zstd -Xcompression-level 3";
|
||||||
};
|
};
|
||||||
}
|
}
|
@ -1,6 +1,6 @@
|
|||||||
{ config, lib, pkgs, inputs, ... }: {
|
{ config, lib, pkgs, inputs, ... }: {
|
||||||
nix = {
|
nix = {
|
||||||
package = pkgs.lix;
|
# package = pkgs.lix;
|
||||||
nixPath = lib.mkForce [ "self=/etc/self/compat" "nixpkgs=/etc/nixpkgs" ];
|
nixPath = lib.mkForce [ "self=/etc/self/compat" "nixpkgs=/etc/nixpkgs" ];
|
||||||
registry.self.flake = inputs.self;
|
registry.self.flake = inputs.self;
|
||||||
# registry.nixpkgs.flake = inputs.nixpkgs;
|
# registry.nixpkgs.flake = inputs.nixpkgs;
|
||||||
|
13
patches/fix-nix-2.19.patch
Normal file
13
patches/fix-nix-2.19.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/src/libutil/current-process.cc b/src/libutil/current-process.cc
|
||||||
|
index 352a6a0..7435f58 100644
|
||||||
|
--- a/src/libutil/current-process.cc
|
||||||
|
+++ b/src/libutil/current-process.cc
|
||||||
|
@@ -35,6 +35,8 @@ unsigned int getMaxCPU()
|
||||||
|
|
||||||
|
auto cpuMax = readFile(cpuFile);
|
||||||
|
auto cpuMaxParts = tokenizeString<std::vector<std::string>>(cpuMax, " \n");
|
||||||
|
+ if (cpuMaxParts.size() != 2)
|
||||||
|
+ return 0;
|
||||||
|
auto quota = cpuMaxParts[0];
|
||||||
|
auto period = cpuMaxParts[1];
|
||||||
|
if (quota != "max")
|
@ -14,7 +14,7 @@ let
|
|||||||
'';
|
'';
|
||||||
in {
|
in {
|
||||||
home-manager.users.${config.mainuser} = {
|
home-manager.users.${config.mainuser} = {
|
||||||
home.packages = [ pkgs.attic ];
|
home.packages = [ pkgs.attic-client ];
|
||||||
nix.settings = {
|
nix.settings = {
|
||||||
substituters = config.nix.settings.substituters;
|
substituters = config.nix.settings.substituters;
|
||||||
trusted-public-keys = config.nix.settings.trusted-public-keys;
|
trusted-public-keys = config.nix.settings.trusted-public-keys;
|
||||||
|
@ -140,12 +140,12 @@ in
|
|||||||
"formatting" = {
|
"formatting" = {
|
||||||
"command" = ["${pkgs.nixfmt-rfc-style}/bin/nixfmt"];
|
"command" = ["${pkgs.nixfmt-rfc-style}/bin/nixfmt"];
|
||||||
};
|
};
|
||||||
"nix" = {
|
# "nix" = {
|
||||||
"maxMemoryMB" = 4096;
|
# "maxMemoryMB" = 4096;
|
||||||
"flake" = {
|
# "flake" = {
|
||||||
"autoEvalInputs" = true;
|
# "autoEvalInputs" = true;
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
};
|
};
|
||||||
"nixd" = {
|
"nixd" = {
|
||||||
"formatting" = {
|
"formatting" = {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{ config, lib, pkgs, inputs, self-nixpkgs, ... }: {
|
{ config, lib, pkgs, inputs, self-nixpkgs, ... }: {
|
||||||
nix = {
|
nix = {
|
||||||
package = pkgs.lix;
|
# package = pkgs.lix;
|
||||||
nixPath = [ "self=/etc/self" "nixpkgs=/etc/nixpkgs" ];
|
nixPath = [ "self=/etc/self" "nixpkgs=/etc/nixpkgs" ];
|
||||||
|
|
||||||
registry.nixpkgs.flake = self-nixpkgs;
|
registry.nixpkgs.flake = self-nixpkgs;
|
||||||
|
@ -17,11 +17,10 @@ with lib; {
|
|||||||
inputs.deploy-rs.overlay
|
inputs.deploy-rs.overlay
|
||||||
(final: prev:
|
(final: prev:
|
||||||
{
|
{
|
||||||
attic = inputs.attic.packages.${system}.attic;
|
attic-client = inputs.attic.packages.${system}.attic;
|
||||||
attic-static = inputs.attic.packages.${system}.attic-static;
|
attic-server = inputs.attic.packages.${system}.attic-server;
|
||||||
cassowary-py = inputs.cassowary.packages.${system}.cassowary;
|
cassowary-py = inputs.cassowary.packages.${system}.cassowary;
|
||||||
devenv = inputs.devenv.packages.${system}.devenv;
|
# nix = prev.lix;
|
||||||
nix = prev.lix;
|
|
||||||
nix-alien = inputs.nix-alien.packages.${system}.nix-alien;
|
nix-alien = inputs.nix-alien.packages.${system}.nix-alien;
|
||||||
nix-fast-build = inputs.nix-fast-build.packages.${system}.default;
|
nix-fast-build = inputs.nix-fast-build.packages.${system}.default;
|
||||||
nix-index-update = inputs.nix-alien.packages.${system}.nix-index-update;
|
nix-index-update = inputs.nix-alien.packages.${system}.nix-index-update;
|
||||||
@ -39,6 +38,17 @@ with lib; {
|
|||||||
wine = prev.wineWow64Packages.stagingFull;
|
wine = prev.wineWow64Packages.stagingFull;
|
||||||
intel-vaapi-driver = prev.intel-vaapi-driver.override { enableHybridCodec = true; };
|
intel-vaapi-driver = prev.intel-vaapi-driver.override { enableHybridCodec = true; };
|
||||||
|
|
||||||
|
haskellPackages = prev.haskellPackages.override {
|
||||||
|
overrides = _hFinal: hPrev: {
|
||||||
|
# TODO: remove after cachix starts to use nix > v2.21
|
||||||
|
cachix = let
|
||||||
|
nix-fixed = prev.nixVersions.nix_2_19.overrideAttrs (oldAttrs: {
|
||||||
|
patches = oldAttrs.patches ++ [ ../patches/fix-nix-2.19.patch ];
|
||||||
|
});
|
||||||
|
in hPrev.cachix.override { nix = nix-fixed; };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
modprobed-db = prev.modprobed-db.overrideAttrs (oa: {
|
modprobed-db = prev.modprobed-db.overrideAttrs (oa: {
|
||||||
postPatch = (oa.postPatch or "") + ''
|
postPatch = (oa.postPatch or "") + ''
|
||||||
substituteInPlace ./common/modprobed-db.in \
|
substituteInPlace ./common/modprobed-db.in \
|
||||||
|
@ -63,14 +63,12 @@ in with config.deviceSpecific; with lib; {
|
|||||||
monitor=,highres,auto,1
|
monitor=,highres,auto,1
|
||||||
''}
|
''}
|
||||||
general {
|
general {
|
||||||
apply_sens_to_raw=false
|
|
||||||
border_size=1
|
border_size=1
|
||||||
no_border_on_floating=false
|
no_border_on_floating=false
|
||||||
gaps_in=6
|
gaps_in=6
|
||||||
gaps_out=16
|
gaps_out=16
|
||||||
col.active_border=0xAA${thm.base08-hex}
|
col.active_border=0xAA${thm.base08-hex}
|
||||||
col.inactive_border=0xAA${thm.base0A-hex}
|
col.inactive_border=0xAA${thm.base0A-hex}
|
||||||
sensitivity=1
|
|
||||||
col.nogroup_border=0xCC${thm.base0A-hex}
|
col.nogroup_border=0xCC${thm.base0A-hex}
|
||||||
col.nogroup_border_active=0xAA${thm.base08-hex}
|
col.nogroup_border_active=0xAA${thm.base08-hex}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user