teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

nixos: follow release-22.05

Browse source 
home: follow release-22.05 branch

Fixes for upstream changes:

ag renamed to silver-searcher, extfat-utils is now exfat, lot's of
overrides no longer needed, as they're now in the release branch,
services.caddy.config split up into globalConfig and extraConfig
This commit is contained in:
teutat3s 2022-06-02 10:09:42 +02:00
parent 47ffd26add
commit 8e43046dee
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
6 changed files with 50 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1648942457, "lastModified": 1652712410,
"narHash": "sha256-i29Z1t3sVfCNfpp+KAfeExvpqHQSbLO1KWylTtfradU=", "narHash": "sha256-hMJ2TqLt0DleEnQFGUHK9sV2aAzJPU8pZeiZoqRozbE=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "0d5e59ed645e4c7b60174bc6f6aac6a203dc0b01", "rev": "7e5e58b98c3dcbf497543ff6f22591552ebfe65b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,11 +87,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1650976225, "lastModified": 1651916036,
"narHash": "sha256-PGM65SQHS63Dd5MmLJo3GJsZP9lJVZmpWxluQoG1Dt8=", "narHash": "sha256-UuD9keUGm4IuVEV6wdSYbuRm7CwfXE63hVkzKDjVsh4=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "bb3baef6e115ae47bc2ab4973bd3a486488485b0", "rev": "2f2bdf658d2b79bada78dc914af99c53cad37cba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -130,11 +130,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1648475189, "lastModified": 1653594315,
"narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=", "narHash": "sha256-kJ0ENmnQJ4qL2FeYKZba9kvv1KmIuB3NVpBwMeI7AJQ=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3", "rev": "184349d8149436748986d1bdba087e4149e9c160",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -188,11 +188,11 @@
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
}, },
"locked": { "locked": {
"lastModified": 1651210705, "lastModified": 1652713922,
"narHash": "sha256-2RzKrjEnWDhsBQ4Et2gm2LjV5pXyszeqV1xNe+LtNT8=", "narHash": "sha256-era1h0M+QP9wP/hbwXRpxOiT8M5n+loWX/Zrq7duq5w=",
"owner": "divnix", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "0ffa2dff5ede12a03ca83fbc514972f94cf18f42", "rev": "29bbac0173859812893d777fdce204af83a231ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -269,11 +269,11 @@
"flake-utils": "flake-utils_3" "flake-utils": "flake-utils_3"
}, },
"locked": { "locked": {
"lastModified": 1647259887, "lastModified": 1652704544,
"narHash": "sha256-yEkMbEHVO9qydluQ3uHGWX1PkfZhgDKxnd1rhZYZ72w=", "narHash": "sha256-UTKE33tYgCmDszaVyWA33a8mtegM5xfH4fH8w4y6TxA=",
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "06dba5f3b4fa2cc0bfc98ce9cd6f9a4d8db11d46", "rev": "f8d6d1f87b6177e3bc674c29f247bdbf897ba274",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -314,11 +314,11 @@
}, },
"flake-utils_4": { "flake-utils_4": {
"locked": { "locked": {
"lastModified": 1644229661, "lastModified": 1652776076,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -349,16 +349,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1651007218, "lastModified": 1654113405,
"narHash": "sha256-NkQAMtqW0PSJTbLHalyZtaqj0ai2TZMOedug9yDIcFw=", "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d14adb99f3fb562ec74ad18c032efc154b438034", "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-21.11", "ref": "release-22.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -381,11 +381,11 @@
}, },
"latest_2": { "latest_2": {
"locked": { "locked": {
"lastModified": 1651007983, "lastModified": 1653931853,
"narHash": "sha256-GNay7yDPtLcRcKCNHldug85AhAvBpTtPEJWSSDYBw8U=", "narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e10da1c7f542515b609f8dfbcf788f3d85b14936", "rev": "f1c167688a6f81f4a51ab542e5f476c8c595e457",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -402,11 +402,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1650265945, "lastModified": 1653413650,
"narHash": "sha256-SO8+1db4jTOjnwP++29vVgImLIfETSXyoz0FuLkiikE=", "narHash": "sha256-wojDHjb+eU80MPH+3HQaK0liUy8EgR95rvmCl24i58Y=",
"owner": "nmattia", "owner": "nmattia",
"repo": "naersk", "repo": "naersk",
"rev": "e8f9f8d037774becd82fce2781e1abdb7836d7df", "rev": "69daaceebe12c070cd5ae69ba38f277bbf033695",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -423,11 +423,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1649569158, "lastModified": 1653198236,
"narHash": "sha256-Wtmiyu/1d+3YGGcRxTnQyEtnJaKKR/Ry0kNbOY48Afs=", "narHash": "sha256-nzW2BaqWTGGQthOtFzHUJTHK5wK+mkh4aOhETGj5nBk=",
"owner": "dramforever", "owner": "dramforever",
"repo": "nix-dram", "repo": "nix-dram",
"rev": "84c47c0dc93c77f7edfd996f71618d278844c1c4", "rev": "e10086d39ca49abfd2a3b77d2a77baa6037ec31e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -453,16 +453,16 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1651093906, "lastModified": 1654005557,
"narHash": "sha256-kHXSbv+Hc73eV0/JVJ5YsJGr08bA4vJ3/XZew5PgZg0=", "narHash": "sha256-J6elwUzPoco+r5qWPHhvS2EHVWomUtNcxzkfdAQOwEU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "feea25c58657fa81d16e0e51f80e1a02ef4cbd49", "rev": "08950a6e29cf7bddee466592eb790a417550f7f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-21.11", "ref": "nixos-22.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -473,11 +473,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1650997411, "lastModified": 1653339081,
"narHash": "sha256-r4a3qsSv5UTtx+pxTUEdOphBkwTx1+AAVog3c457A0M=", "narHash": "sha256-dpim9Mtd57Yj6qt7p7UKwjWm6NnOU3S7jaEyEscSyPE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "3cdf22c79bc80910e2b610cd59fcb8408354ddbc", "rev": "fb3ee0f618b8c80dea1239691b15dfeb4bb46331",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -488,11 +488,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1650522846, "lastModified": 1654057797,
"narHash": "sha256-SxWHXRI3qJwswyXAtzsi6PKVY3KLNNnb072KaJthII8=", "narHash": "sha256-mXo7C4v7Jj2feBzcReu1Eu/3Rnw5b023E9kOyFsHZQw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "6b4ebea9093c997c5f275c820e679108de4871ab", "rev": "0cab18a48de7914ef8cad35dca0bb36868f3e1af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -551,10 +551,9 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1626378135, "lastModified": 0,
"narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=", "narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=",
"path": "/nix/store/6mfkswqi67m35qwv0vh7kpk8rypbl2rq-source", "path": "/nix/store/6mfkswqi67m35qwv0vh7kpk8rypbl2rq-source",
"rev": "00c2ec8f0bbdf0cfb2135bde55fbae5d6b64aa6d",
"type": "path" "type": "path"
}, },
"original": { "original": {

4
flake.nix
View file

@ -8,7 +8,7 @@
inputs = inputs =
{ {
# Track channels with commits tested and built by hydra # Track channels with commits tested and built by hydra
nixos.url = "github:nixos/nixpkgs/nixos-21.11"; nixos.url = "github:nixos/nixpkgs/nixos-22.05";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
digga.url = "github:divnix/digga"; digga.url = "github:divnix/digga";
@ -21,7 +21,7 @@
bud.inputs.nixpkgs.follows = "nixos"; bud.inputs.nixpkgs.follows = "nixos";
bud.inputs.devshell.follows = "digga/devshell"; bud.inputs.devshell.follows = "digga/devshell";
home.url = "github:nix-community/home-manager/release-21.11"; home.url = "github:nix-community/home-manager/release-22.05";
home.inputs.nixpkgs.follows = "nixos"; home.inputs.nixpkgs.follows = "nixos";
darwin.url = "github:LnL7/nix-darwin"; darwin.url = "github:LnL7/nix-darwin";

2
modules/terminal-life/default.nix
View file

@ -27,7 +27,6 @@ in
home.packages = [ home.packages = [
ack ack
asciinema asciinema
ag
bat bat
exa exa
fd fd
@ -35,6 +34,7 @@ in
glow glow
nnn nnn
powerline powerline
silver-searcher
vifm vifm
watson watson
]; ];

8
modules/x-os/networking.nix
View file

@ -40,10 +40,10 @@ in
# Caddy reverse proxy for local services like cups # Caddy reverse proxy for local services like cups
services.caddy = { services.caddy = {
enable = true; enable = true;
config = '' globalConfig = ''
{ auto_https off
auto_https off '';
} extraConfig = ''
cups.local:80 cups.local:80
bind 127.0.0.1 bind 127.0.0.1
request_header Host localhost:631 request_header Host localhost:631

10
overlays/overrides.nix
View file

@ -14,17 +14,7 @@ channels: final: prev: {
starship starship
deploy-rs deploy-rs
nixUnstable
neovim-unwrapped
tdesktop tdesktop
xdg-desktop-portal
xdg-desktop-portal-gtk
xdg-desktop-portal-wlr
obs-studio
obs-studio-plugins
looking-glass-client
nix-direnv
vimPlugins
; ;

2
profiles/core/default.nix
View file

@ -48,7 +48,7 @@ in
dateutils dateutils
diffutils diffutils
findutils findutils
exfat-utils exfat
file file
# zippit # zippit