commit 9f4df8b0ad5b199679dfa8eea1bbe740fce41bed
parent 42d6e414f1128aca8ece766d24a0cf788383001a
Author: mtmn <miro@haravara.org>
Date: Wed, 15 Apr 2026 17:54:29 +0200
chore: readd attic, disown pcm alias
Diffstat:
12 files changed, 26 insertions(+), 46 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -36,11 +36,11 @@
"rev": "e1c9d15025b992888b433826346c2c3a37410c32",
"revCount": 59,
"type": "git",
- "url": "ssh://git@codeberg.org/mtmn/corpus.git"
+ "url": "ssh://git@codeberg.org/mtmn/corpus"
},
"original": {
"type": "git",
- "url": "ssh://git@codeberg.org/mtmn/corpus.git"
+ "url": "ssh://git@codeberg.org/mtmn/corpus"
}
},
"crane": {
@@ -100,7 +100,6 @@
"original": {
"owner": "serokell",
"repo": "deploy-rs",
- "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171",
"type": "github"
}
},
@@ -183,11 +182,11 @@
]
},
"locked": {
- "lastModified": 1776046499,
- "narHash": "sha256-Wzc4nn07/0RL21ypPHRzNDQZcjhIC8LaYo7QJQjM5T4=",
+ "lastModified": 1776184304,
+ "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "287f84846c1eb3b72c986f5f6bebcff0bd67440d",
+ "rev": "3c7524c68348ef79ce48308e0978611a050089b2",
"type": "github"
},
"original": {
@@ -256,11 +255,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1775888245,
- "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=",
+ "lastModified": 1776225522,
+ "narHash": "sha256-W2npO5nesUm68vECpC3Dl/IOzamvcGAu9uV38hou2yg=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "13043924aaa7375ce482ebe2494338e058282925",
+ "rev": "975dad1a84d727dce241bb41b27191948fa5a956",
"type": "github"
},
"original": {
@@ -396,11 +395,11 @@
"rev": "8bf35f488b18b0e0b24b13c51920932021bf8029",
"revCount": 28,
"type": "git",
- "url": "ssh://git@codeberg.org/mtmn/tools.git"
+ "url": "ssh://git@codeberg.org/mtmn/tools"
},
"original": {
"type": "git",
- "url": "ssh://git@codeberg.org/mtmn/tools.git"
+ "url": "ssh://git@codeberg.org/mtmn/tools"
}
},
"utils": {
diff --git a/flake.nix b/flake.nix
@@ -15,7 +15,7 @@
};
deploy-rs = {
- url = "github:serokell/deploy-rs/77c906c0ba56aabdbc72041bf9111b565cdd6171";
+ url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs";
};
@@ -30,12 +30,12 @@
};
tools = {
- url = "git+ssh://git@codeberg.org/mtmn/tools.git";
+ url = "git+ssh://git@codeberg.org/mtmn/tools";
flake = false;
};
corpus = {
- url = "git+ssh://git@codeberg.org/mtmn/corpus.git";
+ url = "git+ssh://git@codeberg.org/mtmn/corpus";
};
};
@@ -169,6 +169,7 @@
"bandeno"
"headscale"
"searxng"
+ "attic"
"static"
"miniflux"
"corpus"
diff --git a/home.nix b/home.nix
@@ -41,13 +41,18 @@
auto-optimise-store = true;
warn-dirty = false;
experimental-features = ["nix-command" "flakes"];
+ access-tokens = [
+ "attic.saatana.cat=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE4MDc4MzA0ODgsIm5iZiI6MTc3NjI3Mjg4OCwic3ViIjoiaG9tZS1tYW5hZ2VyIiwiaHR0cHM6Ly9qd3QuYXR0aWMucnMvdjEiOnsiY2FjaGVzIjp7ImNlbnRyYWwiOnsiciI6MX19fX0.TnszDyNrf9Y2ll3sW5HHp8JaCCCUWztHzJdMoWoi_bTFYruk4oKj0MKlSbdFUCPKM5xanRu_wbdcINqaOEmM5o7u91Zdg_4Nr036h42xSMkj48QUt1zKbtNwSs65XyfouYnjSlyfJnfRhlhkyDPYxLoMelg6TbNXMSjEgAIRPLbXgAerckRMUW73fL6TyJeGP8jh9xlJfTedER7BWEwMnz3MTu8oLK7IoXKvQTXsuPALbnt84LgwUbaaXeQ6aJrjmZSsncxvezixShXoBwevYx2JpwgVURH54Qoa11u2L4Ffapfi57VD0LkMpA629kCmRpGUJ4_LrD3lrgY070izIKbI0Ktaxf6G2PyIS6bhiziP6Oy_7rj4KmPGsE2Hzyqra0YyIHO9Z-3L1PZhS-3WrL49AcjEPAC9YknU9E-aaabqirf0rWMQjvbHrszzBWpPlALLN3lJVlyL_nm9xVeV_ny4D_-MjpyFgi0MuD0UO2Q5ek0W3RyAY1pr4EbQrLPmYqEAvGbdc9ZGlKTHoPYdLvvcgvDRSn2P_eg2cVri4wzBBrB5Sw3Fss0B8SCT2A7bNaHFQaL6hH3NzL2F0x1O5JbCOqm7cDYMwzvtVKyRpuKLn90F1uuKsYIBt27Ej_ux9pcrXX-R5o_gE-74-lD4qSLWm7eD266R2fnmICCFM-o"
+ ];
substituters = [
"https://cache.nixos.org"
"https://nix-community.cachix.org"
+ "https://attic.saatana.cat/central"
];
trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+ "central:7OgUwblUa9YD6dVxXSApAGyC0/oQ/JJUH2puRZ0sv0M="
];
};
gc = {
diff --git a/hosts/nixaran/configuration.nix b/hosts/nixaran/configuration.nix
Binary files differ.
diff --git a/hosts/proton/default.nix b/hosts/proton/default.nix
@@ -76,6 +76,7 @@
nvd
ragenix
statix
+ attic-client
];
net_tools = with pkgs; [
diff --git a/hosts/void/default.nix b/hosts/void/default.nix
@@ -61,9 +61,6 @@
jaq
jq
datasette
- hledger
- hledger-iadd
- rainfrog
tokyocabinet
];
@@ -93,6 +90,7 @@
nix-diff
nix-output-monitor
niv
+ attic-client
];
net = with pkgs; [
@@ -137,35 +135,12 @@
fnlfmt
]);
- erlang =
- (with pkgs.beam28Packages; [
- erlang
- rebar3
- ])
- ++ (with pkgs; [
- gleam
- ]);
-
- haskell =
- (with pkgs.haskell.compiler; [
- ghc9124
- ])
- ++ (with pkgs.haskellPackages; [
- Cabal_3_16_1_0
- stack
- purescript
- purenix
- ])
- ++ (with pkgs; [
- cabal2nix
- ]);
-
other = with pkgs; [
miniserve
babashka
feather
- nodejs
esbuild
+ nodejs
picard
rustup
];
diff --git a/hosts/wsl/default.nix b/hosts/wsl/default.nix
@@ -77,6 +77,7 @@
ragenix
statix
nix-health
+ attic-client
];
net_tools = with pkgs; [
diff --git a/modules/mixins/dotfiles/config/foot/foot.ini b/modules/mixins/dotfiles/config/foot/foot.ini
@@ -17,7 +17,7 @@ blink=no
[colors-dark]
alpha = 0.85
-cursor=000000 ccaaee
+cursor=000000 008080
background=000000
foreground=ffffff
diff --git a/modules/mixins/dotfiles/config/shell/rc/aliased-short-names b/modules/mixins/dotfiles/config/shell/rc/aliased-short-names
@@ -25,7 +25,7 @@ alias mrd='magdalena recent-dirs'
alias mrf='magdalena recent-files'
alias pdm='pkill -f dmenu'
-alias pcm='pcmanfm'
+alias pcm='pcmanfm & disown'
alias duh='du -hs'
alias dfh='df -h'
diff --git a/modules/services/attic.nix b/modules/services/attic.nix
@@ -60,9 +60,6 @@ in {
endpoint = cfg.s3Endpoint;
region = cfg.s3Region;
};
- signing = {
- signing-key-paths = [cfg.signingKeyFile];
- };
};
environmentFile = cfg.credentialsFile;
};
diff --git a/secrets.nix b/secrets.nix
@@ -12,6 +12,7 @@ in {
"secrets/couchdb-admin-pass.age".publicKeys = allKeys;
"secrets/searx-secret-key.age".publicKeys = allKeys;
"secrets/headscale-api-key.age".publicKeys = allKeys;
+ "secrets/attic-credentials.age".publicKeys = allKeys;
"secrets/miniflux-secrets.age".publicKeys = allKeys;
"secrets/listenbrainz-token.age".publicKeys = allKeys;
"secrets/mpd-host.age".publicKeys = allKeys;
diff --git a/secrets/attic-credentials.age b/secrets/attic-credentials.age
Binary files differ.
