Compare commits
1 Commits
main
...
b5590198fd
| Author | SHA1 | Date | |
|---|---|---|---|
| b5590198fd |
@ -15,14 +15,14 @@ jobs:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: "Install Nix ❄️"
|
||||
uses: cachix/install-nix-action@v31
|
||||
uses: cachix/install-nix-action@v27
|
||||
|
||||
# - uses: DeterminateSystems/nix-installer-action@v4
|
||||
- uses: DeterminateSystems/magic-nix-cache-action@v12
|
||||
- uses: DeterminateSystems/flake-checker-action@v11
|
||||
- uses: DeterminateSystems/magic-nix-cache-action@v7
|
||||
- uses: DeterminateSystems/flake-checker-action@v9
|
||||
|
||||
- name: "Install Cachix ❄️"
|
||||
uses: cachix/cachix-action@v16
|
||||
uses: cachix/cachix-action@v15
|
||||
with:
|
||||
name: helcel
|
||||
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
|
||||
|
||||
@ -15,13 +15,13 @@ jobs:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
- name: Install nix
|
||||
uses: DeterminateSystems/nix-installer-action@v18
|
||||
uses: DeterminateSystems/nix-installer-action@v14
|
||||
with:
|
||||
github-token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
|
||||
extra_nix_config: |
|
||||
experimental-features = nix-command flakes
|
||||
- name: Update flake.lock
|
||||
uses: DeterminateSystems/update-flake-lock@v26
|
||||
uses: DeterminateSystems/update-flake-lock@v24
|
||||
with:
|
||||
token: ${{ secrets.GT_TOKEN_FOR_UPDATES }}
|
||||
pr-title: "[chore] Update flake.lock"
|
||||
|
||||
379
flake.lock
generated
379
flake.lock
generated
@ -1,19 +1,53 @@
|
||||
{
|
||||
"nodes": {
|
||||
"aquamarine": {
|
||||
"inputs": {
|
||||
"hyprutils": [
|
||||
"hyprland",
|
||||
"hyprutils"
|
||||
],
|
||||
"hyprwayland-scanner": [
|
||||
"hyprland",
|
||||
"hyprwayland-scanner"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hyprland",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725753098,
|
||||
"narHash": "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"rev": "e4a13203112a036fc7f437d391c7810f3dd5ab52",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"arion": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"haskell-flake": "haskell-flake",
|
||||
"hercules-ci-effects": "hercules-ci-effects",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745165725,
|
||||
"narHash": "sha256-OnHV8Us04vRsWM0uL1cQez8DumhRi6yE+4K4VLtH6Ws=",
|
||||
"lastModified": 1722825873,
|
||||
"narHash": "sha256-bFNXkD+s9NuidZePiJAjjFUnsMOwXb7hEZ4JEDdSALw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "arion",
|
||||
"rev": "4f59059633b14364b994503b179a701f5e6cfb90",
|
||||
"rev": "90bc85532767c785245f5c1e29ebfecb941cf8c9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -45,11 +79,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1750618568,
|
||||
"narHash": "sha256-w9EG5FOXrjXGfbqCcQg9x1lMnTwzNDW5BMXp8ddy15E=",
|
||||
"lastModified": 1726032244,
|
||||
"narHash": "sha256-3VvRGPkpBJobQrFD3slQzMAwZlo4/UwxT8933U5tRVM=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "1dd19f19e4b53a1fd2e8e738a08dd5fe635ec7e5",
|
||||
"rev": "f4f18f3d7229845e1c9d517457b7a0b90a38b728",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -67,11 +101,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733312601,
|
||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
||||
"lastModified": 1722555600,
|
||||
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
||||
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -83,31 +117,31 @@
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nur",
|
||||
"arion",
|
||||
"hercules-ci-effects",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733312601,
|
||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
||||
"lastModified": 1712014858,
|
||||
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
||||
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
"id": "flake-parts",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1750837715,
|
||||
"narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=",
|
||||
"lastModified": 1725885300,
|
||||
"narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "98236410ea0fe204d0447149537a924fb71a6d4f",
|
||||
"rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -132,6 +166,28 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hercules-ci-effects": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": [
|
||||
"arion",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719226092,
|
||||
"narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "hercules-ci-effects",
|
||||
"rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "hercules-ci-effects",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@ -139,20 +195,183 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1750792728,
|
||||
"narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=",
|
||||
"lastModified": 1726036828,
|
||||
"narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "366f00797b1efb70f2882d3da485e3c10fd3d557",
|
||||
"rev": "8a1671642826633586d12ac3158e463c7a50a112",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprcursor": {
|
||||
"inputs": {
|
||||
"hyprlang": [
|
||||
"hyprland",
|
||||
"hyprlang"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hyprland",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722623071,
|
||||
"narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprcursor",
|
||||
"rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprcursor",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprland": {
|
||||
"inputs": {
|
||||
"aquamarine": "aquamarine",
|
||||
"hyprcursor": "hyprcursor",
|
||||
"hyprlang": "hyprlang",
|
||||
"hyprutils": "hyprutils",
|
||||
"hyprwayland-scanner": "hyprwayland-scanner",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems",
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726071051,
|
||||
"narHash": "sha256-eZPhLQ8DM8AsP+zM1KmUzxWQaiTpOUbFS1xeOyjgwvg=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "8b9e385943d1a9fd0f8c6070fa1eae507ae26145",
|
||||
"revCount": 5213,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland"
|
||||
},
|
||||
"original": {
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland"
|
||||
}
|
||||
},
|
||||
"hyprland-protocols": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"xdph",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hyprland",
|
||||
"xdph",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721326555,
|
||||
"narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-protocols",
|
||||
"rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-protocols",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprlang": {
|
||||
"inputs": {
|
||||
"hyprutils": [
|
||||
"hyprland",
|
||||
"hyprutils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hyprland",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725997860,
|
||||
"narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprutils": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hyprland",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724966483,
|
||||
"narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprwayland-scanner": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hyprland",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721324119,
|
||||
"narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwayland-scanner",
|
||||
"rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwayland-scanner",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-colors": {
|
||||
"inputs": {
|
||||
"base16-schemes": "base16-schemes",
|
||||
@ -172,34 +391,18 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixUnstable": {
|
||||
"locked": {
|
||||
"lastModified": 1750994206,
|
||||
"narHash": "sha256-3u6rEbIX9CN/5A5/mc3u0wIO1geZ0EhjvPBXmRDHqWM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "80d50fc87924c2a0d346372d242c27973cf8cdbf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1750969886,
|
||||
"narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=",
|
||||
"lastModified": 1725983898,
|
||||
"narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a676066377a2fe7457369dd37c31fd2263b662f4",
|
||||
"rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-25.05",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
@ -219,34 +422,13 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1751011381,
|
||||
"narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1751150016,
|
||||
"narHash": "sha256-aaNJgaEXYMsdmLG38YyCO0eZdTf49Cj0TZsW4gpn9jg=",
|
||||
"lastModified": 1726094006,
|
||||
"narHash": "sha256-YwlRlFQFLpc9IRuO+8D14FIq3CcwnBKUXdRgkBDKWlE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nur",
|
||||
"rev": "c3c9ee3b26349abe162df39499ec587f453ce089",
|
||||
"rev": "8210b7ea5ea9898784e06367b88658e3f14312e9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -261,8 +443,8 @@
|
||||
"darwin": "darwin",
|
||||
"hardware": "hardware",
|
||||
"home-manager": "home-manager",
|
||||
"hyprland": "hyprland",
|
||||
"nix-colors": "nix-colors",
|
||||
"nixUnstable": "nixUnstable",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nur": "nur",
|
||||
"sops-nix": "sops-nix"
|
||||
@ -272,14 +454,17 @@
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1750119275,
|
||||
"narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
|
||||
"lastModified": 1725922448,
|
||||
"narHash": "sha256-ruvh8tlEflRPifs5tlpa0gkttzq4UtgXkJQS7FusgFE=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
|
||||
"rev": "cede1a08039178ac12957733e97ab1006c6b6892",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -288,24 +473,48 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nur",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1733222881,
|
||||
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
|
||||
"lastModified": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default-linux",
|
||||
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default-linux",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"xdph": {
|
||||
"inputs": {
|
||||
"hyprland-protocols": "hyprland-protocols",
|
||||
"hyprlang": [
|
||||
"hyprland",
|
||||
"hyprlang"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hyprland",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726046979,
|
||||
"narHash": "sha256-6SEsjurq9cdTkITA6d49ncAJe4O/8CgRG5/F//s6Xh8=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"rev": "e695669fd8e1d1be9eaae40f35e00f8bd8b64c18",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
|
||||
16
flake.nix
16
flake.nix
@ -1,14 +1,13 @@
|
||||
{
|
||||
description = "SoraFlake";
|
||||
inputs = {
|
||||
# Trick renovate into working: "github:NixOS/nixpkgs/nixpkgs-unstable"
|
||||
nixUnstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||
# Trick renovate into working: "github:NixOS/nixpkgs/nixpkgs-unstable"
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
hardware.url = "github:nixos/nixos-hardware";
|
||||
nur.url = "github:nix-community/nur";
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-25.05";
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
@ -17,13 +16,14 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# hyprland = {
|
||||
# url = "github:hyprwm/Hyprland";
|
||||
# inputs.nixpkgs.follows = "nixpkgs";
|
||||
# };
|
||||
hyprland = {
|
||||
url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
sops-nix = {
|
||||
url = "github:Mic92/sops-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.nixpkgs-stable.follows = "nixpkgs";
|
||||
};
|
||||
nix-colors.url = "github:misterio77/nix-colors";
|
||||
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
in ({
|
||||
"nixos" = inputs.nixpkgs.lib.nixosSystem {
|
||||
system = syscfg.syscfg.system;
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./modules/shared/syscfg
|
||||
./modules/shared/sops
|
||||
@ -29,8 +28,7 @@
|
||||
syscfg
|
||||
{ usercfg = userConfig; }
|
||||
inputs.nix-colors.homeManagerModule
|
||||
# inputs.hyprland.homeManagerModules.default
|
||||
inputs.sops-nix.homeManagerModules.sops
|
||||
inputs.hyprland.homeManagerModules.default
|
||||
];
|
||||
}) syscfg.syscfg.users);
|
||||
}
|
||||
@ -54,7 +52,7 @@
|
||||
nameValuePair userConfig.username {
|
||||
imports = [
|
||||
inputs.nix-colors.homeManagerModule
|
||||
inputs.sops-nix.homeManagerModules.sops
|
||||
inputs.hyprland.homeManagerModules
|
||||
];
|
||||
}) syscfg.syscfg.users);
|
||||
}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib, config, ... }: {
|
||||
|
||||
#environment.sessionVariables.SOPS_AGE_KEY_FILE = keyFilePath;
|
||||
systemd.user.startServices = "sd-switch";
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
@ -8,14 +7,6 @@
|
||||
username = "${config.usercfg.username}";
|
||||
homeDirectory = "/home/${config.usercfg.username}";
|
||||
|
||||
stateVersion = "24.11";
|
||||
stateVersion = "23.11";
|
||||
};
|
||||
|
||||
|
||||
#SOPS
|
||||
# sops.defaultSopsFile = ./sops/${config.usercfg.username}.yaml;
|
||||
# sops.age.keyFile = "/var/lib/sops-nix/age-key.txt";
|
||||
# sops.age.generateKey = true;
|
||||
# sops.secrets."github_user_key" = { };
|
||||
# sops.secrets."curse_forge_key" = { };
|
||||
}
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
curse_forge_key: ENC[AES256_GCM,data:PhhwPhUys/WDzXb40iFlrUcwFEJVzi49vDlm5Hpc7IUwbBiQI1Zvi6115THMvarnGESDyouPfoZP0wha,iv:x//EzR4QwdD0UxqV97yUepc39DopoqiDT21unpF9R2E=,tag:5jM1EibWo0wI+PS70+kb/Q==,type:str]
|
||||
github_user_key: ENC[AES256_GCM,data:RvBsQjWGd2qRCvBzcpMv8FIXGY/GiPd9o0x2Oq+NlbXxR2NMqNBNLw==,iv:99AcmOWFft7XQAn7YrGjZuCvz0M5wUkYeInsWwyeUFM=,tag:wkw2YQGi9j/8XtOFd8KhdQ==,type:str]
|
||||
sops:
|
||||
kms: []
|
||||
gcp_kms: []
|
||||
azure_kv: []
|
||||
hc_vault: []
|
||||
age:
|
||||
- recipient: age1sxzuhh2fcd4pmaz4mdqq95t683d32ft22w9t2r7pk258u0s8wymsqdj7lg
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBraWFDRFUxQ2l5OWV1OXNK
|
||||
UExEbWZkM0kzVk1rZG4yY3pBLzdMVWVJS0UwCnhlWFJ5T2lZUXJyNkg1ejQxaU1t
|
||||
L3F2RUhldTY3N2xXL0hwczNKRzNjcncKLS0tIEkycHoxcDBGNyt2V3RDY29wNGVp
|
||||
TGg5Rk05VkRsaXM1Q0NxMmtMajRORDAKqjFldiAYJKjmnkeDkwanjYvhL6645DZ5
|
||||
dVXExjqO/DG733ge8HFyKzpfpkzRymV1giUwxBdII1dd0mJ2ncINeA==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age1ms8f0ysv6vakxepvt69fejczs6tddexepesdv4rkgtheehj3nu4sc6290s
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3UkRjblIvYStZUzQyRHA1
|
||||
ZGVXeHhrN0kyVkxZdms5U3gwVFlPMW12MVJjCjRkVURpZXBzb0tYenB4dGxKamh6
|
||||
VXVBMmo1Ujkvd2VTRExyWE5MbVJaclUKLS0tIDVhRkYzZmEzUG00Q2IwOWZUMVVt
|
||||
ODVIbytpcjN1cVMyaG1qVVdkRmtaMzQKNsvD9DpK/raDBob+IcuNk72tQDts36kJ
|
||||
QhtoLy8MvUymi49PdEWrgyf68w5XwRO/U4iINhR0qzm0glg/XcyHjA==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age1sxzuhh2fcd4pmaz4mdqq95t683d32ft22w9t2r7pk258u0s8wymsqdj7lg
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJc3hKWkk3ckNOY2UyTVhG
|
||||
MmtLaEd0K04yaGxiOUoxMXkzOEFnYis4VkhnCktDRFM2bS8vb05OWDdwa0RwRlNO
|
||||
cmlZemtxVGZ6S0tNTDV1cmE1N0pVWnMKLS0tIE9EZllycHJpcEY2R1pwOFhOZEU3
|
||||
L01IcytDd3BPb0VOTW9DQ2lUdUVJS0kKiD+C+3mK1b/eIwCEFanFgYGLNk3JNPQ7
|
||||
i1UqzbHVxSd0q/YVwdKAcj0jA6EezGm275tgq7IVsy2sHkvRMaEDtQ==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
- recipient: age1sxzuhh2fcd4pmaz4mdqq95t683d32ft22w9t2r7pk258u0s8wymsqdj7lg
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAweVU3TkxFZzRnd2I2clN2
|
||||
ZTlTWmhwQkhVc1hnOXFvZVVDSWpHMVh1TGtrCkc3M1pUTnZCMHpvYXB5ZVhreGxa
|
||||
ZVY2cG5Ja2ltL3k2Q1VEalc5TTNFMXcKLS0tIGd5UWl0RGVXT211Zm51dlB6WFZ1
|
||||
STRtTVpVTCtVZ1FUNENqWFFVNTNuaVUKN6HRiZjTdENeif8dJ29urBxPXDaosjjY
|
||||
InN4Ko6YUaGfvB1DTrKIzrxOpsHS+XjisoGfT71tJwwEOoREklEO/A==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2024-12-23T18:05:22Z"
|
||||
mac: ENC[AES256_GCM,data:YSi2xIwz50VxUDL3QzGVUwRWUgZhvudSLCKgwIbWm8gkuAJ/V2sVRhJNVQJ1YvLO44ob5hmrgR4wSnOdAbS7FrpbLcJuoYBjVUTDjy+j6otnIDxEcYeciHhZ1pV/OiydBmJC+lZ4+SRdWdokL2HaXRKgc9QT9e/MdAbFIzI1x90=,iv:8rj8yEqHTMgoGu31RVskYizmROB/5I0ajZJ/EcmlVfE=,tag:PILFCyXY8sXYGxCEHS7qCg==,type:str]
|
||||
pgp:
|
||||
- created_at: "2023-04-20T10:20:17Z"
|
||||
enc: |-
|
||||
-----BEGIN PGP MESSAGE-----
|
||||
|
||||
wcFMA6R3Y9nD7qMBAQ/8CVWQaYKfOzvPIllZyyWpUjHRLLXaR8MNJ8U5WI/tdwdN
|
||||
9UScDYJFuYRW7Q9s4Mt961kBGpaHqe9MUZBxUDlYX59+EN3FbO/eMQ5OqI05ESmL
|
||||
TvZB4+S9C5o73nuypSDNvYz+Lgq6DO25ZPhXdtPhx2DE4G31/wft/LpxhjalIjI8
|
||||
MU0Dv22R4qC+glJbe4GIF2IJ8XoxnnzjiGeSqiyv0QIBM0SzOtA5sKwNohWBnW7g
|
||||
7vxOTm5+kyzG0dDjt3tFApgPDaA1wjofzhRuuveF52VBsuIA2opFdpqkyICvK6rn
|
||||
NB5kUaPlY6A0m+n0oHSfY5wm/AnHNE4Oob/ifumAaB0EAJVUTRauI5M8SeJF0ya1
|
||||
U0IQ9N2lb7Y6q4pqHywIa6fnylsqCfxInAYKMuslRq8f9t/qakb4/MYcnPrwpzjw
|
||||
73/naiNoJmG6NVTkM52qTtOqZAmsaQd5cigTuPW2Z2CJq1yLZEVGSSd1DUGUjBDK
|
||||
nQGucpVVVpD+ifrIPz+Iqwy+5NoZZm/Oa9pKJGFzqXinnDNZaqtgpmTw9QxcSeaP
|
||||
VvGZG9CDd89MtAm1VQyuqi1bQ2faq3G0xNrLl7xUsfmjx4ofW+JXR87OzvGfLPhu
|
||||
Sjl3kS9j5/MEBRBg3n9gNkgSu5Sy3ilhckY3yjTgAT9Gw2giDhCiUXi1/7KrGprS
|
||||
UQHPCSsjyWsyuYVa3lAP/WPdVclc4WOdfYcetUCXBVP7LQr0bq+IG+2J0nnY3mDt
|
||||
Va5k4sP1qu6Ecrs2JioQ1V2H+VmcrRykBWnMXl1tDSWKMA==
|
||||
=pS8X
|
||||
-----END PGP MESSAGE-----
|
||||
fp: 4E241635F8EDD2919D2FB44CA362EA0491E2EEA0
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.9.2
|
||||
@ -12,7 +12,7 @@
|
||||
cbonsai
|
||||
pipes-rs
|
||||
cmatrix
|
||||
#cava
|
||||
cava
|
||||
sl
|
||||
];
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@ in {
|
||||
"ssh" = "TERM=xterm-256color ${pkgs.openssh}/bin/ssh";
|
||||
"top" = "btop";
|
||||
};
|
||||
initContent = ''
|
||||
initExtra = ''
|
||||
sopsu() {nix-shell -p sops --run "sops updatekeys $1";}
|
||||
sopsn() {nix-shell -p sops --run "sops $1";}
|
||||
'';
|
||||
|
||||
@ -2,6 +2,6 @@
|
||||
imports = [ ./vscodium ];
|
||||
|
||||
config = lib.mkIf (config.syscfg.make.develop) {
|
||||
home.packages = with pkgs; [ blender godot_4 openscad-unstable bambu-studio ];
|
||||
home.packages = with pkgs; [ blender godot_4 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,8 +4,7 @@
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
package = pkgs.vscodium;
|
||||
#profiles.default = {
|
||||
profiles.default.extensions = with pkgs.vscode-extensions; [
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
bbenoist.nix
|
||||
esbenp.prettier-vscode
|
||||
golang.go
|
||||
@ -13,7 +12,6 @@
|
||||
ms-vscode.cpptools
|
||||
dbaeumer.vscode-eslint
|
||||
];
|
||||
#};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,13 +10,10 @@
|
||||
xfce.tumbler
|
||||
|
||||
telegram-desktop
|
||||
discord-canary
|
||||
pavucontrol
|
||||
keepassxc
|
||||
nextcloud-client
|
||||
|
||||
gramps
|
||||
sweethome3d.application
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
{ inputs, lib, config, pkgs, ... }: {
|
||||
{ lib, config, pkgs, ... }: {
|
||||
|
||||
imports = [ ./openttd.nix ./wow.nix ];
|
||||
imports = [ ./openttd.nix ];
|
||||
|
||||
config = lib.mkIf (config.syscfg.make.game) {
|
||||
|
||||
home.packages = with pkgs; [
|
||||
# custom.simc
|
||||
|
||||
#games
|
||||
steam
|
||||
@ -14,9 +15,6 @@
|
||||
prismlauncher
|
||||
openttd-jgrpp
|
||||
bottles
|
||||
lutris
|
||||
unstable.umu-launcher
|
||||
wine
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@ -1,81 +0,0 @@
|
||||
{ pkgs, lib, config, sops, ... }: {
|
||||
|
||||
config = lib.mkIf (config.syscfg.make.game) {
|
||||
|
||||
home.packages = with pkgs;
|
||||
[
|
||||
# custom.simc
|
||||
];
|
||||
|
||||
# templates buggy currently
|
||||
#xdg.configFile."instawow/config.json" = ''${config.sops.templates."instawow_config.json".path}'';
|
||||
sops.templates."instawow_config.json".content = ''
|
||||
{
|
||||
"auto_update_check": true,
|
||||
"access_tokens": {
|
||||
"cfcore": "${config.sops.placeholder.curse_forge_key}",
|
||||
"github": "${config.sops.placeholder.github_user_key}",
|
||||
"wago_addons": null
|
||||
}
|
||||
}'';
|
||||
|
||||
# curse:master-plan
|
||||
# curse:raretrackercore-rt
|
||||
# curse:raretrackerdragonflight-rtd
|
||||
# curse:raretrackermaw-rtmw
|
||||
# curse:raretrackermechagon-rtm
|
||||
# curse:raretrackerthewarwithin-rtww
|
||||
# curse:raretrackertimelessisle-rtti
|
||||
# curse:raretrackeruldum-rtu
|
||||
# curse:raretrackervale-rtv
|
||||
# curse:raretrackerworldbosses-rtwb
|
||||
# curse:raretrackerzerethmortis-rtz
|
||||
# curse:venture-plan
|
||||
# curse:war-plan
|
||||
# github:nevcairiel/bartender4
|
||||
# github:cidan/betterbags
|
||||
# github:bigwigsmods/bigwigs
|
||||
# github:bigwigsmods/bigwigs_battleforazeroth
|
||||
# github:bigwigsmods/bigwigs_burningcrusade
|
||||
# github:bigwigsmods/bigwigs_cataclysm
|
||||
# github:bigwigsmods/bigwigs_classic
|
||||
# github:bigwigsmods/bigwigs_dragonflight
|
||||
# github:bigwigsmods/bigwigs_legion
|
||||
# github:bigwigsmods/bigwigs_mistsofpandaria
|
||||
# github:bigwigsmods/bigwigs_shadowlands
|
||||
# github:bigwigsmods/bigwigs_warlordsofdraenor
|
||||
# github:bigwigsmods/bigwigs_wrathofthelichking
|
||||
# github:nezroy/demodal
|
||||
# github:curseforge-mirror/details
|
||||
# github:edusperoni/details_elitism
|
||||
# github:curseforge-mirror/elitismhelper
|
||||
# github:michaelnpsp/grid2
|
||||
# github:jods-gh/groupfinderrio
|
||||
# github:nevcairiel/handynotes
|
||||
# github:hekili/hekili
|
||||
# github:thekrowi/krowi_achievementfilter
|
||||
# github:bigwigsmods/littlewigs
|
||||
# github:nnoggie/mythicdungeontools
|
||||
# github:tullamods/omnicc
|
||||
# github:tercioo/plater-nameplates
|
||||
# github:curseforge-mirror/quest_completist
|
||||
# github:raiderio/raiderio-addon
|
||||
# github:wowrarity/rarity
|
||||
# github:nevcairiel/shadowedunitframes
|
||||
# github:simulationcraft/simc-addon
|
||||
# github:curseforge-mirror/tomcats
|
||||
# github:weakauras/weakauras2
|
||||
# github:kemayo/wow-handynotes-battleforazerothtreasures
|
||||
# github:kemayo/wow-handynotes-dragonflight
|
||||
# github:kemayo/wow-handynotes-legiontreasures
|
||||
# github:kemayo/wow-handynotes-longforgottenhippogryph
|
||||
# github:kemayo/wow-handynotes-lostandfound
|
||||
# github:kemayo/wow-handynotes-secretfish
|
||||
# github:kemayo/wow-handynotes-shadowlandstreasures
|
||||
# github:kemayo/wow-handynotes-stygia
|
||||
# github:kemayo/wow-handynotes-treasurehunter
|
||||
# github:kemayo/wow-handynotes-warwithin
|
||||
# wowi:7032-tomtom
|
||||
|
||||
};
|
||||
}
|
||||
@ -11,8 +11,8 @@ in pkgs.stdenv.mkDerivation rec {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = "Orchis-theme";
|
||||
rev = "5b73376721cf307101e22d7031c1f4b1344d1f63";
|
||||
sha256 = "sha256-+2/CsgJ+rdDpCp+r5B/zys3PtFgtnu+ohTEUOtJNd1Y=";
|
||||
rev = "be8b0aff92ed0741174b74c2ee10c74b15be0474";
|
||||
sha256 = "sha256-m7xh/1uIDh2BM0hTPA5QymXQt6yV7mM7Ivg5VaF2PvM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with pkgs; [ gtk3 sassc ];
|
||||
@ -22,43 +22,43 @@ in pkgs.stdenv.mkDerivation rec {
|
||||
preInstall = ''
|
||||
mkdir -p $out/share/themes
|
||||
cat > src/_sass/_color-palette-${scheme.slug}.scss << 'EOF'
|
||||
$red-light: #${scheme.palette.low0F};
|
||||
$red-dark: #${scheme.palette.high0F};
|
||||
$red-light: #${scheme.palette.base0F};
|
||||
$red-dark: #${scheme.palette.base0F};
|
||||
|
||||
$pink-light: #${scheme.palette.low0E};
|
||||
$pink-dark: #${scheme.palette.high0E};
|
||||
$pink-light: #${scheme.palette.base0E};
|
||||
$pink-dark: #${scheme.palette.base0E};
|
||||
|
||||
$purple-light: #${scheme.palette.low0D};
|
||||
$purple-dark: #${scheme.palette.high0D};
|
||||
$purple-light: #${scheme.palette.base0D};
|
||||
$purple-dark: #${scheme.palette.base0D};
|
||||
|
||||
$blue-light: #${scheme.palette.low0C};
|
||||
$blue-dark: #${scheme.palette.high0C};
|
||||
$blue-light: #${scheme.palette.base0C};
|
||||
$blue-dark: #${scheme.palette.base0C};
|
||||
|
||||
$teal-light: #${scheme.palette.low0B};
|
||||
$teal-dark: #${scheme.palette.high0B};
|
||||
$teal-light: #${scheme.palette.base0B};
|
||||
$teal-dark: #${scheme.palette.base0B};
|
||||
|
||||
$green-light: #${scheme.palette.low0A};
|
||||
$green-dark: #${scheme.palette.high0A};
|
||||
$sea-light: #${scheme.palette.alt_low0B};
|
||||
$sea-dark: #${scheme.palette.alt_high0B};
|
||||
$green-light: #${scheme.palette.base0A};
|
||||
$green-dark: #${scheme.palette.base0A};
|
||||
$sea-light: #${scheme.palette.base0B};
|
||||
$sea-dark: #${scheme.palette.base0B};
|
||||
|
||||
$yellow-light: #${scheme.palette.low09};
|
||||
$yellow-dark: #${scheme.palette.low09};
|
||||
$yellow-light: #${scheme.palette.base09};
|
||||
$yellow-dark: #${scheme.palette.base09};
|
||||
|
||||
$orange-light: #${scheme.palette.low08};
|
||||
$orange-dark: #${scheme.palette.high08};
|
||||
$orange-light: #${scheme.palette.base08};
|
||||
$orange-dark: #${scheme.palette.base08};
|
||||
|
||||
$grey-050: #${scheme.palette.base07};
|
||||
$grey-100: #${scheme.palette.base07};
|
||||
$grey-150: #${scheme.palette.base06};
|
||||
$grey-150: #${scheme.palette.base07};
|
||||
$grey-200: #${scheme.palette.base06};
|
||||
$grey-250: #${scheme.palette.base05};
|
||||
$grey-250: #${scheme.palette.base06};
|
||||
$grey-300: #${scheme.palette.base05};
|
||||
$grey-350: #${scheme.palette.base04};
|
||||
$grey-350: #${scheme.palette.base05};
|
||||
$grey-400: #${scheme.palette.base04};
|
||||
$grey-450: #${scheme.palette.base03};
|
||||
$grey-450: #${scheme.palette.base04};
|
||||
$grey-500: #${scheme.palette.base03};
|
||||
$grey-550: #${scheme.palette.base02};
|
||||
$grey-550: #${scheme.palette.base03};
|
||||
$grey-600: #${scheme.palette.base02};
|
||||
$grey-650: #${scheme.palette.base02};
|
||||
$grey-700: #${scheme.palette.base01};
|
||||
|
||||
@ -5,8 +5,6 @@
|
||||
|
||||
xdg.configFile."swaylock/config".text = ''
|
||||
screenshots
|
||||
grace-no-mouse
|
||||
grace-no-touch
|
||||
grace=5
|
||||
effect-pixelate=5
|
||||
fade-in=0.2
|
||||
|
||||
@ -42,8 +42,6 @@ in {
|
||||
[ "discord-402572971681644545.desktop" ];
|
||||
"x-scheme-handler/discord-696343075731144724" =
|
||||
[ "discord-696343075731144724.desktop" ];
|
||||
"x-scheme-handler/tg" = [ "org.telegram.desktop.desktop" ];
|
||||
"x-scheme-handler/tonsite" = [ "org.telegram.desktop.desktop" ];
|
||||
"x-scheme-handler/http" = [ "firefox.desktop" ];
|
||||
"x-scheme-handler/https" = [ "firefox.desktop" ];
|
||||
"x-scheme-handler/chrome" = [ "firefox.desktop" ];
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
xwayland.enable = true;
|
||||
extraConfig = ''
|
||||
monitor=,preferred,auto,auto
|
||||
env=bitdepth,10
|
||||
|
||||
input {
|
||||
kb_layout = us, ru
|
||||
kb_variant = intl, phonetic
|
||||
@ -61,10 +61,10 @@
|
||||
fullscreen_opacity = 1.0
|
||||
|
||||
# shadow
|
||||
# drop_shadow = no
|
||||
# shadow_range = 60
|
||||
# shadow_offset = 0 5
|
||||
# shadow_render_power = 4
|
||||
drop_shadow = no
|
||||
shadow_range = 60
|
||||
shadow_offset = 0 5
|
||||
shadow_render_power = 4
|
||||
#col.shadow = rgba(00000099)
|
||||
}
|
||||
|
||||
|
||||
@ -3,8 +3,8 @@ let cfg = config.syscfg.make.gui;
|
||||
in {
|
||||
config = lib.mkIf cfg {
|
||||
# sound.enable = true;
|
||||
hardware.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
services.pulseaudio.enable = false; #25.05 change to services
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
|
||||
@ -7,25 +7,9 @@
|
||||
STOP_CHARGE_THRESH_BAT0 = 90;
|
||||
CPU_SCALING_GOVERNOR_ON_AC = "performance";
|
||||
CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
|
||||
MEM_SLEEP_ON_BAT = "deep";
|
||||
};
|
||||
};
|
||||
|
||||
powerManagement.enable = true;
|
||||
# suspend to RAM (deep) rather than `s2idle`
|
||||
boot.kernelParams = [ "mem_sleep_default=deep" ];
|
||||
# suspend-then-hibernate
|
||||
systemd.sleep.extraConfig = ''
|
||||
HibernateDelaySec=30m
|
||||
SuspendState=mem
|
||||
'';
|
||||
|
||||
services.logind.lidSwitch = "suspend-then-hibernate";
|
||||
# Hibernate on power button pressed
|
||||
services.logind.powerKey = "hibernate";
|
||||
services.logind.powerKeyLongPress = "poweroff";
|
||||
|
||||
|
||||
systemd.user.services.battery_monitor = {
|
||||
wants = [ "display-manager.service" ];
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ inputs, pkgs, ... }: {
|
||||
{ pkgs, ... }: {
|
||||
nixpkgs.config = {
|
||||
permittedInsecurePackages = [ ];
|
||||
allowUnfree = true;
|
||||
@ -8,9 +8,9 @@
|
||||
};
|
||||
|
||||
};
|
||||
nixpkgs.overlays = import ../../../../overlays { inherit inputs pkgs; };
|
||||
nixpkgs.overlays = import ../../../../overlays { inherit pkgs; };
|
||||
nix = {
|
||||
package = pkgs.nixVersions.stable;
|
||||
package = pkgs.nixFlakes;
|
||||
extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
warn-dirty = false
|
||||
@ -37,5 +37,5 @@
|
||||
];
|
||||
};
|
||||
};
|
||||
system.stateVersion = "24.11";
|
||||
system.stateVersion = "24.05";
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ pkgs, ... }: {
|
||||
{ pkgs,... }: {
|
||||
imports = [ ./debug ./develop ];
|
||||
|
||||
# services.telegraf = {
|
||||
@ -61,4 +61,4 @@
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,10 +7,9 @@ let
|
||||
};
|
||||
in {
|
||||
config = lib.mkIf (config.syscfg.make.develop) {
|
||||
environment.systemPackages = with pkgs;
|
||||
[
|
||||
# android-tools
|
||||
# androidStudioPackages.canary
|
||||
environment.systemPackages = with pkgs; [
|
||||
android-tools
|
||||
androidStudioPackages.canary
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ config, ... }: {
|
||||
imports = [ ./sorahiro.nix ];
|
||||
imports = [ ./sorahiro_soft.nix ];
|
||||
|
||||
colorScheme.palette.border-radius = "#8";
|
||||
colorScheme.palette.border-width = "#2";
|
||||
|
||||
@ -1,67 +0,0 @@
|
||||
{ nix-colors, ... }:
|
||||
let use_pastelle = true;
|
||||
in{
|
||||
# usage: a = "#${config.colorScheme.palette.base00}";
|
||||
|
||||
colorScheme = {
|
||||
slug = "sorahiro";
|
||||
name = "sorahiro";
|
||||
author = "Soraefir @ Helcel";
|
||||
variant = "dark";
|
||||
palette = rec {
|
||||
# Format: Name, Pantone, RAL
|
||||
base00 = "#000000"; # Black / 419C / 9005
|
||||
base01 = "#060a0f"; # Rich Black / 532C / 9005
|
||||
base02 = "#212c38"; # Yankees Blue / 433C / 5011
|
||||
base03 = "#3f5268"; # Police Blue / 432C / 5000
|
||||
base04 = "#617b9a"; # Slate Gray / 5415C / 5014
|
||||
base05 = "#90a7c1"; # Pewter Blue / 535C / 5024
|
||||
base06 = "#c9d3df"; # Columbia Blue / 538C / 7047
|
||||
base07 = "#fcfcfc"; # Lotion / 663C / 9016
|
||||
alt00 = "#000000"; # Black / 419C / 9005
|
||||
alt01 = "#0c0906"; # Vampire Black / 419C / 9005
|
||||
alt02 = "#312920"; # Pine Tree / 440C / 6022
|
||||
alt03 = "#5b4e3e"; # Olive Drab Camouflage / 411C / 7013
|
||||
alt04 = "#887660"; # Shadow / 404C / 7002
|
||||
alt05 = "#b8a083"; # Pale Taupe / 480C / 1019
|
||||
alt06 = "#e1cfb9"; # Desert Sand / 482C / 1015
|
||||
alt07 = "#fcfcfc"; # Lotion / 663C / 9016
|
||||
|
||||
base08 = if use_pastelle then low08 else high08;
|
||||
base09 = if use_pastelle then low09 else high09;
|
||||
base0A = if use_pastelle then low0A else high0A;
|
||||
base0B = if use_pastelle then low0B else high0B;
|
||||
base0C = if use_pastelle then low0C else high0C;
|
||||
base0D = if use_pastelle then low0D else high0D;
|
||||
base0E = if use_pastelle then low0E else high0E;
|
||||
base0F = if use_pastelle then low0F else high0F;
|
||||
|
||||
high08 = "#f09732"; # Deep Saffron / 804C / 1033
|
||||
high09 = "#f2d831"; # Dandelion / 114C / 1016
|
||||
high0A = "#98f12f"; # Green Lizard / 375C / 6038
|
||||
high0B = "#34f4f0"; # Fluorescent Blue / 3252C / 6027
|
||||
high0C = "#3193f5"; # Brilliant Azure / 2727C / 5015
|
||||
high0D = "#c156f6"; # Blue-Violet / 2592C / 4006
|
||||
high0E = "#f62ac0"; # Royal Pink / 807C / 4010
|
||||
high0F = "#f42060"; # Deep Carmine Pink / 1925C / 3018
|
||||
alt_high08 = "#f66824"; # Orange-Red / 165C / 2008
|
||||
alt_high0B = "#41f3a4"; # Eucalyptus / 3395C / 6037
|
||||
alt_high0C = "#2abef8"; # Spiro Disco Ball / 298C / 5012
|
||||
alt_high0D = "#837ff5"; # Violets Are Blue / 814C / 4005
|
||||
|
||||
low08 = "#ffac56"; # Rajah / 150C / 1017
|
||||
low09 = "#feea74"; # Shandy / 127C / 1016
|
||||
low0A = "#bffe8a"; # Menthol / 374C / 6018
|
||||
low0B = "#4cfefa"; # Electric Blue / 3252C / 6027
|
||||
low0C = "#62acfd"; # Blue Jeans / 279C / 5012
|
||||
low0D = "#9b9bfd"; # Maximum Blue Purple / 2715C / 4005
|
||||
low0E = "#fe9bda"; # Lavender Rose / 223C / 4003
|
||||
low0F = "#fc8999"; # Tulip / 1775C / 3014
|
||||
alt_low08 = "#fe946a"; # Atomic Tangerine / 811C / 1034
|
||||
alt_low0B = "#87febf"; # Aquamarine / 353C / 6019
|
||||
alt_low0C = "#38c3fd"; # Picton Blue / 298C / 5012
|
||||
alt_low0D = "#dca2ff"; # Mauve / 2572C / 4005
|
||||
|
||||
};
|
||||
};
|
||||
}
|
||||
29
modules/shared/colors/sorahiro_hard.nix
Executable file
29
modules/shared/colors/sorahiro_hard.nix
Executable file
@ -0,0 +1,29 @@
|
||||
{ nix-colors, ... }: {
|
||||
# usage: a = "#${config.colorScheme.palette.base00}";
|
||||
|
||||
colorScheme = {
|
||||
slug = "sorahiro-hard";
|
||||
name = "sorahiro-hard";
|
||||
author = "Soraefir @ Helcel";
|
||||
variant = "dark";
|
||||
palette = {
|
||||
# Format: Name, Pantone, RAL
|
||||
base00 = "#030B12"; # Rich Black / 6C / 000-15-00
|
||||
base01 = "#0C1D2E"; # Maastricht Blue / 5395C / 270-20-15
|
||||
base02 = "#203A53"; # Japanese Indigo / 534C / 260-20-20
|
||||
base03 = "#425F7C"; # Deep Space Sparkle / 7699C / 260-40-20
|
||||
base04 = "#93A9BE"; # Pewter Blue / 535C / 260-70-15
|
||||
base05 = "#B6C5D5"; # Pastel Blue / 5445C / 260-80-10
|
||||
base06 = "#D6DFE8"; # Gainsboro / 642C / 260-90-05
|
||||
base07 = "#F0F3F7"; # White / 656C / 290-92-05
|
||||
base08 = "#F59331"; # Deep Saffron / 715C / 070-70-70
|
||||
base09 = "#F5F531"; # Maximum Yellow / 394C / 100-80-80
|
||||
base0A = "#93F531"; # French Lime / 7488C / 120-70-75
|
||||
base0B = "#31F593"; # Eucalyptus / 3385C / 160-70-50
|
||||
base0C = "#3193F5"; # Brilliant Azure / 2727C / 280-50-40
|
||||
baseOD = "#9331F5"; # Blue-Violet / 7442C / 300-40-45
|
||||
base0E = "#F53193"; # Royal Pink / 232C / 350-50-50
|
||||
base0F = "#F53131"; # Deep Carmine Pink / 1788C / 040-50-70
|
||||
};
|
||||
};
|
||||
}
|
||||
29
modules/shared/colors/sorahiro_soft.nix
Executable file
29
modules/shared/colors/sorahiro_soft.nix
Executable file
@ -0,0 +1,29 @@
|
||||
{ nix-colors, ... }: {
|
||||
# usage: a = "#${config.colorScheme.palette.base00}";
|
||||
|
||||
colorScheme = {
|
||||
slug = "sorahiro-soft";
|
||||
name = "sorahiro-soft";
|
||||
author = "Soraefir @ Helcel";
|
||||
variant = "dark";
|
||||
palette = {
|
||||
# Format: Name, Pantone, RAL
|
||||
base00 = "#030B12"; # Rich Black / 6C / 000-15-00
|
||||
base01 = "#0C1D2E"; # Maastricht Blue / 5395C / 270-20-15
|
||||
base02 = "#203A53"; # Japanese Indigo / 534C / 260-20-20
|
||||
base03 = "#425F7C"; # Deep Space Sparkle / 7699C / 260-40-20
|
||||
base04 = "#93A9BE"; # Pewter Blue / 535C / 260-70-15
|
||||
base05 = "#B6C5D5"; # Pastel Blue / 5445C / 260-80-10
|
||||
base06 = "#D6DFE8"; # Gainsboro / 642C / 260-90-05
|
||||
base07 = "#F0F3F7"; # White / 656C / 290-92-05
|
||||
base08 = "#F5B97D"; # Mellow Apricot / 156C / 070-80-40
|
||||
base09 = "#F5F57D"; # Sunny / 393C / 100-90-50
|
||||
base0A = "#B9F57D"; # Yellow-Green / 373C / 120-80-60
|
||||
base0B = "#7DF5B9"; # Aquamarine / 3375C / 150-80-40
|
||||
base0C = "#7DB9F5"; # Light Azure / 278C / 250-70-30
|
||||
base0D = "#B97DF5"; # Lavender / 2572C / 310-60-35
|
||||
base0E = "#F57DB9"; # Persian Pink / 211C / 350-60-45
|
||||
base0F = "#F57D7D"; # Light Coral / 170C / 030-60-50
|
||||
};
|
||||
};
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
@ -1,10 +0,0 @@
|
||||
{ final, prev, ... }:
|
||||
prev.bambu-studio.overrideAttrs (oldAttrs: rec{
|
||||
version = "02.00.01.50";
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "bambulab";
|
||||
repo = "BambuStudio";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7mkrPl2CQSfc1lRjl1ilwxdYcK5iRU//QGKmdCicK30=";
|
||||
};
|
||||
})
|
||||
@ -1,14 +1,8 @@
|
||||
{ inputs, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
[
|
||||
(final: prev: {
|
||||
openttd-jgrpp = import ./openttd-jgrpp { inherit final prev; };
|
||||
yarn-berry = import ./yarn-berry { inherit final prev; };
|
||||
eww = import ./eww { inherit final prev; };
|
||||
bambu-studio = import ./bambu-studio { inherit final prev; };
|
||||
wine = final.unstable.wineWow64Packages.unstableFull;
|
||||
unstable = import inputs.nixUnstable {
|
||||
system = final.system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
})
|
||||
]
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
let old = prev.eww;
|
||||
in final.rustPlatform.buildRustPackage rec {
|
||||
pname = "eww";
|
||||
version = "98c220126d912b935987766f56650b55f3e226eb";
|
||||
version = "8661abf2bf07f5a809fc995233d93810cc1ac871";
|
||||
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "elkowar";
|
||||
repo = "eww";
|
||||
rev = "${version}";
|
||||
hash = "sha256-zi+5G05aakh8GBdfHL1qcNo/15VEm5mXtHGgKMAyp1U=";
|
||||
hash = "sha256-q82u3/pcP5T++TMdDmaeDKYuCyky1Bo5BjHY1/NVHbY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-SEdr9nW5nBm1g6fjC5fZhqPbHQ7H6Kk0RL1V6OEQRdA=";
|
||||
cargoHash = "sha256-wKTaskKRyPfzKSLxhfyn6DybmUVFMHV5MrixKUBhno4=";
|
||||
|
||||
nativeBuildInputs = old.nativeBuildInputs;
|
||||
buildInputs = old.buildInputs ++ [ final.libdbusmenu-gtk3 ];
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ final, prev, ... }:
|
||||
prev.openttd-jgrpp.overrideAttrs (old: rec {
|
||||
version = "0.65.3";
|
||||
version = "0.55.3";
|
||||
src = prev.fetchFromGitHub rec {
|
||||
owner = "JGRennison";
|
||||
repo = "OpenTTD-patches";
|
||||
rev = "jgrpp-${version}";
|
||||
hash = "sha256-lmDkYrk7qjUSTtCQQCN/pbuLDt3+2RI1K8A1H1GJRjw=";
|
||||
hash = "sha256-E1+pXpXNHOu9nPTGSY8baVaKf1Um6IGDjpi1MmENez8=";
|
||||
};
|
||||
})
|
||||
|
||||
@ -4,7 +4,7 @@ let
|
||||
inputs.nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
|
||||
in forEachSystem (system:
|
||||
let
|
||||
overlays = import ../overlays { inherit inputs pkgs; };
|
||||
overlays = import ../overlays { inherit pkgs; };
|
||||
overrides = { custom = import ../pkgs { inherit pkgs; }; };
|
||||
pkgs = import inputs.nixpkgs { inherit system overlays; } // overrides;
|
||||
in {
|
||||
|
||||
@ -22,7 +22,6 @@ pkgs.mkShell {
|
||||
pipenv
|
||||
scala
|
||||
sbt
|
||||
cargo
|
||||
|
||||
#LIBS
|
||||
openssl
|
||||
|
||||
Reference in New Issue
Block a user