chore: towards a working build
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
9238ad58b0
commit
329bd51735
287
flake.lock
287
flake.lock
|
|
@ -41,7 +41,7 @@
|
||||||
"agenix": {
|
"agenix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"darwin": [
|
"darwin": [
|
||||||
"darwin"
|
"nix-darwin"
|
||||||
],
|
],
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixos"
|
"nixos"
|
||||||
|
|
@ -61,32 +61,12 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"darwin": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixos"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1688307440,
|
|
||||||
"narHash": "sha256-7PTjbN+/+b799YN7Tk2SS5Vh8A0L3gBo8hmB7Y0VXug=",
|
|
||||||
"owner": "LnL7",
|
|
||||||
"repo": "nix-darwin",
|
|
||||||
"rev": "b06bab83bdf285ea0ae3c8e145a081eb95959047",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "LnL7",
|
|
||||||
"repo": "nix-darwin",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"deno2nix": {
|
"deno2nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"devshell": "devshell_3",
|
"devshell": "devshell_2",
|
||||||
"flake-compat": "flake-compat_2",
|
"flake-compat": "flake-compat_2",
|
||||||
"flake-utils": "flake-utils_5",
|
"flake-utils": "flake-utils_3",
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686513235,
|
"lastModified": 1686513235,
|
||||||
|
|
@ -102,7 +82,7 @@
|
||||||
"url": "https://git.pub.solar/b12f/deno2.nix.git"
|
"url": "https://git.pub.solar/b12f/deno2.nix.git"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"deploy": {
|
"deploy-rs": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": [
|
"flake-compat": [
|
||||||
"flake-compat"
|
"flake-compat"
|
||||||
|
|
@ -113,11 +93,11 @@
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686747123,
|
"lastModified": 1695052866,
|
||||||
"narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=",
|
"narHash": "sha256-agn7F9Oww4oU6nPiw+YiYI9Xb4vOOE73w8PAoBRP4AA=",
|
||||||
"owner": "serokell",
|
"owner": "serokell",
|
||||||
"repo": "deploy-rs",
|
"repo": "deploy-rs",
|
||||||
"rev": "724463b5a94daa810abfc64a4f87faef4e00f984",
|
"rev": "e3f41832680801d0ee9e2ed33eb63af398b090e9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -127,28 +107,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"devshell": {
|
"devshell": {
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils_2",
|
|
||||||
"nixpkgs": [
|
|
||||||
"digga",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1671489820,
|
|
||||||
"narHash": "sha256-qoei5HDJ8psd1YUPD7DhbHdhLIT9L2nadscp4Qk37uk=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "devshell",
|
|
||||||
"rev": "5aa3a8039c68b4bf869327446590f4cdf90bb634",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "devshell",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"devshell_2": {
|
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"keycloak-theme-pub-solar",
|
"keycloak-theme-pub-solar",
|
||||||
|
|
@ -170,7 +128,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"devshell_3": {
|
"devshell_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"scan2paperless",
|
"scan2paperless",
|
||||||
|
|
@ -193,7 +151,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"devshell_4": {
|
"devshell_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"scan2paperless",
|
"scan2paperless",
|
||||||
|
|
@ -215,46 +173,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"digga": {
|
|
||||||
"inputs": {
|
|
||||||
"darwin": [
|
|
||||||
"darwin"
|
|
||||||
],
|
|
||||||
"deploy": [
|
|
||||||
"deploy"
|
|
||||||
],
|
|
||||||
"devshell": "devshell",
|
|
||||||
"flake-compat": [
|
|
||||||
"flake-compat"
|
|
||||||
],
|
|
||||||
"flake-utils": "flake-utils_3",
|
|
||||||
"flake-utils-plus": "flake-utils-plus",
|
|
||||||
"home-manager": [
|
|
||||||
"home"
|
|
||||||
],
|
|
||||||
"nixlib": [
|
|
||||||
"nixos"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixos"
|
|
||||||
],
|
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1674947971,
|
|
||||||
"narHash": "sha256-6gKqegJHs72jnfFP9g2sihl4fIZgtKgKuqU2rCkIdGY=",
|
|
||||||
"owner": "pub-solar",
|
|
||||||
"repo": "digga",
|
|
||||||
"rev": "2da608bd8afb48afef82c6b1b6d852a36094a497",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "pub-solar",
|
|
||||||
"ref": "fix/bootstrap-iso",
|
|
||||||
"repo": "digga",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"fix-atomic-container-restarts": {
|
"fix-atomic-container-restarts": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1688325567,
|
"lastModified": 1688325567,
|
||||||
|
|
@ -319,6 +237,24 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-parts": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1693611461,
|
||||||
|
"narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1659877975,
|
"lastModified": 1659877975,
|
||||||
|
|
@ -334,59 +270,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils-plus": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": [
|
|
||||||
"digga",
|
|
||||||
"flake-utils"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1654029967,
|
|
||||||
"narHash": "sha256-my3GQ3mQIw/1f6GPV1IhUZrcYQSWh0YJAMPNBjhXJDw=",
|
|
||||||
"owner": "gytis-ivaskevicius",
|
|
||||||
"repo": "flake-utils-plus",
|
|
||||||
"rev": "6271cf3842ff9c8a9af9e3508c547f86bc77d199",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "gytis-ivaskevicius",
|
|
||||||
"ref": "refs/pull/120/head",
|
|
||||||
"repo": "flake-utils-plus",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils_2": {
|
"flake-utils_2": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1642700792,
|
|
||||||
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils_3": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1667395993,
|
|
||||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils_4": {
|
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
|
|
@ -404,7 +288,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_5": {
|
"flake-utils_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_4"
|
"systems": "systems_4"
|
||||||
},
|
},
|
||||||
|
|
@ -422,7 +306,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_6": {
|
"flake-utils_4": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_6"
|
"systems": "systems_6"
|
||||||
},
|
},
|
||||||
|
|
@ -440,18 +324,18 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixos"
|
"nixos"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1687871164,
|
"lastModified": 1695108154,
|
||||||
"narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=",
|
"narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38",
|
"rev": "07682fff75d41f18327a871088d20af2710d4744",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -463,8 +347,8 @@
|
||||||
},
|
},
|
||||||
"keycloak-theme-pub-solar": {
|
"keycloak-theme-pub-solar": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"devshell": "devshell_2",
|
"devshell": "devshell",
|
||||||
"flake-utils": "flake-utils_4",
|
"flake-utils": "flake-utils_2",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixos"
|
"nixos"
|
||||||
]
|
]
|
||||||
|
|
@ -484,22 +368,6 @@
|
||||||
"url": "https://git.pub.solar/pub-solar/keycloak-theme"
|
"url": "https://git.pub.solar/pub-solar/keycloak-theme"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"latest": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1693663421,
|
|
||||||
"narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "e56990880811a451abd32515698c712788be5720",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"master": {
|
"master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1693817516,
|
"lastModified": 1693817516,
|
||||||
|
|
@ -534,6 +402,27 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nix-darwin": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixos"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1695686713,
|
||||||
|
"narHash": "sha256-rJATx5B/nwlBpt7CJUf85LV27qWPbul5UVV8fu6ABPg=",
|
||||||
|
"owner": "lnl7",
|
||||||
|
"repo": "nix-darwin",
|
||||||
|
"rev": "e236a1e598a9a59265897948ac9874c364b9555f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "lnl7",
|
||||||
|
"ref": "master",
|
||||||
|
"repo": "nix-darwin",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixos": {
|
"nixos": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1693636127,
|
"lastModified": 1693636127,
|
||||||
|
|
@ -550,6 +439,21 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixos-flake": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1692742948,
|
||||||
|
"narHash": "sha256-19LQQFGshuQNrrXZYVt+mWY0O3NbhEXeMy3MZwzYZGo=",
|
||||||
|
"owner": "srid",
|
||||||
|
"repo": "nixos-flake",
|
||||||
|
"rev": "2c25190ceacdaaae7e8afbecfa87096bb499a431",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "srid",
|
||||||
|
"repo": "nixos-flake",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686838567,
|
"lastModified": 1686838567,
|
||||||
|
|
@ -581,13 +485,31 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1672791794,
|
"dir": "lib",
|
||||||
"narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=",
|
"lastModified": 1693471703,
|
||||||
|
"narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"dir": "lib",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1695830400,
|
||||||
|
"narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d",
|
"rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -597,7 +519,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686412476,
|
"lastModified": 1686412476,
|
||||||
"narHash": "sha256-inl9SVk6o5h75XKC79qrDCAobTD1Jxh6kVYTZKHzewA=",
|
"narHash": "sha256-inl9SVk6o5h75XKC79qrDCAobTD1Jxh6kVYTZKHzewA=",
|
||||||
|
|
@ -613,7 +535,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1693158576,
|
"lastModified": 1693158576,
|
||||||
"narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=",
|
"narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=",
|
||||||
|
|
@ -633,28 +555,29 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"adblock-unbound": "adblock-unbound",
|
"adblock-unbound": "adblock-unbound",
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
"darwin": "darwin",
|
"deploy-rs": "deploy-rs",
|
||||||
"deploy": "deploy",
|
|
||||||
"digga": "digga",
|
|
||||||
"fix-atomic-container-restarts": "fix-atomic-container-restarts",
|
"fix-atomic-container-restarts": "fix-atomic-container-restarts",
|
||||||
"fix-yubikey-agent": "fix-yubikey-agent",
|
"fix-yubikey-agent": "fix-yubikey-agent",
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
"home": "home",
|
"flake-parts": "flake-parts",
|
||||||
|
"home-manager": "home-manager",
|
||||||
"keycloak-theme-pub-solar": "keycloak-theme-pub-solar",
|
"keycloak-theme-pub-solar": "keycloak-theme-pub-solar",
|
||||||
"latest": "latest",
|
|
||||||
"master": "master",
|
"master": "master",
|
||||||
"musnix": "musnix",
|
"musnix": "musnix",
|
||||||
|
"nix-darwin": "nix-darwin",
|
||||||
"nixos": "nixos",
|
"nixos": "nixos",
|
||||||
|
"nixos-flake": "nixos-flake",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
|
"nixpkgs": "nixpkgs_2",
|
||||||
"scan2paperless": "scan2paperless"
|
"scan2paperless": "scan2paperless"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"scan2paperless": {
|
"scan2paperless": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"deno2nix": "deno2nix",
|
"deno2nix": "deno2nix",
|
||||||
"devshell": "devshell_4",
|
"devshell": "devshell_3",
|
||||||
"flake-utils": "flake-utils_6",
|
"flake-utils": "flake-utils_4",
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1693298356,
|
"lastModified": 1693298356,
|
||||||
|
|
|
||||||
313
flake.nix
313
flake.nix
|
|
@ -19,13 +19,13 @@
|
||||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||||
nixos-flake.url = "github:srid/nixos-flake";
|
nixos-flake.url = "github:srid/nixos-flake";
|
||||||
|
|
||||||
deploy.url = "github:serokell/deploy-rs";
|
deploy-rs.url = "github:serokell/deploy-rs";
|
||||||
deploy.inputs.nixpkgs.follows = "nixos";
|
deploy-rs.inputs.nixpkgs.follows = "nixos";
|
||||||
deploy.inputs.flake-compat.follows = "flake-compat";
|
deploy-rs.inputs.flake-compat.follows = "flake-compat";
|
||||||
|
|
||||||
agenix.url = "github:ryantm/agenix";
|
agenix.url = "github:ryantm/agenix";
|
||||||
agenix.inputs.nixpkgs.follows = "nixos";
|
agenix.inputs.nixpkgs.follows = "nixos";
|
||||||
agenix.inputs.darwin.follows = "darwin";
|
agenix.inputs.darwin.follows = "nix-darwin";
|
||||||
|
|
||||||
nixos-hardware.url = "github:nixos/nixos-hardware";
|
nixos-hardware.url = "github:nixos/nixos-hardware";
|
||||||
|
|
||||||
|
|
@ -55,27 +55,62 @@
|
||||||
inputs.nixos-flake.flakeModule
|
inputs.nixos-flake.flakeModule
|
||||||
];
|
];
|
||||||
|
|
||||||
perSystem = { system, config, ... }: {
|
perSystem = { system, pkgs, config, ... }: {
|
||||||
# Code to consume overlays, see https://flake.parts/overlays#consuming-an-overlay
|
# Code to consume overlays, see https://flake.parts/overlays#consuming-an-overlay
|
||||||
_module.args.pkgs = import inputs.nixos {
|
_module.args.pkgs = import inputs.nixos {
|
||||||
inherit system;
|
inherit system;
|
||||||
overlays = [
|
overlays = [
|
||||||
agenix.overlays.default
|
inputs.agenix.overlays.default
|
||||||
(import ./pkgs/default.nix)
|
(import ./pkgs/default.nix)
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
devShells.default = pkgs.mkShell {
|
||||||
|
buildInputs = [
|
||||||
|
pkgs.nixpkgs-fmt
|
||||||
|
pkgs.sops
|
||||||
|
pkgs.ssh-to-age
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
flake = {
|
flake = {
|
||||||
# Configurations for Linux (NixOS) machines
|
# Configurations for Linux (NixOS) machines
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
biolimo = self.nixos-flake.lib.mkLinuxSystem "x86_64-linux" {
|
biolimo = self.nixos-flake.lib.mkLinuxSystem {
|
||||||
|
nixpkgs.hostPlatform = "x86_64-linux";
|
||||||
imports = [
|
imports = [
|
||||||
self.nixosModules.linux
|
self.nixosModules.base
|
||||||
self.nixosModules.home-manager
|
|
||||||
self.nixosModules.agenix
|
|
||||||
self.nixosModules.musnix
|
|
||||||
./hosts/biolimo/default.nix
|
./hosts/biolimo/default.nix
|
||||||
|
./users/b12f/default.nix
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
chocolatebar = self.nixos-flake.lib.mkLinuxSystem {
|
||||||
|
nixpkgs.hostPlatform = "x86_64-linux";
|
||||||
|
imports = [
|
||||||
|
self.nixosModules.base
|
||||||
|
./hosts/chocolatebar/default.nix
|
||||||
|
./users/b12f/default.nix
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
pie = self.nixos-flake.lib.mkLinuxSystem {
|
||||||
|
nixpkgs.hostPlatform = "aarch64-linux";
|
||||||
|
imports = [
|
||||||
|
self.nixosModules.base
|
||||||
|
inputs.nixos-hardware.nixosModules.raspberry-pi-4
|
||||||
|
./hosts/pie/default.nix
|
||||||
|
./users/yule/default.nix
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
maoam = self.nixos-flake.lib.mkLinuxSystem {
|
||||||
|
nixpkgs.hostPlatform = "aarch64-linux";
|
||||||
|
imports = [
|
||||||
|
self.nixosModules.base
|
||||||
|
./hosts/maoam/default.nix
|
||||||
|
./users/yule/default.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -83,19 +118,18 @@
|
||||||
nixosModules = rec {
|
nixosModules = rec {
|
||||||
arduino = import ./modules/arduino/default.nix;
|
arduino = import ./modules/arduino/default.nix;
|
||||||
audio = import ./modules/audio/default.nix;
|
audio = import ./modules/audio/default.nix;
|
||||||
ci-runner = import ./modules/ci-runner/default.nix;
|
# ci-runner = import ./modules/ci-runner/default.nix;
|
||||||
core = import ./modules/core/default.nix;
|
core = import ./modules/core/default.nix;
|
||||||
crypto = import ./modules/crypto/default.nix;
|
crypto = import ./modules/crypto/default.nix;
|
||||||
devops = import ./modules/devops/default.nix;
|
devops = import ./modules/devops/default.nix;
|
||||||
docker = import ./modules/docker/default.nix;
|
# docker = import ./modules/docker/default.nix;
|
||||||
docker-ci-runner = import ./modules/docker-ci-runner/default.nix;
|
# docker-ci-runner = import ./modules/docker-ci-runner/default.nix;
|
||||||
email = import ./modules/email/default.nix;
|
email = import ./modules/email/default.nix;
|
||||||
factorio = import ./modules/factorio/default.nix;
|
|
||||||
gaming = import ./modules/gaming/default.nix;
|
gaming = import ./modules/gaming/default.nix;
|
||||||
graphical = import ./modules/graphical/default.nix;
|
graphical = import ./modules/graphical/default.nix;
|
||||||
mobile = import ./modules/mobile/default.nix;
|
mobile = import ./modules/mobile/default.nix;
|
||||||
nextcloud = import ./modules/nextcloud/default.nix;
|
# nextcloud = import ./modules/nextcloud/default.nix;
|
||||||
office = import ./modules/office/default.nix;
|
# office = import ./modules/office/default.nix;
|
||||||
paperless = import ./modules/paperless/default.nix;
|
paperless = import ./modules/paperless/default.nix;
|
||||||
paranoia = import ./modules/paranoia/default.nix;
|
paranoia = import ./modules/paranoia/default.nix;
|
||||||
printing = import ./modules/printing/default.nix;
|
printing = import ./modules/printing/default.nix;
|
||||||
|
|
@ -104,197 +138,78 @@
|
||||||
terminal-life = import ./modules/terminal-life/default.nix;
|
terminal-life = import ./modules/terminal-life/default.nix;
|
||||||
uhk = import ./modules/uhk/default.nix;
|
uhk = import ./modules/uhk/default.nix;
|
||||||
user = import ./modules/user/default.nix;
|
user = import ./modules/user/default.nix;
|
||||||
virtualisation = import ./modules/virtualisation/default.nix;
|
# virtualisation = import ./modules/virtualisation/default.nix;
|
||||||
|
|
||||||
|
root = import ./users/root/default.nix;
|
||||||
|
|
||||||
base = [users.pub-solar users.root];
|
base.imports = [
|
||||||
iso = base ++ [base-user graphical pub-solar-iso];
|
self.nixosModules.home-manager
|
||||||
pubsolaros = [full-install base-user users.root];
|
inputs.agenix.nixosModules.default
|
||||||
anonymous = [pubsolaros users.pub-solar];
|
inputs.musnix.nixosModules.musnix
|
||||||
|
|
||||||
b12f = pubsolaros ++ [users.b12f social gaming mobile];
|
({ flake, pkgs, lib, ... }: {
|
||||||
biolimo = b12f ++ [graphical];
|
nixpkgs.overlays = [ (import ./pkgs/default.nix) ];
|
||||||
chocolatebar = b12f ++ [graphical virtualisation];
|
})
|
||||||
|
|
||||||
yule = pubsolaros ++ [users.yule];
|
arduino
|
||||||
droppie = yule ++ [];
|
audio
|
||||||
pie = yule ++ [];
|
# ci-runner
|
||||||
maoam = b12f ++ [];
|
core
|
||||||
|
crypto
|
||||||
|
devops
|
||||||
|
# docker
|
||||||
|
# docker-ci-runner
|
||||||
|
email
|
||||||
|
gaming
|
||||||
|
graphical
|
||||||
|
mobile
|
||||||
|
# nextcloud
|
||||||
|
# office
|
||||||
|
paperless
|
||||||
|
paranoia
|
||||||
|
printing
|
||||||
|
social
|
||||||
|
sway
|
||||||
|
terminal-life
|
||||||
|
uhk
|
||||||
|
user
|
||||||
|
# virtualisation
|
||||||
|
|
||||||
|
root
|
||||||
|
];
|
||||||
|
|
||||||
|
full-install = {
|
||||||
|
# pub-solar.audio.bluetooth.enable = true;
|
||||||
|
# pub-solar.docker.enable = true;
|
||||||
|
# pub-solar.nextcloud.enable = true;
|
||||||
|
# pub-solar.office.enable = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
homeModules = { };
|
homeModules = { };
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
outputs = {
|
# deploy.nodes = {
|
||||||
self,
|
# droppie = {
|
||||||
digga,
|
# hostname = "backup.b12f.io";
|
||||||
nixos,
|
# sshUser = "yule";
|
||||||
home,
|
# remoteBuild = true;
|
||||||
nixos-hardware,
|
# path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.droppie;
|
||||||
agenix,
|
|
||||||
deploy,
|
|
||||||
scan2paperless,
|
|
||||||
musnix,
|
|
||||||
...
|
|
||||||
} @ inputs:
|
|
||||||
digga.lib.mkFlake
|
|
||||||
{
|
|
||||||
inherit self inputs;
|
|
||||||
|
|
||||||
channelsConfig = {
|
|
||||||
allowUnfree = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
supportedSystems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin"];
|
|
||||||
|
|
||||||
channels = {
|
|
||||||
nixos = {
|
|
||||||
imports = [(digga.lib.importOverlays ./overlays)];
|
|
||||||
overlays = [
|
|
||||||
(self: super: {
|
|
||||||
deploy-rs = {
|
|
||||||
inherit (inputs.nixos.legacyPackages.x86_64-linux) deploy-rs;
|
|
||||||
lib = inputs.deploy.lib.x86_64-linux;
|
|
||||||
};
|
|
||||||
})
|
|
||||||
];
|
|
||||||
};
|
|
||||||
latest = {};
|
|
||||||
};
|
|
||||||
|
|
||||||
lib = import ./lib {lib = digga.lib // nixos.lib;};
|
|
||||||
|
|
||||||
sharedOverlays = [
|
|
||||||
(final: prev: {
|
|
||||||
__dontExport = true;
|
|
||||||
lib = prev.lib.extend (lfinal: lprev: {
|
|
||||||
our = self.lib;
|
|
||||||
});
|
|
||||||
})
|
|
||||||
agenix.overlays.default
|
|
||||||
|
|
||||||
(import ./pkgs)
|
|
||||||
];
|
|
||||||
|
|
||||||
nixos = {
|
|
||||||
hostDefaults = {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
channelName = "nixos";
|
|
||||||
imports = [(digga.lib.importExportableModules ./modules)];
|
|
||||||
modules = [
|
|
||||||
{lib.our = self.lib;}
|
|
||||||
# FIXME: upstream module causes a huge number of unnecessary
|
|
||||||
# dependencies to be pulled in for all systems -- many of them are
|
|
||||||
# graphical. should only be imported as needed.
|
|
||||||
# digga.nixosModules.bootstrapIso
|
|
||||||
digga.nixosModules.nixConfig
|
|
||||||
home.nixosModules.home-manager
|
|
||||||
agenix.nixosModules.age
|
|
||||||
musnix.nixosModules.musnix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
imports = [(digga.lib.importHosts ./hosts)];
|
|
||||||
hosts = {
|
|
||||||
# Set host-specific properties here
|
|
||||||
bootstrap = {
|
|
||||||
modules = [
|
|
||||||
digga.nixosModules.bootstrapIso
|
|
||||||
];
|
|
||||||
};
|
|
||||||
PubSolarOS = {
|
|
||||||
tests = [
|
|
||||||
#(import ./tests/first-test.nix {
|
|
||||||
# pkgs = nixos.legacyPackages.x86_64-linux;
|
|
||||||
# lib = nixos.lib;
|
|
||||||
#})
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
pie = {
|
|
||||||
system = "aarch64-linux";
|
|
||||||
modules = [nixos-hardware.nixosModules.raspberry-pi-4];
|
|
||||||
};
|
|
||||||
|
|
||||||
maoam = {
|
|
||||||
system = "aarch64-linux";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
importables = rec {
|
|
||||||
profiles =
|
|
||||||
digga.lib.rakeLeaves ./profiles
|
|
||||||
// {
|
|
||||||
users = digga.lib.rakeLeaves ./users;
|
|
||||||
};
|
|
||||||
|
|
||||||
suites = with profiles; rec {
|
|
||||||
base = [users.pub-solar users.root];
|
|
||||||
iso = base ++ [base-user graphical pub-solar-iso];
|
|
||||||
pubsolaros = [full-install base-user users.root];
|
|
||||||
anonymous = [pubsolaros users.pub-solar];
|
|
||||||
|
|
||||||
b12f = pubsolaros ++ [users.b12f social gaming mobile];
|
|
||||||
biolimo = b12f ++ [graphical];
|
|
||||||
chocolatebar = b12f ++ [graphical virtualisation];
|
|
||||||
|
|
||||||
yule = pubsolaros ++ [users.yule];
|
|
||||||
droppie = yule ++ [];
|
|
||||||
pie = yule ++ [];
|
|
||||||
maoam = b12f ++ [];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
home = {
|
|
||||||
imports = [(digga.lib.importExportableModules ./users/modules)];
|
|
||||||
modules = [];
|
|
||||||
importables = rec {
|
|
||||||
profiles = digga.lib.rakeLeaves ./users/profiles;
|
|
||||||
suites = with profiles; rec {
|
|
||||||
base = [direnv git];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
users = let
|
|
||||||
default = {suites, ...}: {
|
|
||||||
imports = suites.base;
|
|
||||||
home.stateVersion = "21.03";
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
pub-solar = default;
|
|
||||||
b12f = default;
|
|
||||||
yule = default;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
devshell = ./shell;
|
|
||||||
|
|
||||||
homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
|
|
||||||
|
|
||||||
deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations {
|
|
||||||
droppie = {
|
|
||||||
hostname = "backup.b12f.io";
|
|
||||||
sshUser = "yule";
|
|
||||||
};
|
|
||||||
|
|
||||||
pie = {
|
|
||||||
sshUser = "yule";
|
|
||||||
};
|
|
||||||
|
|
||||||
maoam = {
|
|
||||||
sshUser = "b12f";
|
|
||||||
};
|
|
||||||
#example = {
|
|
||||||
# hostname = "example.com:22";
|
|
||||||
# sshUser = "bartender";
|
|
||||||
# fastConnect = true;
|
|
||||||
# profilesOrder = ["system" "direnv"];
|
|
||||||
# profiles.direnv = {
|
|
||||||
# user = "bartender";
|
|
||||||
# path = self.pkgs.x86_64-linux.nixos.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.bartender;
|
|
||||||
# };
|
# };
|
||||||
#};
|
|
||||||
};
|
# pie = {
|
||||||
|
# sshUser = "yule";
|
||||||
|
# remoteBuild = true;
|
||||||
|
# path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.pie;
|
||||||
|
# };
|
||||||
|
|
||||||
|
# maoam = {
|
||||||
|
# sshUser = "b12f";
|
||||||
|
# remoteBuild = true;
|
||||||
|
# path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.maoam;
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
|
||||||
|
# checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
@ -7,6 +8,9 @@ with lib; let
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
||||||
in {
|
in {
|
||||||
|
pub-solar.graphical.enable = true;
|
||||||
|
pub-solar.sway.enable = true;
|
||||||
|
|
||||||
# Use the systemd-boot EFI boot loader.
|
# Use the systemd-boot EFI boot loader.
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,10 @@ with lib; let
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
||||||
in {
|
in {
|
||||||
|
pub-solar.graphical.enable = true;
|
||||||
|
pub-solar.sway.enable = true;
|
||||||
|
pub-solar.virtualisation.enable = true;
|
||||||
|
|
||||||
hardware.cpu.amd.updateMicrocode = true;
|
hardware.cpu.amd.updateMicrocode = true;
|
||||||
|
|
||||||
hardware.opengl.extraPackages = with pkgs; [
|
hardware.opengl.extraPackages = with pkgs; [
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
masterModulesPath,
|
|
||||||
inputs,
|
inputs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
@ -11,14 +10,6 @@ with lib; let
|
||||||
cfg = config.pub-solar.paperless;
|
cfg = config.pub-solar.paperless;
|
||||||
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
||||||
in {
|
in {
|
||||||
imports = [
|
|
||||||
"${masterModulesPath}/services/misc/paperless.nix"
|
|
||||||
];
|
|
||||||
|
|
||||||
disabledModules = [
|
|
||||||
"services/misc/paperless.nix"
|
|
||||||
];
|
|
||||||
|
|
||||||
options.pub-solar.paperless = {
|
options.pub-solar.paperless = {
|
||||||
enable = mkEnableOption "All you need to go paperless";
|
enable = mkEnableOption "All you need to go paperless";
|
||||||
ocrLanguage = mkOption {
|
ocrLanguage = mkOption {
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 513 KiB After Width: | Height: | Size: 513 KiB |
|
|
@ -1,12 +1,16 @@
|
||||||
{
|
{
|
||||||
lib,
|
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
|
lib,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
with lib; let
|
psCfg = config.pub-solar;
|
||||||
cfg = config.pub-solar;
|
in
|
||||||
in {
|
with lib; {
|
||||||
|
imports = [
|
||||||
|
./home.nix
|
||||||
|
];
|
||||||
|
|
||||||
options.pub-solar = {
|
options.pub-solar = {
|
||||||
user = {
|
user = {
|
||||||
name = mkOption {
|
name = mkOption {
|
||||||
|
|
@ -46,4 +50,37 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
config = {
|
||||||
|
users = {
|
||||||
|
mutableUsers = false;
|
||||||
|
|
||||||
|
users = with pkgs;
|
||||||
|
pkgs.lib.setAttrByPath [psCfg.user.name] {
|
||||||
|
# Indicates whether this is an account for a “real” user.
|
||||||
|
# This automatically sets group to users, createHome to true,
|
||||||
|
# home to /home/username, useDefaultShell to true, and isSystemUser to false.
|
||||||
|
isNormalUser = true;
|
||||||
|
description = psCfg.user.description;
|
||||||
|
extraGroups = [
|
||||||
|
"input"
|
||||||
|
"lp"
|
||||||
|
"networkmanager"
|
||||||
|
"scanner"
|
||||||
|
"video"
|
||||||
|
"dialout"
|
||||||
|
"wheel"
|
||||||
|
];
|
||||||
|
shell = pkgs.bash;
|
||||||
|
initialHashedPassword =
|
||||||
|
if psCfg.user.password != null
|
||||||
|
then psCfg.user.password
|
||||||
|
else "";
|
||||||
|
openssh.authorizedKeys.keys =
|
||||||
|
if psCfg.user.publicKeys != null
|
||||||
|
then psCfg.user.publicKeys
|
||||||
|
else [];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
{
|
|
||||||
self,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (lib) fileContents;
|
|
||||||
in {
|
|
||||||
pub-solar.audio.enable = true;
|
|
||||||
}
|
|
||||||
|
|
@ -1,243 +0,0 @@
|
||||||
# Configuration file for dircolors, a utility to help you set the
|
|
||||||
# LS_COLORS environment variable used by GNU ls with the --color option.
|
|
||||||
|
|
||||||
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
|
||||||
# Copying and distribution of this file, with or without modification,
|
|
||||||
# are permitted provided the copyright notice and this notice are preserved.
|
|
||||||
|
|
||||||
# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
|
|
||||||
# slackware version of dircolors) are recognized but ignored.
|
|
||||||
|
|
||||||
# You can copy this file to .dir_colors in your $HOME directory to override
|
|
||||||
# the system defaults.
|
|
||||||
|
|
||||||
# Below, there should be one TERM entry for each termtype that is colorizable
|
|
||||||
TERM Eterm
|
|
||||||
TERM ansi
|
|
||||||
TERM color-xterm
|
|
||||||
TERM con132x25
|
|
||||||
TERM con132x30
|
|
||||||
TERM con132x43
|
|
||||||
TERM con132x60
|
|
||||||
TERM con80x25
|
|
||||||
TERM con80x28
|
|
||||||
TERM con80x30
|
|
||||||
TERM con80x43
|
|
||||||
TERM con80x50
|
|
||||||
TERM con80x60
|
|
||||||
TERM cons25
|
|
||||||
TERM console
|
|
||||||
TERM cygwin
|
|
||||||
TERM dtterm
|
|
||||||
TERM eterm-color
|
|
||||||
TERM gnome
|
|
||||||
TERM gnome-256color
|
|
||||||
TERM hurd
|
|
||||||
TERM jfbterm
|
|
||||||
TERM konsole
|
|
||||||
TERM kterm
|
|
||||||
TERM linux
|
|
||||||
TERM linux-c
|
|
||||||
TERM mach-color
|
|
||||||
TERM mach-gnu-color
|
|
||||||
TERM mlterm
|
|
||||||
TERM putty
|
|
||||||
TERM putty-256color
|
|
||||||
TERM rxvt
|
|
||||||
TERM rxvt-256color
|
|
||||||
TERM rxvt-cygwin
|
|
||||||
TERM rxvt-cygwin-native
|
|
||||||
TERM rxvt-unicode
|
|
||||||
TERM rxvt-unicode-256color
|
|
||||||
TERM rxvt-unicode256
|
|
||||||
TERM screen
|
|
||||||
TERM screen-256color
|
|
||||||
TERM screen-256color-bce
|
|
||||||
TERM screen-bce
|
|
||||||
TERM screen-w
|
|
||||||
TERM screen.Eterm
|
|
||||||
TERM screen.rxvt
|
|
||||||
TERM screen.linux
|
|
||||||
TERM st
|
|
||||||
TERM st-256color
|
|
||||||
TERM terminator
|
|
||||||
TERM vt100
|
|
||||||
TERM xterm
|
|
||||||
TERM xterm-16color
|
|
||||||
TERM xterm-256color
|
|
||||||
TERM xterm-88color
|
|
||||||
TERM xterm-color
|
|
||||||
TERM xterm-debian
|
|
||||||
|
|
||||||
# Below are the color init strings for the basic file types. A color init
|
|
||||||
# string consists of one or more of the following numeric codes:
|
|
||||||
# Attribute codes:
|
|
||||||
# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
|
|
||||||
# Text color codes:
|
|
||||||
# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
|
|
||||||
# Background color codes:
|
|
||||||
# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
|
|
||||||
#NORMAL 00 # no color code at all
|
|
||||||
#FILE 00 # regular file: use no color at all
|
|
||||||
RESET 0 # reset to "normal" color
|
|
||||||
DIR 01;34 # directory
|
|
||||||
LINK 01;36 # symbolic link. (If you set this to 'target' instead of a
|
|
||||||
# numerical value, the color is as for the file pointed to.)
|
|
||||||
MULTIHARDLINK 00 # regular file with more than one link
|
|
||||||
FIFO 40;33 # pipe
|
|
||||||
SOCK 01;35 # socket
|
|
||||||
DOOR 01;35 # door
|
|
||||||
BLK 40;33;01 # block device driver
|
|
||||||
CHR 40;33;01 # character device driver
|
|
||||||
ORPHAN 01;05;37;41 # orphaned syminks
|
|
||||||
MISSING 01;05;37;41 # ... and the files they point to
|
|
||||||
SETUID 37;41 # file that is setuid (u+s)
|
|
||||||
SETGID 30;43 # file that is setgid (g+s)
|
|
||||||
CAPABILITY 30;41 # file with capability
|
|
||||||
STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w)
|
|
||||||
OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
|
|
||||||
STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable
|
|
||||||
|
|
||||||
# This is for files with execute permission:
|
|
||||||
EXEC 01;32
|
|
||||||
|
|
||||||
# List any file extensions like '.gz' or '.tar' that you would like ls
|
|
||||||
# to colorize below. Put the extension, a space, and the color init string.
|
|
||||||
# (and any comments you want to add after a '#')
|
|
||||||
|
|
||||||
# If you use DOS-style suffixes, you may want to uncomment the following:
|
|
||||||
#.cmd 01;32 # executables (bright green)
|
|
||||||
#.exe 01;32
|
|
||||||
#.com 01;32
|
|
||||||
#.btm 01;32
|
|
||||||
#.bat 01;32
|
|
||||||
# Or if you want to colorize scripts even if they do not have the
|
|
||||||
# executable bit actually set.
|
|
||||||
#.sh 01;32
|
|
||||||
#.csh 01;32
|
|
||||||
|
|
||||||
# archives or compressed (bright red)
|
|
||||||
.tar 01;31
|
|
||||||
.tgz 01;31
|
|
||||||
.arc 01;31
|
|
||||||
.arj 01;31
|
|
||||||
.taz 01;31
|
|
||||||
.lha 01;31
|
|
||||||
.lz4 01;31
|
|
||||||
.lzh 01;31
|
|
||||||
.lzma 01;31
|
|
||||||
.tlz 01;31
|
|
||||||
.txz 01;31
|
|
||||||
.tzo 01;31
|
|
||||||
.t7z 01;31
|
|
||||||
.zip 01;31
|
|
||||||
.z 01;31
|
|
||||||
.Z 01;31
|
|
||||||
.dz 01;31
|
|
||||||
.gz 01;31
|
|
||||||
.lrz 01;31
|
|
||||||
.lz 01;31
|
|
||||||
.lzo 01;31
|
|
||||||
.xz 01;31
|
|
||||||
.bz2 01;31
|
|
||||||
.bz 01;31
|
|
||||||
.tbz 01;31
|
|
||||||
.tbz2 01;31
|
|
||||||
.tz 01;31
|
|
||||||
.deb 01;31
|
|
||||||
.rpm 01;31
|
|
||||||
.jar 01;31
|
|
||||||
.war 01;31
|
|
||||||
.ear 01;31
|
|
||||||
.sar 01;31
|
|
||||||
.rar 01;31
|
|
||||||
.alz 01;31
|
|
||||||
.ace 01;31
|
|
||||||
.zoo 01;31
|
|
||||||
.cpio 01;31
|
|
||||||
.7z 01;31
|
|
||||||
.rz 01;31
|
|
||||||
.cab 01;31
|
|
||||||
|
|
||||||
# image formats
|
|
||||||
.jpg 01;35
|
|
||||||
.jpeg 01;35
|
|
||||||
.gif 01;35
|
|
||||||
.bmp 01;35
|
|
||||||
.pbm 01;35
|
|
||||||
.pgm 01;35
|
|
||||||
.ppm 01;35
|
|
||||||
.tga 01;35
|
|
||||||
.xbm 01;35
|
|
||||||
.xpm 01;35
|
|
||||||
.tif 01;35
|
|
||||||
.tiff 01;35
|
|
||||||
.png 01;35
|
|
||||||
.svg 01;35
|
|
||||||
.svgz 01;35
|
|
||||||
.mng 01;35
|
|
||||||
.pcx 01;35
|
|
||||||
.mov 01;35
|
|
||||||
.mpg 01;35
|
|
||||||
.mpeg 01;35
|
|
||||||
.m2v 01;35
|
|
||||||
.mkv 01;35
|
|
||||||
.webm 01;35
|
|
||||||
.ogm 01;35
|
|
||||||
.mp4 01;35
|
|
||||||
.m4v 01;35
|
|
||||||
.mp4v 01;35
|
|
||||||
.vob 01;35
|
|
||||||
.qt 01;35
|
|
||||||
.nuv 01;35
|
|
||||||
.wmv 01;35
|
|
||||||
.asf 01;35
|
|
||||||
.rm 01;35
|
|
||||||
.rmvb 01;35
|
|
||||||
.flc 01;35
|
|
||||||
.avi 01;35
|
|
||||||
.fli 01;35
|
|
||||||
.flv 01;35
|
|
||||||
.gl 01;35
|
|
||||||
.dl 01;35
|
|
||||||
.xcf 01;35
|
|
||||||
.xwd 01;35
|
|
||||||
.yuv 01;35
|
|
||||||
.cgm 01;35
|
|
||||||
.emf 01;35
|
|
||||||
|
|
||||||
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
|
|
||||||
.axv 01;35
|
|
||||||
.anx 01;35
|
|
||||||
.ogv 01;35
|
|
||||||
.ogx 01;35
|
|
||||||
|
|
||||||
# Document files
|
|
||||||
.pdf 00;32
|
|
||||||
.ps 00;32
|
|
||||||
.txt 00;32
|
|
||||||
.patch 00;32
|
|
||||||
.diff 00;32
|
|
||||||
.log 00;32
|
|
||||||
.tex 00;32
|
|
||||||
.doc 00;32
|
|
||||||
|
|
||||||
# audio formats
|
|
||||||
.aac 00;36
|
|
||||||
.au 00;36
|
|
||||||
.flac 00;36
|
|
||||||
.m4a 00;36
|
|
||||||
.mid 00;36
|
|
||||||
.midi 00;36
|
|
||||||
.mka 00;36
|
|
||||||
.mp3 00;36
|
|
||||||
.mpc 00;36
|
|
||||||
.ogg 00;36
|
|
||||||
.ra 00;36
|
|
||||||
.wav 00;36
|
|
||||||
|
|
||||||
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
|
|
||||||
.axa 00;36
|
|
||||||
.oga 00;36
|
|
||||||
.spx 00;36
|
|
||||||
.xspf 00;36
|
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
user = config.pub-solar.user;
|
|
||||||
xdg = config.home-manager.users."${user.name}".xdg;
|
|
||||||
in '' [user]
|
|
||||||
${
|
|
||||||
if user.email != null
|
|
||||||
then "email = ${user.email}"
|
|
||||||
else ""
|
|
||||||
}
|
|
||||||
${
|
|
||||||
if user.fullName != null
|
|
||||||
then "name = ${user.fullName}"
|
|
||||||
else ""
|
|
||||||
}
|
|
||||||
${
|
|
||||||
if user.gpgKeyId != null
|
|
||||||
then "signingkey = ${user.gpgKeyId}"
|
|
||||||
else ""
|
|
||||||
}
|
|
||||||
[core]
|
|
||||||
editor = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim
|
|
||||||
excludesFile = /home/${config.pub-solar.user.name}/.config/git/global_gitignore
|
|
||||||
[alias]
|
|
||||||
pol = pull
|
|
||||||
ack = -c color.grep.linenumber=\"bold yellow\"\n -c color.grep.filename=\"bold green\"\n -c color.grep.match=\"reverse yellow\"\n grep --break --heading --line-number
|
|
||||||
# define command which will be used when "nvim"is set as a merge tool
|
|
||||||
|
|
||||||
[mergetool]
|
|
||||||
prompt = false
|
|
||||||
[merge]
|
|
||||||
tool = nvim
|
|
||||||
[mergetool "nvim"]
|
|
||||||
cmd = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
|
|
||||||
|
|
||||||
[commit]
|
|
||||||
gpgsign = true
|
|
||||||
template = ${xdg.configHome}/git/gitmessage
|
|
||||||
[tag]
|
|
||||||
gpgsign = true
|
|
||||||
[init]
|
|
||||||
defaultBranch = main
|
|
||||||
[pull]
|
|
||||||
rebase = false''
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
user = config.pub-solar.user;
|
|
||||||
xdg = config.home-manager.users."${user.name}".xdg;
|
|
||||||
in ''
|
|
||||||
# What happened?
|
|
||||||
#
|
|
||||||
# fix feat build chore ci docs style refactor perf test
|
|
||||||
#
|
|
||||||
# type!(optional scope): <summary> --------------#
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
# ^\n
|
|
||||||
# What exactly was done and why? --------------------------------------#
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
# ^\n
|
|
||||||
#
|
|
||||||
# Any issue numbers or links?
|
|
||||||
#
|
|
||||||
# Ref: #123
|
|
||||||
|
|
||||||
|
|
||||||
# ^\n
|
|
||||||
#
|
|
||||||
# Co-authored-by: Example Name <email@example.com>
|
|
||||||
''
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
in ''tags''
|
|
||||||
|
|
@ -1,198 +0,0 @@
|
||||||
# Configuration file for libinput-gestures.
|
|
||||||
# Mark Blakeney, Sep 2015
|
|
||||||
#
|
|
||||||
# The default configuration file exists at /etc/libinput-gestures.conf
|
|
||||||
# but a user can create a personal custom configuration file at
|
|
||||||
# ~/.config/libinput-gestures.conf.
|
|
||||||
#
|
|
||||||
# Lines starting with '#' and blank lines are ignored. Currently
|
|
||||||
# "gesture" and "device" configuration keywords are supported as
|
|
||||||
# described below. The keyword can optionally be appended with a ":" (to
|
|
||||||
# maintain compatibility with original format configuration files).
|
|
||||||
#
|
|
||||||
# Each gesture line has 3 [or 4] arguments separated by whitespace:
|
|
||||||
#
|
|
||||||
# action motion [finger_count] command
|
|
||||||
#
|
|
||||||
# where action and motion is either:
|
|
||||||
# swipe up
|
|
||||||
# swipe down
|
|
||||||
# swipe left
|
|
||||||
# swipe right
|
|
||||||
# swipe left_up
|
|
||||||
# swipe left_down
|
|
||||||
# swipe right_up
|
|
||||||
# swipe right_down
|
|
||||||
# pinch in
|
|
||||||
# pinch out
|
|
||||||
# pinch clockwise
|
|
||||||
# pinch anticlockwise
|
|
||||||
#
|
|
||||||
# command is the remainder of the line and is any valid shell command +
|
|
||||||
# arguments.
|
|
||||||
#
|
|
||||||
# finger_count is a single numeric digit and is optional (and is
|
|
||||||
# typically 3 or 4). If specified then the command is executed when
|
|
||||||
# exactly that number of fingers is used in the gesture. If not
|
|
||||||
# specified then the command is executed when that gesture is executed
|
|
||||||
# with any number of fingers. Gesture lines specified with finger_count
|
|
||||||
# have priority over the same gesture specified without any
|
|
||||||
# finger_count.
|
|
||||||
#
|
|
||||||
# Typically command will be xdotool, or wmctrl. See "man xdotool" for
|
|
||||||
# the many things you can action with that tool. Note that unfortunately
|
|
||||||
# xdotool does not work with native Wayland clients.
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
# SWIPE GESTURES:
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
# Note the default is an "internal" command that uses wmctrl to switch
|
|
||||||
# workspaces and, unlike xdotool, works on both Xorg and Wayland (via
|
|
||||||
# XWayland). It also can be configured for vertical and horizontal
|
|
||||||
# switching over tabular workspaces, as per the example below. You can
|
|
||||||
# also add "-w" to the internal command to allow wrapping workspaces.
|
|
||||||
|
|
||||||
# Move to next workspace (works for GNOME/KDE/etc on Wayland and Xorg)
|
|
||||||
#gesture swipe up _internal ws_up
|
|
||||||
|
|
||||||
# NOTE ABOUT FINGER COUNT:
|
|
||||||
# The above command will configure this command for all fingers (i.e. 3
|
|
||||||
# for 4) but to configure it for 3 fingers only, change it to:
|
|
||||||
# gesture swipe up 3 _internal ws_up
|
|
||||||
# Then you can configure something else for 4 fingers or leave 4 fingers
|
|
||||||
# unconfigured. You can configure an explicit finger count like this for
|
|
||||||
# all example commands in this configuration file.
|
|
||||||
#
|
|
||||||
gesture swipe up 3 ydotool key Super_L+Down
|
|
||||||
gesture swipe up 4 ydotool key Super_L+Ctrl+Right
|
|
||||||
|
|
||||||
# Move to prev workspace (works for GNOME/KDE/etc on Wayland and Xorg)
|
|
||||||
#gesture swipe down _internal ws_down
|
|
||||||
gesture swipe down 3 ydotool key Super_L+Up
|
|
||||||
gesture swipe down 4 ydotool key Super_L+Ctrl+Left
|
|
||||||
|
|
||||||
# Browser go forward (works only for Xorg, and Xwayland clients)
|
|
||||||
gesture swipe left 3 ydotool key ctrl+]
|
|
||||||
|
|
||||||
# Browser go back (works only for Xorg, and Xwayland clients)
|
|
||||||
gesture swipe right 3 ydotool key ctrl+[
|
|
||||||
|
|
||||||
# NOTE: If you don't use "natural" scrolling direction for your touchpad
|
|
||||||
# then you may want to swap the above default left/right and up/down
|
|
||||||
# configurations.
|
|
||||||
|
|
||||||
# Optional extended swipe gestures, e.g. for browser tab navigation:
|
|
||||||
#
|
|
||||||
# Jump to next open browser tab
|
|
||||||
#gesture swipe right_up xdotool key control+Tab
|
|
||||||
#gesture swipe right_up xdotool key control+Next
|
|
||||||
gesture swipe right_up ydotool key ctrl+PageDown
|
|
||||||
#
|
|
||||||
# Jump to previous open browser tab
|
|
||||||
#gesture swipe left_up xdotool key control+shift+Tab
|
|
||||||
gesture swipe left_up ydotool key ctrl+PageUp
|
|
||||||
#
|
|
||||||
# Close current browser tab
|
|
||||||
# gesture swipe left_down xdotool key control+w
|
|
||||||
#
|
|
||||||
# Reopen and jump to last closed browser tab
|
|
||||||
# gesture swipe right_down xdotool key control+shift+t
|
|
||||||
|
|
||||||
# Example of 8 static workspaces, e.g. using KDE virtual-desktops,
|
|
||||||
# arranged in 2 rows of 4 columns across using swipe up/down/left/right
|
|
||||||
# to navigate in fixed planes. You can also add the "-w/--wrap" option
|
|
||||||
# to allow wrapping in any direction. You must configure your virtual
|
|
||||||
# desktops with the same column dimension.
|
|
||||||
# gesture swipe up _internal --cols 4 ws_up
|
|
||||||
# gesture swipe down _internal --cols 4 ws_down
|
|
||||||
# gesture swipe left _internal --cols 4 ws_left
|
|
||||||
# gesture swipe right _internal --cols 4 ws_right
|
|
||||||
#
|
|
||||||
# Example of 16 static workspaces, e.g. using KDE virtual-desktops,
|
|
||||||
# arranged in 4 rows of 4 columns across using swipe up/down/left/right
|
|
||||||
# to navigate in fixed planes, and also using swipe
|
|
||||||
# left_up/left_down/right_up/right_down to navigate diagonally. You can
|
|
||||||
# also add the "-w/--wrap" option to allow wrapping in any direction
|
|
||||||
# and/or diagonally. You must configure your virtual desktops with the
|
|
||||||
# same column dimension.
|
|
||||||
# gesture swipe up _internal --cols 4 ws_up
|
|
||||||
# gesture swipe down _internal --cols 4 ws_down
|
|
||||||
# gesture swipe left _internal --cols 4 ws_left
|
|
||||||
# gesture swipe right _internal --cols 4 ws_right
|
|
||||||
# gesture swipe left_up _internal --cols 4 ws_left_up
|
|
||||||
# gesture swipe left_down _internal --cols 4 ws_left_down
|
|
||||||
# gesture swipe right_up _internal --cols 4 ws_right_up
|
|
||||||
# gesture swipe right_down _internal --cols 4 ws_right_down
|
|
||||||
|
|
||||||
# Example virtual desktop switching for Ubuntu Unity/Compiz. The
|
|
||||||
# _internal command does not work for Compiz but you can explicitly
|
|
||||||
# configure the swipe commands to work for a Compiz virtual 2
|
|
||||||
# dimensional desktop as follows:
|
|
||||||
# gesture swipe up xdotool key ctrl+alt+Up
|
|
||||||
# gesture swipe down xdotool key ctrl+alt+Down
|
|
||||||
# gesture swipe left xdotool key ctrl+alt+Left
|
|
||||||
# gesture swipe right xdotool key ctrl+alt+Right
|
|
||||||
|
|
||||||
# Example to change audio volume:
|
|
||||||
# Note this only works on an Xorg desktop (not Wayland).
|
|
||||||
# gesture swipe up xdotool key XF86AudioRaiseVolume
|
|
||||||
# gesture swipe down xdotool key XF86AudioLowerVolume
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
# PINCH GESTURES:
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
# GNOME SHELL open/close overview (works for GNOME on Xorg only)
|
|
||||||
gesture pinch in ydotool key ctrl+-
|
|
||||||
gesture pinch out ydotool key ctrl+shift+=
|
|
||||||
|
|
||||||
# KDE Plasma open/close overview
|
|
||||||
# gesture pinch in xdotool key ctrl+F9
|
|
||||||
# gesture pinch out xdotool key ctrl+F9
|
|
||||||
|
|
||||||
# GNOME SHELL open/close overview (works for GNOME on Wayland and Xorg)
|
|
||||||
# Note since GNOME 3.24 on Wayland this is implemented natively so no
|
|
||||||
# real point configuring for Wayland.
|
|
||||||
# gesture pinch in dbus-send --session --type=method_call --dest=org.gnome.Shell /org/gnome/Shell org.gnome.Shell.Eval string:'Main.overview.toggle();'
|
|
||||||
# gesture pinch out dbus-send --session --type=method_call --dest=org.gnome.Shell /org/gnome/Shell org.gnome.Shell.Eval string:'Main.overview.toggle();'
|
|
||||||
|
|
||||||
# Optional extended pinch gestures:
|
|
||||||
# gesture pinch clockwise <whatever command>
|
|
||||||
# gesture pinch anticlockwise <whatever command>
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
# This application normally determines your touchpad device
|
|
||||||
# automatically. Some users may have multiple touchpads but by default
|
|
||||||
# we use only the first one found. However, you can choose to specify
|
|
||||||
# the explicit device name to use. Run "libinput list-devices" to work
|
|
||||||
# out the name of your device (from the "Device:" field). Then add a
|
|
||||||
# device line specifying that name, e.g:
|
|
||||||
#
|
|
||||||
# device DLL0665:01 06CB:76AD Touchpad
|
|
||||||
#
|
|
||||||
# If the device name starts with a '/' then it is instead considered as
|
|
||||||
# the explicit device path although since device paths can change
|
|
||||||
# through reboots this is best to be a symlink. E.g. instead of specifying
|
|
||||||
# /dev/input/event12, use the corresponding full path link under
|
|
||||||
# /dev/input/by-path/ or /dev/input/by-id/.
|
|
||||||
#
|
|
||||||
# You can choose to use ALL touchpad devices by setting the device name
|
|
||||||
# to "all". E.g. Do this if you have multiple touchpads which you want
|
|
||||||
# to use in parallel. This reduces performance slightly so only set this
|
|
||||||
# if you have to.
|
|
||||||
#
|
|
||||||
# device all
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
# You can set a minimum travel distance threshold before swipe gestures
|
|
||||||
# are actioned using the swipe_threshold configuration command.
|
|
||||||
# Specify this value in dots. The default is 0.
|
|
||||||
# E.g. set it to 100 dots with "swipe_threshold 100".
|
|
||||||
# swipe_threshold 0
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
# You can set a timeout on gestures from start to end. The default is
|
|
||||||
# the value commented below. It can be any value in float secs >= 0.
|
|
||||||
# 0 = no timeout. E.g. set it to 2 secs with "timeout 2".
|
|
||||||
# timeout 1.5
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
padding=10
|
|
||||||
margin=5,5,0
|
|
||||||
default-timeout=5000
|
|
||||||
|
|
||||||
## Base16 Burn
|
|
||||||
# Author: Benjamin Bädorf
|
|
||||||
#
|
|
||||||
# You can use these variables anywhere in the mako configuration file.
|
|
||||||
|
|
||||||
background-color=#1a181a
|
|
||||||
text-color=#e3e1e4
|
|
||||||
border-color=#ff5f5f
|
|
||||||
|
|
||||||
[urgency=low]
|
|
||||||
background-color=#1a181a
|
|
||||||
text-color=#e3e1e4
|
|
||||||
border-color=#ff5f5f
|
|
||||||
|
|
||||||
[urgency=high]
|
|
||||||
background-color=#ff5f5f
|
|
||||||
text-color=#1a181a
|
|
||||||
border-color=#1a181a
|
|
||||||
|
|
@ -1,132 +0,0 @@
|
||||||
# base16-mutt: base16-shell support for mutt
|
|
||||||
#
|
|
||||||
# These depend on mutt compiled with s-lang, not ncurses. Check by running `mutt -v`
|
|
||||||
# Details this configuration may be found in the mutt manual:
|
|
||||||
# §3 Patterns <http://www.mutt.org/doc/manual/#patterns>
|
|
||||||
# §9 Using color and mono video attributes <http://www.mutt.org/doc/manual/#color>
|
|
||||||
|
|
||||||
# https://www.neomutt.org/guide/configuration.html#color
|
|
||||||
# base00 : color00 - Default Background
|
|
||||||
# base01 : color18 - Lighter Background (Used for status bars)
|
|
||||||
# base02 : color19 - Selection Background
|
|
||||||
# base03 : color08 - Comments, Invisibles, Line Highlighting
|
|
||||||
|
|
||||||
# base04 : color20 - Dark Foreground (Used for status bars)
|
|
||||||
# base05 : color07 - Default Foreground, Caret, Delimiters, Operators
|
|
||||||
# base06 : color21 - Light Foreground (Not often used)
|
|
||||||
# base07 : color15 - Light Background (Not often used)
|
|
||||||
|
|
||||||
# base08 : color01 - Index Item: Deleted.
|
|
||||||
# base09 : color16 - Message: URL.
|
|
||||||
# base0A : color03 - Search Text Background. Message: Bold.
|
|
||||||
# base0B : color02 - Message: Code. Index Item: Tagged.
|
|
||||||
# base0C : color06 - Message: Subject, Quotes. Index Item: Trusted.
|
|
||||||
# base0D : color04 - Message: Headings.
|
|
||||||
# base0E : color05 - Message: Italic, Underline. Index Item: Flagged.
|
|
||||||
# base0F : color17 - Deprecated, Opening/Closing Embedded Language Tags e.g.
|
|
||||||
|
|
||||||
## Base
|
|
||||||
color normal color07 color00 # softer, bold
|
|
||||||
|
|
||||||
## Weak
|
|
||||||
color tilde color08 color00 # `~` padding at the end of pager
|
|
||||||
color attachment color08 color00
|
|
||||||
color tree color08 color00 # arrow in threads
|
|
||||||
color signature color08 color00
|
|
||||||
color markers color08 color00 # `+` wrap indicator in pager
|
|
||||||
|
|
||||||
## Strong
|
|
||||||
color bold color21 color00
|
|
||||||
color underline color21 color00
|
|
||||||
|
|
||||||
## Highlight
|
|
||||||
color error color01 color00
|
|
||||||
color message color02 color00 # informational messages
|
|
||||||
color search color00 color01
|
|
||||||
color status color01 color18
|
|
||||||
color indicator color03 color19 # inverse, brighter
|
|
||||||
|
|
||||||
|
|
||||||
# Message Index ----------------------------------------------------------------
|
|
||||||
|
|
||||||
## Weak
|
|
||||||
color index color08 color00 "~R" # read messages
|
|
||||||
color index color08 color00 "~d >45d" # older than 45 days
|
|
||||||
color index color08 color00 "~v~(!~N)" # collapsed thread with no unread
|
|
||||||
color index color08 color00 "~Q" # messages that have been replied to
|
|
||||||
|
|
||||||
## Strong
|
|
||||||
color index color01 color00 "(~U|~N|~O)" # unread, new, old messages
|
|
||||||
color index color01 color00 "~v~(~U|~N|~O)" # collapsed thread with unread
|
|
||||||
|
|
||||||
## Highlight
|
|
||||||
### Trusted
|
|
||||||
color index color06 color00 "~g" # PGP signed messages
|
|
||||||
color index color06 color00 "~G" # PGP encrypted messages
|
|
||||||
### Odd
|
|
||||||
color index color01 color00 "~E" # past Expires: header date
|
|
||||||
color index color01 color00 "~=" # duplicated
|
|
||||||
color index color01 color00 "~S" # marked by Supersedes: header
|
|
||||||
### Flagged
|
|
||||||
color index color05 color00 "~F" # flagged messages
|
|
||||||
color index color02 color00 "~v~(~F)" # collapsed thread with flagged inside
|
|
||||||
|
|
||||||
# Selection
|
|
||||||
color index color02 color18 "~T" # tagged messages
|
|
||||||
color index color01 color18 "~D" # deleted messages
|
|
||||||
|
|
||||||
### Message Headers ----------------------------------------------------
|
|
||||||
|
|
||||||
# Base
|
|
||||||
color hdrdefault color07 color00
|
|
||||||
color header color07 color00 "^"
|
|
||||||
# Strong
|
|
||||||
color header color21 color00 "^(From)"
|
|
||||||
# Highlight
|
|
||||||
color header color04 color00 "^(Subject)"
|
|
||||||
|
|
||||||
### Message Body -------------------------------------------------------
|
|
||||||
# When possible, these regular expressions attempt to match http://spec.commonmark.org/
|
|
||||||
## Weak
|
|
||||||
# ~~~ Horizontal rules ~~~
|
|
||||||
color body color08 color00 "([[:space:]]*[-+=#*~_]){3,}[[:space:]]*"
|
|
||||||
## Strong
|
|
||||||
# *Bold* span
|
|
||||||
color body color03 color00 "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
|
|
||||||
# _Underline_ span
|
|
||||||
color body color05 color00 "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
|
|
||||||
# /Italic/ span (Sometimes gets directory names)
|
|
||||||
color body color05 color00 "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
|
|
||||||
# ATX headers
|
|
||||||
color body color04 color00 "^[[:space:]]{0,3}#+[[:space:]].*$"
|
|
||||||
## Highlight
|
|
||||||
# `Code` span
|
|
||||||
color body color02 color00 "(^|[[:space:][:punct:]])\`[^\`]+\`([[:space:][:punct:]]|$)"
|
|
||||||
# Indented code block
|
|
||||||
color body color02 color00 "^[[:space:]]{4,}.*$"
|
|
||||||
# URLs
|
|
||||||
color body color16 color00 "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
|
|
||||||
# Email addresses
|
|
||||||
color body color16 color00 "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])"
|
|
||||||
# Emoticons ;-P
|
|
||||||
color body black yellow "[;:][-o]?[})>{(<|P]"
|
|
||||||
|
|
||||||
# PGP
|
|
||||||
color body color21 color01 "(BAD signature)"
|
|
||||||
color body color21 color01 "^gpg: BAD signature from.*"
|
|
||||||
color body color21 color04 "(Good signature)"
|
|
||||||
color body color21 color04 "^gpg: Good signature .*"
|
|
||||||
color body color04 color00 "^gpg: "
|
|
||||||
|
|
||||||
|
|
||||||
## Quotation blocks
|
|
||||||
color quoted color06 color00
|
|
||||||
color quoted1 color02 color00
|
|
||||||
color quoted2 color03 color00
|
|
||||||
color quoted3 color16 color00
|
|
||||||
color quoted4 color01 color00
|
|
||||||
color quoted5 color17 color00
|
|
||||||
color quoted6 color05 color00
|
|
||||||
color quoted7 color04 color00
|
|
||||||
|
|
||||||
# vi: ft=muttrc
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
text/html; w3m -I %{charset} -T text/html; copiousoutput;
|
|
||||||
|
|
@ -1,104 +0,0 @@
|
||||||
# vim: filetype=muttrc
|
|
||||||
|
|
||||||
source $XDG_CONFIG_HOME/mutt/base16.muttrc
|
|
||||||
source $XDG_CONFIG_HOME/mutt/accounts.muttrc
|
|
||||||
|
|
||||||
set editor = `echo \$EDITOR`
|
|
||||||
|
|
||||||
set sidebar_visible = yes
|
|
||||||
set sidebar_width = 50
|
|
||||||
set sidebar_format = "%B%?F? [%F]?%* %?N?%N/?%S"
|
|
||||||
|
|
||||||
set sendmail_wait = 0
|
|
||||||
|
|
||||||
set mail_check_stats
|
|
||||||
|
|
||||||
set crypt_use_gpgme=yes
|
|
||||||
set crypt_autosign=yes
|
|
||||||
set crypt_verify_sig=yes
|
|
||||||
set crypt_replysign=yes
|
|
||||||
set crypt_replyencrypt=yes
|
|
||||||
set crypt_replysignencrypted=yes
|
|
||||||
set crypt_autoencrypt=yes
|
|
||||||
|
|
||||||
set pgp_check_gpg_decrypt_status_fd
|
|
||||||
set pgp_use_gpg_agent=yes
|
|
||||||
set pgp_self_encrypt=yes
|
|
||||||
|
|
||||||
# Store message headers locally to speed things up.
|
|
||||||
# If hcache is a folder, Mutt will create sub cache folders for each account which may speeds things up even more.
|
|
||||||
set header_cache = $XDG_CACHE_HOME/mutt
|
|
||||||
|
|
||||||
# Store messages locally to speed things up, like searching message bodies.
|
|
||||||
# Can be the same folder as header_cache.
|
|
||||||
# This will cost important disk usage according to your e-mail amount.
|
|
||||||
set message_cachedir = $XDG_CACHE_HOME/mutt
|
|
||||||
set imap_check_subscribed
|
|
||||||
|
|
||||||
# Allow Mutt to open a new IMAP connection automatically.
|
|
||||||
unset imap_passive
|
|
||||||
|
|
||||||
# Keep the IMAP connection alive by polling intermittently (time in seconds).
|
|
||||||
set imap_keepalive = 300
|
|
||||||
|
|
||||||
# How often to check for new mail (time in seconds).
|
|
||||||
set mail_check = 120
|
|
||||||
|
|
||||||
set askcc
|
|
||||||
set askbcc
|
|
||||||
|
|
||||||
set date_format="!%d.%m.%Y %H:%M"
|
|
||||||
set index_format="%4C %Z %D %4c %20.20L %s"
|
|
||||||
|
|
||||||
#------------------------------------------------------------
|
|
||||||
# Vi Key Bindings
|
|
||||||
#------------------------------------------------------------
|
|
||||||
|
|
||||||
# Moving around
|
|
||||||
bind generic g noop
|
|
||||||
bind generic gg first-entry
|
|
||||||
bind generic,index G last-entry
|
|
||||||
bind generic,index i previous-entry
|
|
||||||
bind generic,index k next-entry
|
|
||||||
|
|
||||||
bind pager,index d noop
|
|
||||||
bind pager,index dd delete-message
|
|
||||||
|
|
||||||
bind pager i previous-line
|
|
||||||
bind pager k next-line
|
|
||||||
bind pager I previous-entry
|
|
||||||
bind pager K next-entry
|
|
||||||
|
|
||||||
bind pager r noop
|
|
||||||
bind pager rr reply
|
|
||||||
bind pager ra group-reply
|
|
||||||
bind pager rn group-chat-reply
|
|
||||||
bind pager rl list-reply
|
|
||||||
|
|
||||||
# Threads
|
|
||||||
bind browser,pager,index N search-opposite
|
|
||||||
bind pager,index dT delete-thread
|
|
||||||
bind pager,index dt delete-subthread
|
|
||||||
bind pager,index g noop
|
|
||||||
bind pager,index gt next-thread
|
|
||||||
bind pager,index gT previous-thread
|
|
||||||
bind index za collapse-thread
|
|
||||||
bind index zA collapse-all # Missing :folddisable/foldenable
|
|
||||||
|
|
||||||
# Enable URL opening
|
|
||||||
macro index,pager \cb "<pipe-message> urlscan<Enter>" "call urlscan to extract URLs out of a message"
|
|
||||||
macro attach,compose \cb "<pipe-entry> urlscan<Enter>" "call urlscan to extract URLs out of a message"
|
|
||||||
|
|
||||||
# Translate markdown to html
|
|
||||||
macro compose \e5 "F pandoc -s -f markdown -t html \ny^T^Utext/html; charset=utf-8\n"
|
|
||||||
set wait_key=no
|
|
||||||
|
|
||||||
# Save to ~/Downloads by default
|
|
||||||
macro attach D "<save-entry><bol>~/Downloads/<eol>" "Save to Downloads"
|
|
||||||
|
|
||||||
set mailcap_path = $XDG_CONFIG_HOME/mutt/mailcap
|
|
||||||
|
|
||||||
# HTML emails
|
|
||||||
auto_view text/html # view html automatically
|
|
||||||
alternative_order text/plain text/enriched text/html # save html for last
|
|
||||||
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
#! /usr/bin/env python2
|
|
||||||
import os
|
|
||||||
import subprocess
|
|
||||||
|
|
||||||
def get_env(key):
|
|
||||||
return os.getenv(key)
|
|
||||||
|
|
||||||
def get_secret(*attributes):
|
|
||||||
return subprocess.check_output(["secret-tool", "lookup"] + list(attributes))
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
# This file is written by xdg-user-dirs-update
|
|
||||||
# If you want to change or add directories, just edit the line you're
|
|
||||||
# interested in. All local changes will be retained on the next run.
|
|
||||||
# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
|
|
||||||
# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
|
|
||||||
# absolute path. No other format is supported.
|
|
||||||
|
|
||||||
XDG_DESKTOP_DIR="$HOME/"
|
|
||||||
XDG_DOWNLOAD_DIR="$HOME/Downloads"
|
|
||||||
XDG_TEMPLATES_DIR="$HOME/Templates"
|
|
||||||
XDG_PUBLICSHARE_DIR="$HOME/Public"
|
|
||||||
XDG_DOCUMENTS_DIR="$HOME/"
|
|
||||||
XDG_MUSIC_DIR="$HOME/"
|
|
||||||
XDG_PICTURES_DIR="$HOME/"
|
|
||||||
XDG_VIDEOS_DIR="$HOME/"
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
en_US
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
/*
|
|
||||||
*
|
|
||||||
* Base16 Burn
|
|
||||||
* Author: Benjamin Bädorf
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
@define-color base00 #1a181a;
|
|
||||||
@define-color base01 #2d2a2e;
|
|
||||||
@define-color base02 #303030;
|
|
||||||
@define-color base03 #949494;
|
|
||||||
@define-color base04 #d3d1d4;
|
|
||||||
@define-color base05 #e3e1e4;
|
|
||||||
@define-color base06 #303030;
|
|
||||||
@define-color base07 #ff5f5f;
|
|
||||||
@define-color base08 #f85e84;
|
|
||||||
@define-color base09 #df5923;
|
|
||||||
@define-color base0A #e5c463;
|
|
||||||
@define-color base0B #9ecd6f;
|
|
||||||
@define-color base0C #ef9062;
|
|
||||||
@define-color base0D #7accd7;
|
|
||||||
@define-color base0E #ab9df2;
|
|
||||||
@define-color base0F #d70000;
|
|
||||||
|
|
@ -1,116 +0,0 @@
|
||||||
{
|
|
||||||
"layer": "top", // Waybar at top layer
|
|
||||||
// "position": "bottom", // Waybar position (top|bottom|left|right)
|
|
||||||
|
|
||||||
"height": 26, // Waybar height
|
|
||||||
"modules-left": ["sway/workspaces", "sway/mode"],
|
|
||||||
//"modules-center": ["mpd"],
|
|
||||||
"modules-right": ["sway/language", "pulseaudio", "network", "idle_inhibitor", "battery", "clock", "tray"],
|
|
||||||
"sway/workspaces": {
|
|
||||||
"disable-scroll": true
|
|
||||||
},
|
|
||||||
"sway/mode": {
|
|
||||||
"tooltip": false,
|
|
||||||
"format": "{}"
|
|
||||||
},
|
|
||||||
"sway/window": {
|
|
||||||
"tooltip": false,
|
|
||||||
"max-length": 96
|
|
||||||
},
|
|
||||||
"sway/language": {
|
|
||||||
"format": "{}",
|
|
||||||
"max-length": 50
|
|
||||||
},
|
|
||||||
"tray": {
|
|
||||||
"icon-size": 21,
|
|
||||||
"spacing": 10
|
|
||||||
},
|
|
||||||
"clock": {
|
|
||||||
"tooltip-format": "<tt><small>{calendar}</small></tt>",
|
|
||||||
"format-alt": "{:%a %d. %h %H:%M}",
|
|
||||||
//"on-scroll": {
|
|
||||||
// "calendar": 1
|
|
||||||
//}
|
|
||||||
"calendar": {
|
|
||||||
"mode-mon-col" : 3,
|
|
||||||
"on-scroll": -1,
|
|
||||||
"on-click-right": "mode",
|
|
||||||
"format": {
|
|
||||||
"months": "<span color='#ffead3'><b>{}</b></span>",
|
|
||||||
"days": "<span color='#ecc6d9'><b>{}</b></span>",
|
|
||||||
"weekdays": "<span color='#ffcc66'><b>{}</b></span>",
|
|
||||||
"today": "<span color='#ff6699'><b><u>{}</u></b></span>"
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"backlight": {
|
|
||||||
// "device": "acpi_video1",
|
|
||||||
"tooltip": true,
|
|
||||||
"tooltip-format": "Brightness: <big>{percent}%</big>",
|
|
||||||
"format": "<span font='10'>{icon}</span>",
|
|
||||||
"format-icons": ["", ""]
|
|
||||||
},
|
|
||||||
"cpu": {
|
|
||||||
"format": "{}% "
|
|
||||||
},
|
|
||||||
"memory": {
|
|
||||||
"format": "{}% "
|
|
||||||
},
|
|
||||||
"idle_inhibitor": {
|
|
||||||
"format": "<span font='10'>{icon} </span>",
|
|
||||||
"format-icons": {
|
|
||||||
"activated": "",
|
|
||||||
"deactivated": ""
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"battery": {
|
|
||||||
"tooltip": false,
|
|
||||||
"states": {
|
|
||||||
"critical": 25
|
|
||||||
},
|
|
||||||
"full-at": 84,
|
|
||||||
"format": "<span font='10'>{icon}</span> {capacity}%",
|
|
||||||
"format-full": "<span font='10'>{icon}</span>",
|
|
||||||
"format-icons": ["", "", "", "", ""],
|
|
||||||
},
|
|
||||||
"network": {
|
|
||||||
"interval": 3,
|
|
||||||
"tooltip": true,
|
|
||||||
//"interface": "wlp4s0", // (Optional) To force the use of this interface \uF2E7,
|
|
||||||
"format-wifi": "<span font='10'></span> \uf062 {bandwidthUpBits} | \uf063 {bandwidthDownBits}",
|
|
||||||
"format-ethernet": "<span font='10'></span> \uf062 {bandwidthUpBits} | \uf063 {bandwidthDownBits}",
|
|
||||||
"format-disconnected": "",
|
|
||||||
"tooltip-format-wifi": "{essid} ({signalStrength}%) {ipaddr}",
|
|
||||||
"tooltip-format-ethernet": "{ifname} {ipaddr}"
|
|
||||||
},
|
|
||||||
//\ue04f{volume}%
|
|
||||||
"pulseaudio": {
|
|
||||||
"tooltip": false,
|
|
||||||
"format": "{volume}% <span font='10'>{icon}</span>",
|
|
||||||
"format-bluetooth": "{volume}% <span font='10'>{icon}</span>",
|
|
||||||
"format-muted": "",
|
|
||||||
"on-click": "pavucontrol",
|
|
||||||
"format-alt": "{volume}% <span font='10'>{icon}</span>",
|
|
||||||
"format-icons": {
|
|
||||||
"headphones": "",
|
|
||||||
"handsfree": "",
|
|
||||||
"headset": "",
|
|
||||||
"phone": "",
|
|
||||||
"portable": "",
|
|
||||||
"car": "",
|
|
||||||
"default": ["","", ""]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"mpd": {
|
|
||||||
"format": "{artist} - {title} <span color=\"#999999\">[<span color=\"#ffffff\">{elapsedTime:%M:%S}</span> / {totalTime:%M:%S}]</span>",
|
|
||||||
"format-disconnected": "",
|
|
||||||
"format-stopped": "",
|
|
||||||
"interval": 1,
|
|
||||||
"state-icons": {
|
|
||||||
"paused": "",
|
|
||||||
"playing": ""
|
|
||||||
},
|
|
||||||
"tooltip-format": "MPD (connected)",
|
|
||||||
"tooltip-format-disconnected": "MPD (disconnected)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,78 +0,0 @@
|
||||||
@import "./colorscheme.css";
|
|
||||||
|
|
||||||
* {
|
|
||||||
min-height: 0;
|
|
||||||
border: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
window#waybar {
|
|
||||||
font-family: Hack, FontAwesome;
|
|
||||||
font-weight: 500;
|
|
||||||
font-size: 14px;
|
|
||||||
background: rgba(11, 12, 13, 0.90);
|
|
||||||
border-bottom: 1px solid rgba(0, 0, 2, 0.53);
|
|
||||||
color: @base04;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#workspaces button {
|
|
||||||
font-size: 14px;
|
|
||||||
box-shadow: none;
|
|
||||||
text-shadow: none;
|
|
||||||
padding: 0px 3px 0px 3px;
|
|
||||||
color: @base04;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#workspaces button.focused {
|
|
||||||
color: #f85e84;
|
|
||||||
color: @base07;
|
|
||||||
/* margin: 2px 0px 2px 0px; */
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button:hover {
|
|
||||||
background: rgba(255, 255, 255, 0.00);
|
|
||||||
/* margin: 2px 0px 2px 0px; */
|
|
||||||
}
|
|
||||||
|
|
||||||
#clock, #backlight, #battery, #cpu, #memory, #network, #pulseaudio, #custom-spotify, #tray, #mode {
|
|
||||||
font-size: 14px;
|
|
||||||
margin: 0px 10px 0px 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#pulseaudio {
|
|
||||||
/* border-top: 1px solid transparent; */
|
|
||||||
font-size: 12px;
|
|
||||||
margin-left: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#battery {
|
|
||||||
font-size: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#battery.critical {
|
|
||||||
color: @base07;
|
|
||||||
}
|
|
||||||
#battery.charging {
|
|
||||||
color: @base0B;
|
|
||||||
}
|
|
||||||
#battery.full {
|
|
||||||
margin: 0px 0px 0px 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#network {
|
|
||||||
border-top: 1px solid transparent;
|
|
||||||
}
|
|
||||||
#network.disconnected {
|
|
||||||
margin: 0px 0px 0px 0px;
|
|
||||||
color: rgba(75, 81, 98, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#pulseaudio.muted {
|
|
||||||
margin: 0px 0px 0px 0px;
|
|
||||||
color: rgba(75, 81, 98, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
! Swap Caps_Lock and Control_L
|
|
||||||
!
|
|
||||||
remove Lock = Caps_Lock
|
|
||||||
remove Control = Control_L
|
|
||||||
!keysym Control_L = Caps_Lock
|
|
||||||
keysym Caps_Lock = Control_L
|
|
||||||
add Lock = Caps_Lock
|
|
||||||
add Control = Control_L
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
Gtk/ButtonImages 1
|
|
||||||
Gtk/CanChangeAccels 1
|
|
||||||
Gtk/CursorThemeName "default"
|
|
||||||
Gtk/CursorThemeSize 0
|
|
||||||
Gtk/EnableEventSounds 0
|
|
||||||
Gtk/EnableInputFeedbackSounds 0
|
|
||||||
Gtk/FontName "Lato"
|
|
||||||
Gtk/ThemeName "Matcha-dark-aliz"
|
|
||||||
Gtk/IconThemeName "Papirus-Adapta-Nokto-Maia"
|
|
||||||
Gtk/MenuBarAccel "F10"
|
|
||||||
Gtk/MenuImages 1
|
|
||||||
Gtk/ToolbarIconSize 3
|
|
||||||
Gtk/ToolbarStyle "icons"
|
|
||||||
Xft/Antialias 1
|
|
||||||
Xft/DPI 102400
|
|
||||||
Xft/Hinting 1
|
|
||||||
Xft/HintStyle "hintslight"
|
|
||||||
Xft/RGBA "rgb"
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1,126 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
# base16-shell (https://github.com/chriskempson/base16-shell)
|
|
||||||
# Base16 Shell template by Chris Kempson (http://chriskempson.com)
|
|
||||||
# Burn scheme by Benjamin Bädorf
|
|
||||||
|
|
||||||
color00="1a/18/1a" # Base 00 - Black
|
|
||||||
color01="f8/5e/84" # Base 08 - Red
|
|
||||||
color02="9e/cd/6f" # Base 0B - Green
|
|
||||||
color03="e5/c4/63" # Base 0A - Yellow
|
|
||||||
color04="7a/cc/d7" # Base 0D - Blue
|
|
||||||
color05="ab/9d/f2" # Base 0E - Magenta
|
|
||||||
color06="ef/90/62" # Base 0C - Cyan
|
|
||||||
color07="e3/e1/e4" # Base 05 - White
|
|
||||||
color08="94/94/94" # Base 03 - Bright Black
|
|
||||||
color09=$color01 # Base 08 - Bright Red
|
|
||||||
color10=$color02 # Base 0B - Bright Green
|
|
||||||
color11=$color03 # Base 0A - Bright Yellow
|
|
||||||
color12=$color04 # Base 0D - Bright Blue
|
|
||||||
color13=$color05 # Base 0E - Bright Magenta
|
|
||||||
color14=$color06 # Base 0C - Bright Cyan
|
|
||||||
color15="ff/5f/5f" # Base 07 - Bright White
|
|
||||||
color16="df/59/23" # Base 09
|
|
||||||
color17="d7/00/00" # Base 0F
|
|
||||||
color18="2d/2a/2e" # Base 01
|
|
||||||
color19="30/30/30" # Base 02
|
|
||||||
color20="d3/d1/d4" # Base 04
|
|
||||||
color21="30/30/30" # Base 06
|
|
||||||
color_foreground="e3/e1/e4" # Base 05
|
|
||||||
color_background="1a/18/1a" # Base 00
|
|
||||||
|
|
||||||
if [ -n "$TMUX" ]; then
|
|
||||||
# Tell tmux to pass the escape sequences through
|
|
||||||
# (Source: http://permalink.gmane.org/gmane.comp.terminal-emulators.tmux.user/1324)
|
|
||||||
put_template() { printf '\033Ptmux;\033\033]4;%d;rgb:%s\033\033\\\033\\' $@; }
|
|
||||||
put_template_var() { printf '\033Ptmux;\033\033]%d;rgb:%s\033\033\\\033\\' $@; }
|
|
||||||
put_template_custom() { printf '\033Ptmux;\033\033]%s%s\033\033\\\033\\' $@; }
|
|
||||||
elif [ "${TERM%%[-.]*}" = "screen" ]; then
|
|
||||||
# GNU screen (screen, screen-256color, screen-256color-bce)
|
|
||||||
put_template() { printf '\033P\033]4;%d;rgb:%s\007\033\\' $@; }
|
|
||||||
put_template_var() { printf '\033P\033]%d;rgb:%s\007\033\\' $@; }
|
|
||||||
put_template_custom() { printf '\033P\033]%s%s\007\033\\' $@; }
|
|
||||||
elif [ "${TERM%%-*}" = "linux" ]; then
|
|
||||||
put_template() { [ $1 -lt 16 ] && printf "\e]P%x%s" $1 $(echo $2 | sed 's/\///g'); }
|
|
||||||
put_template_var() { true; }
|
|
||||||
put_template_custom() { true; }
|
|
||||||
else
|
|
||||||
put_template() { printf '\033]4;%d;rgb:%s\033\\' $@; }
|
|
||||||
put_template_var() { printf '\033]%d;rgb:%s\033\\' $@; }
|
|
||||||
put_template_custom() { printf '\033]%s%s\033\\' $@; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 16 color space
|
|
||||||
put_template 0 $color00
|
|
||||||
put_template 1 $color01
|
|
||||||
put_template 2 $color02
|
|
||||||
put_template 3 $color03
|
|
||||||
put_template 4 $color04
|
|
||||||
put_template 5 $color05
|
|
||||||
put_template 6 $color06
|
|
||||||
put_template 7 $color07
|
|
||||||
put_template 8 $color08
|
|
||||||
put_template 9 $color09
|
|
||||||
put_template 10 $color10
|
|
||||||
put_template 11 $color11
|
|
||||||
put_template 12 $color12
|
|
||||||
put_template 13 $color13
|
|
||||||
put_template 14 $color14
|
|
||||||
put_template 15 $color15
|
|
||||||
|
|
||||||
# 256 color space
|
|
||||||
put_template 16 $color16
|
|
||||||
put_template 17 $color17
|
|
||||||
put_template 18 $color18
|
|
||||||
put_template 19 $color19
|
|
||||||
put_template 20 $color20
|
|
||||||
put_template 21 $color21
|
|
||||||
|
|
||||||
# foreground / background / cursor color
|
|
||||||
if [ -n "$ITERM_SESSION_ID" ]; then
|
|
||||||
# iTerm2 proprietary escape codes
|
|
||||||
put_template_custom Pg e3e1e4 # foreground
|
|
||||||
put_template_custom Ph 1a181a # background
|
|
||||||
put_template_custom Pi e3e1e4 # bold color
|
|
||||||
put_template_custom Pj 303030 # selection color
|
|
||||||
put_template_custom Pk e3e1e4 # selected text color
|
|
||||||
put_template_custom Pl e3e1e4 # cursor
|
|
||||||
put_template_custom Pm 1a181a # cursor text
|
|
||||||
else
|
|
||||||
put_template_var 10 $color_foreground
|
|
||||||
if [ "$BASE16_SHELL_SET_BACKGROUND" != false ]; then
|
|
||||||
put_template_var 11 $color_background
|
|
||||||
if [ "${TERM%%-*}" = "rxvt" ]; then
|
|
||||||
put_template_var 708 $color_background # internal border (rxvt)
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
put_template_custom 12 ";7" # cursor (reverse video)
|
|
||||||
fi
|
|
||||||
|
|
||||||
# clean up
|
|
||||||
unset -f put_template
|
|
||||||
unset -f put_template_var
|
|
||||||
unset -f put_template_custom
|
|
||||||
unset color00
|
|
||||||
unset color01
|
|
||||||
unset color02
|
|
||||||
unset color03
|
|
||||||
unset color04
|
|
||||||
unset color05
|
|
||||||
unset color06
|
|
||||||
unset color07
|
|
||||||
unset color08
|
|
||||||
unset color09
|
|
||||||
unset color10
|
|
||||||
unset color11
|
|
||||||
unset color12
|
|
||||||
unset color13
|
|
||||||
unset color14
|
|
||||||
unset color15
|
|
||||||
unset color16
|
|
||||||
unset color17
|
|
||||||
unset color18
|
|
||||||
unset color19
|
|
||||||
unset color20
|
|
||||||
unset color21
|
|
||||||
unset color_foreground
|
|
||||||
unset color_background
|
|
||||||
|
|
@ -1,75 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# ~/.xinitrc
|
|
||||||
#
|
|
||||||
# Executed by startx (run your window manager from here)
|
|
||||||
|
|
||||||
userresources=$HOME/.Xresources
|
|
||||||
usermodmap=$HOME/.config/xmodmap
|
|
||||||
sysresources=/etc/X11/xinit/.Xresources
|
|
||||||
sysmodmap=/etc/X11/xinit/.Xmodmap
|
|
||||||
|
|
||||||
DEFAULT_SESSION='i3 --shmlog-size 0'
|
|
||||||
|
|
||||||
xset -b
|
|
||||||
|
|
||||||
if [ -d $HOME/.fonts ]; then
|
|
||||||
xset +fp $HOME/.fonts
|
|
||||||
xset fp rehash
|
|
||||||
fi
|
|
||||||
|
|
||||||
# merge in defaults and keymaps
|
|
||||||
|
|
||||||
if [ -f $sysresources ]; then
|
|
||||||
xrdb -merge $sysresources
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f $sysmodmap ]; then
|
|
||||||
xmodmap $sysmodmap
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f "$userresources" ]; then
|
|
||||||
xrdb -merge "$userresources"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f "$usermodmap" ]; then
|
|
||||||
xmodmap "$usermodmap"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# start some nice programs
|
|
||||||
|
|
||||||
if [ -d /etc/X11/xinit/xinitrc.d ] ; then
|
|
||||||
for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
|
|
||||||
[ -x "$f" ] && . "$f"
|
|
||||||
done
|
|
||||||
unset f
|
|
||||||
fi
|
|
||||||
|
|
||||||
get_session(){
|
|
||||||
local dbus_args=(--sh-syntax --exit-with-session)
|
|
||||||
case $1 in
|
|
||||||
awesome) dbus_args+=(awesome) ;;
|
|
||||||
bspwm) dbus_args+=(bspwm-session) ;;
|
|
||||||
budgie) dbus_args+=(budgie-desktop) ;;
|
|
||||||
cinnamon) dbus_args+=(cinnamon-session) ;;
|
|
||||||
deepin) dbus_args+=(startdde) ;;
|
|
||||||
enlightenment) dbus_args+=(enlightenment_start) ;;
|
|
||||||
fluxbox) dbus_args+=(startfluxbox) ;;
|
|
||||||
gnome) dbus_args+=(gnome-session) ;;
|
|
||||||
i3|i3wm) dbus_args+=(i3 --shmlog-size 0) ;;
|
|
||||||
jwm) dbus_args+=(jwm) ;;
|
|
||||||
kde) dbus_args+=(startkde) ;;
|
|
||||||
lxde) dbus_args+=(startlxde) ;;
|
|
||||||
lxqt) dbus_args+=(lxqt-session) ;;
|
|
||||||
mate) dbus_args+=(mate-session) ;;
|
|
||||||
xfce) dbus_args+=(xfce4-session) ;;
|
|
||||||
openbox) dbus_args+=(openbox-session) ;;
|
|
||||||
*) dbus_args+=($DEFAULT_SESSION) ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
echo "dbus-launch ${dbus_args[*]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
exec $(get_session)
|
|
||||||
xset r rate 660 25
|
|
||||||
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
psCfg = config.pub-solar;
|
|
||||||
in {
|
|
||||||
imports = [
|
|
||||||
./home.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
users = {
|
|
||||||
mutableUsers = false;
|
|
||||||
|
|
||||||
users = with pkgs;
|
|
||||||
pkgs.lib.setAttrByPath [psCfg.user.name] {
|
|
||||||
# Indicates whether this is an account for a “real” user.
|
|
||||||
# This automatically sets group to users, createHome to true,
|
|
||||||
# home to /home/username, useDefaultShell to true, and isSystemUser to false.
|
|
||||||
isNormalUser = true;
|
|
||||||
description = psCfg.user.description;
|
|
||||||
extraGroups = [
|
|
||||||
"input"
|
|
||||||
"lp"
|
|
||||||
"networkmanager"
|
|
||||||
"scanner"
|
|
||||||
"video"
|
|
||||||
"dialout"
|
|
||||||
"wheel"
|
|
||||||
];
|
|
||||||
shell = pkgs.bash;
|
|
||||||
initialHashedPassword =
|
|
||||||
if psCfg.user.password != null
|
|
||||||
then psCfg.user.password
|
|
||||||
else "";
|
|
||||||
openssh.authorizedKeys.keys =
|
|
||||||
if psCfg.user.publicKeys != null
|
|
||||||
then psCfg.user.publicKeys
|
|
||||||
else [];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,109 +0,0 @@
|
||||||
{
|
|
||||||
self,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (lib) fileContents;
|
|
||||||
in {
|
|
||||||
# Sets nrdxp.cachix.org binary cache which just speeds up some builds
|
|
||||||
imports = [../cachix];
|
|
||||||
|
|
||||||
config = {
|
|
||||||
pub-solar.terminal-life.enable = true;
|
|
||||||
pub-solar.audio.enable = true;
|
|
||||||
pub-solar.crypto.enable = true;
|
|
||||||
pub-solar.devops.enable = true;
|
|
||||||
|
|
||||||
# This is just a representation of the nix default
|
|
||||||
nix.systemFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
|
|
||||||
|
|
||||||
environment = {
|
|
||||||
systemPackages = with pkgs; [
|
|
||||||
# Core unix utility packages
|
|
||||||
coreutils-full
|
|
||||||
progress
|
|
||||||
dnsutils
|
|
||||||
inetutils
|
|
||||||
mtr
|
|
||||||
pciutils
|
|
||||||
usbutils
|
|
||||||
gitFull
|
|
||||||
git-lfs
|
|
||||||
git-bug
|
|
||||||
wget
|
|
||||||
openssl
|
|
||||||
openssh
|
|
||||||
curl
|
|
||||||
htop
|
|
||||||
lsof
|
|
||||||
psmisc
|
|
||||||
xdg-utils
|
|
||||||
sysfsutils
|
|
||||||
renameutils
|
|
||||||
nfs-utils
|
|
||||||
moreutils
|
|
||||||
mailutils
|
|
||||||
keyutils
|
|
||||||
input-utils
|
|
||||||
elfutils
|
|
||||||
binutils
|
|
||||||
dateutils
|
|
||||||
diffutils
|
|
||||||
findutils
|
|
||||||
exfat
|
|
||||||
file
|
|
||||||
|
|
||||||
# zippit
|
|
||||||
zip
|
|
||||||
unzip
|
|
||||||
|
|
||||||
# Modern modern utilities
|
|
||||||
p7zip
|
|
||||||
croc
|
|
||||||
jq
|
|
||||||
|
|
||||||
# Nix specific utilities
|
|
||||||
niv
|
|
||||||
manix
|
|
||||||
nix-index
|
|
||||||
nix-tree
|
|
||||||
nixpkgs-review
|
|
||||||
# Build broken, python2.7-PyJWT-2.0.1.drv' failed
|
|
||||||
#nixops
|
|
||||||
psos
|
|
||||||
nvd
|
|
||||||
|
|
||||||
# Fun
|
|
||||||
neofetch
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
fonts = {
|
|
||||||
fonts = with pkgs; [powerline-fonts dejavu_fonts];
|
|
||||||
|
|
||||||
fontconfig.defaultFonts = {
|
|
||||||
monospace = ["DejaVu Sans Mono for Powerline"];
|
|
||||||
|
|
||||||
sansSerif = ["DejaVu Sans"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# For rage encryption, all hosts need a ssh key pair
|
|
||||||
services.openssh = {
|
|
||||||
enable = true;
|
|
||||||
openFirewall = lib.mkDefault true;
|
|
||||||
passwordAuthentication = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Service that makes Out of Memory Killer more effective
|
|
||||||
services.earlyoom.enable = true;
|
|
||||||
|
|
||||||
# Use latest LTS linux kernel by default
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_5_15;
|
|
||||||
|
|
||||||
boot.supportedFilesystems = ["ntfs"];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
{
|
|
||||||
self,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (lib) fileContents;
|
|
||||||
in {
|
|
||||||
config = {
|
|
||||||
pub-solar.audio.bluetooth.enable = true;
|
|
||||||
pub-solar.docker.enable = true;
|
|
||||||
pub-solar.nextcloud.enable = true;
|
|
||||||
pub-solar.office.enable = true;
|
|
||||||
# pub-solar.printing.enable = true; # this is enabled automatically if office is enabled
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
{
|
|
||||||
self,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (lib) fileContents;
|
|
||||||
in {
|
|
||||||
pub-solar.gaming.enable = true;
|
|
||||||
}
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
{
|
|
||||||
self,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (lib) fileContents;
|
|
||||||
in {
|
|
||||||
pub-solar.graphical.enable = true;
|
|
||||||
pub-solar.sway.enable = true;
|
|
||||||
}
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
{
|
|
||||||
self,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (lib) fileContents;
|
|
||||||
in {
|
|
||||||
pub-solar.graphical.enable = false;
|
|
||||||
pub-solar.x-os.localProxyService.enable = false;
|
|
||||||
pub-solar.sway.enable = false;
|
|
||||||
}
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
{
|
|
||||||
self,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (lib) fileContents;
|
|
||||||
in {
|
|
||||||
pub-solar.mobile.enable = true;
|
|
||||||
}
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
{
|
|
||||||
self,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (lib) fileContents;
|
|
||||||
in {
|
|
||||||
config = {
|
|
||||||
pub-solar.graphical.wayland.software-renderer.enable = true;
|
|
||||||
pub-solar.sway.terminal = "foot";
|
|
||||||
pub-solar.core.iso-options.enable = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
{
|
|
||||||
self,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (lib) fileContents;
|
|
||||||
in {
|
|
||||||
pub-solar.social.enable = true;
|
|
||||||
}
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
{
|
|
||||||
self,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (lib) fileContents;
|
|
||||||
in {
|
|
||||||
pub-solar.virtualisation.enable = true;
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
self,
|
self,
|
||||||
config,
|
config,
|
||||||
hmUsers,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
|
|
@ -14,8 +13,6 @@ in {
|
||||||
];
|
];
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
home-manager.users = {inherit (hmUsers) b12f;};
|
|
||||||
|
|
||||||
services.yubikey-agent.enable = true;
|
services.yubikey-agent.enable = true;
|
||||||
|
|
||||||
age.secrets.b12f-env-secrets = {
|
age.secrets.b12f-env-secrets = {
|
||||||
|
|
@ -57,8 +54,12 @@ in {
|
||||||
arduino.enable = true;
|
arduino.enable = true;
|
||||||
email.enable = true;
|
email.enable = true;
|
||||||
uhk.enable = true;
|
uhk.enable = true;
|
||||||
|
social.enable = false;
|
||||||
|
gaming.enable = false;
|
||||||
|
mobile.enable = false;
|
||||||
audio.spotify.enable = true;
|
audio.spotify.enable = true;
|
||||||
audio.spotify.username = "spotify@benjaminbaedorf.eu";
|
audio.spotify.username = "spotify@benjaminbaedorf.eu";
|
||||||
|
audio.mopidy.enable = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Needed for the udev rules for solaar
|
# Needed for the udev rules for solaar
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,6 @@ in {
|
||||||
./concepts-and-training.nix
|
./concepts-and-training.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
pub-solar.audio.mopidy.enable = false;
|
|
||||||
|
|
||||||
home-manager = pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
home-manager = pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
present-md
|
present-md
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,4 @@
|
||||||
{hmUsers, ...}: {
|
{config, ...}: {
|
||||||
home-manager.users = {inherit (hmUsers) pub-solar;};
|
|
||||||
|
|
||||||
pub-solar = {
|
pub-solar = {
|
||||||
# These are your personal settings
|
# These are your personal settings
|
||||||
# The only required settings are `name` and `password`,
|
# The only required settings are `name` and `password`,
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
hmUsers,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
|
|
@ -8,8 +7,6 @@
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
in {
|
in {
|
||||||
config = {
|
config = {
|
||||||
home-manager.users = {inherit (hmUsers) yule;};
|
|
||||||
|
|
||||||
pub-solar = {
|
pub-solar = {
|
||||||
# These are your personal settings
|
# These are your personal settings
|
||||||
# The only required settings are `name` and `password`,
|
# The only required settings are `name` and `password`,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue