Compare commits
No commits in common. "585438f1ce7aef601eea253c32a24ebfb2063e80" and "80cdc6d8d4f89577b7cff35511f5ffdd5a200892" have entirely different histories.
585438f1ce
...
80cdc6d8d4
11 changed files with 296 additions and 630 deletions
394
flake.lock
generated
394
flake.lock
generated
|
@ -37,11 +37,11 @@
|
||||||
"base16-helix": {
|
"base16-helix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736852337,
|
"lastModified": 1725860795,
|
||||||
"narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
|
"narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "base16-helix",
|
"repo": "base16-helix",
|
||||||
"rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
|
"rev": "7f795bf75d38e0eea9fed287264067ca187b88a9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -53,43 +53,62 @@
|
||||||
"base16-vim": {
|
"base16-vim": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732806396,
|
"lastModified": 1731949548,
|
||||||
"narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
|
"narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "base16-vim",
|
"repo": "base16-vim",
|
||||||
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
|
"rev": "61165b1632409bd55e530f3dbdd4477f011cadc6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "base16-vim",
|
"repo": "base16-vim",
|
||||||
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"firefox-gnome-theme": {
|
"devshell": {
|
||||||
"flake": false,
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixvim",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741628778,
|
"lastModified": 1728330715,
|
||||||
"narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=",
|
"narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
|
||||||
"owner": "rafaelmardojai",
|
"owner": "numtide",
|
||||||
"repo": "firefox-gnome-theme",
|
"repo": "devshell",
|
||||||
"rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80",
|
"rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "rafaelmardojai",
|
"owner": "numtide",
|
||||||
"repo": "firefox-gnome-theme",
|
"repo": "devshell",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733328505,
|
"lastModified": 1696426674,
|
||||||
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||||
|
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||||
|
"revCount": 57,
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-compat_2": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1696426674,
|
||||||
|
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||||
"owner": "edolstra",
|
"owner": "edolstra",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -105,28 +124,6 @@
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
|
||||||
"lastModified": 1741352980,
|
|
||||||
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-parts_2": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs-lib": [
|
|
||||||
"stylix",
|
|
||||||
"nur",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733312601,
|
"lastModified": 1733312601,
|
||||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
||||||
|
@ -146,11 +143,11 @@
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731533236,
|
"lastModified": 1726560853,
|
||||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -232,21 +229,25 @@
|
||||||
"git-hooks": {
|
"git-hooks": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": [
|
"flake-compat": [
|
||||||
"stylix",
|
"nixvim",
|
||||||
"flake-compat"
|
"flake-compat"
|
||||||
],
|
],
|
||||||
"gitignore": "gitignore",
|
"gitignore": "gitignore",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"stylix",
|
"nixvim",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nixpkgs-stable": [
|
||||||
|
"nixvim",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741379162,
|
"lastModified": 1734797603,
|
||||||
"narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
|
"narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
|
"rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -258,7 +259,7 @@
|
||||||
"gitignore": {
|
"gitignore": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"stylix",
|
"nixvim",
|
||||||
"git-hooks",
|
"git-hooks",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
|
@ -301,11 +302,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742530487,
|
"lastModified": 1735774425,
|
||||||
"narHash": "sha256-yjBjRn294NpPagPAQCio20X5BzBXiOoz2+xF3/YmEkU=",
|
"narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "d61711497be9ad6a6633aaf203b038b5a970621f",
|
"rev": "5f6aa268e419d053c3d5025da740e390b12ac936",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -316,6 +317,27 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager_2": {
|
"home-manager_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixvim",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1735381016,
|
||||||
|
"narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"home-manager_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"stylix",
|
"stylix",
|
||||||
|
@ -323,11 +345,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741635347,
|
"lastModified": 1733085484,
|
||||||
"narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=",
|
"narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "7fb8678716c158642ac42f9ff7a18c0800fea551",
|
"rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -367,15 +389,15 @@
|
||||||
"lix": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737234286,
|
"lastModified": 1729298361,
|
||||||
"narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=",
|
"narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
|
||||||
"rev": "2837da71ec1588c1187d2e554719b15904a46c8b",
|
"rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz"
|
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lix-module": {
|
"lix-module": {
|
||||||
|
@ -388,24 +410,103 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737237494,
|
"lastModified": 1732605668,
|
||||||
"narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=",
|
"narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=",
|
||||||
"rev": "b90bf629bbd835e61f1317b99e12f8c831017006",
|
"rev": "f19bd752910bbe3a861c9cad269bd078689d50fe",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz?rev=f19bd752910bbe3a861c9cad269bd078689d50fe"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"
|
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"niri": {
|
||||||
|
"inputs": {
|
||||||
|
"niri-stable": "niri-stable",
|
||||||
|
"niri-unstable": "niri-unstable",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
|
"xwayland-satellite-stable": "xwayland-satellite-stable",
|
||||||
|
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1735810639,
|
||||||
|
"narHash": "sha256-npaaW0C9TxRrKINBVw3umV7QwIWETVX5yQfYOZSUVqY=",
|
||||||
|
"owner": "sodiboo",
|
||||||
|
"repo": "niri-flake",
|
||||||
|
"rev": "c5f2fe94779df8948b3f4503100847c7639ca34f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "sodiboo",
|
||||||
|
"repo": "niri-flake",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"niri-stable": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1731483594,
|
||||||
|
"narHash": "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE=",
|
||||||
|
"owner": "YaLTeR",
|
||||||
|
"repo": "niri",
|
||||||
|
"rev": "75c79116a7e40cbc0e110ce0cdd500e896458679",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "YaLTeR",
|
||||||
|
"ref": "v0.1.10.1",
|
||||||
|
"repo": "niri",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"niri-unstable": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1735807851,
|
||||||
|
"narHash": "sha256-XPfnpRatcit2mnoAyu3nDkQs/YWAG9kFA3qrBwjgWL4=",
|
||||||
|
"owner": "YaLTeR",
|
||||||
|
"repo": "niri",
|
||||||
|
"rev": "0dbd14ebdc5299936c6dfa3c94edce5cc805a808",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "YaLTeR",
|
||||||
|
"repo": "niri",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nix-darwin": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixvim",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1735478292,
|
||||||
|
"narHash": "sha256-Ys9pSP9ch0SthhpbjnkCSJ9ZLfaNKnt/dcy7swjmS1A=",
|
||||||
|
"owner": "lnl7",
|
||||||
|
"repo": "nix-darwin",
|
||||||
|
"rev": "71a3a075e3229a7518d76636bb762aef2bcb73ac",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "lnl7",
|
||||||
|
"repo": "nix-darwin",
|
||||||
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742422364,
|
"lastModified": 1735471104,
|
||||||
"narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
|
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
|
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -414,48 +515,47 @@
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixvim": {
|
"nixpkgs-stable": {
|
||||||
"inputs": {
|
|
||||||
"flake-parts": "flake-parts",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"nuschtosSearch": "nuschtosSearch"
|
|
||||||
},
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742488644,
|
"lastModified": 1735669367,
|
||||||
"narHash": "sha256-vXpu7G4aupNCPlv8kAo7Y/jocfSUwglkvNx5cR0XjBo=",
|
"narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
|
||||||
"owner": "nix-community",
|
"owner": "NixOS",
|
||||||
"repo": "nixvim",
|
"repo": "nixpkgs",
|
||||||
"rev": "d44b33a1ea1a3e584a8c93164dbe0ba2ad4f3a13",
|
"rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "NixOS",
|
||||||
"repo": "nixvim",
|
"ref": "nixos-24.11",
|
||||||
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nur": {
|
"nixvim": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts_2",
|
"devshell": "devshell",
|
||||||
|
"flake-compat": "flake-compat",
|
||||||
|
"flake-parts": "flake-parts",
|
||||||
|
"git-hooks": "git-hooks",
|
||||||
|
"home-manager": "home-manager_2",
|
||||||
|
"nix-darwin": "nix-darwin",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"stylix",
|
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
|
"nuschtosSearch": "nuschtosSearch",
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741693509,
|
"lastModified": 1735802549,
|
||||||
"narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=",
|
"narHash": "sha256-aS03+IGLexQt5HL+tLZqSko6Jpxa+eozqcide/pab34=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "nixvim",
|
||||||
"rev": "5479646b2574837f1899da78bdf9a48b75a9fb27",
|
"rev": "3285bbda0aa0151c3b1914758e6950dfb554962f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "nixvim",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -469,11 +569,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741886583,
|
"lastModified": 1733773348,
|
||||||
"narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=",
|
"narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=",
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"repo": "search",
|
"repo": "search",
|
||||||
"rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467",
|
"rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -486,6 +586,7 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"lix-module": "lix-module",
|
"lix-module": "lix-module",
|
||||||
|
"niri": "niri",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixvim": "nixvim",
|
"nixvim": "nixvim",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
|
@ -499,11 +600,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742406979,
|
"lastModified": 1735468296,
|
||||||
"narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=",
|
"narHash": "sha256-ZjUjbvS06jf4fElOF4ve8EHjbpbRVHHypStoY8HGzk8=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609",
|
"rev": "bcb8b65aa596866eb7e5c3e1a6cccbf5d1560b27",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -518,29 +619,24 @@
|
||||||
"base16-fish": "base16-fish",
|
"base16-fish": "base16-fish",
|
||||||
"base16-helix": "base16-helix",
|
"base16-helix": "base16-helix",
|
||||||
"base16-vim": "base16-vim",
|
"base16-vim": "base16-vim",
|
||||||
"firefox-gnome-theme": "firefox-gnome-theme",
|
"flake-compat": "flake-compat_2",
|
||||||
"flake-compat": "flake-compat",
|
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_3",
|
||||||
"git-hooks": "git-hooks",
|
|
||||||
"gnome-shell": "gnome-shell",
|
"gnome-shell": "gnome-shell",
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_3",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"nur": "nur",
|
|
||||||
"systems": "systems_3",
|
"systems": "systems_3",
|
||||||
"tinted-foot": "tinted-foot",
|
"tinted-foot": "tinted-foot",
|
||||||
"tinted-kitty": "tinted-kitty",
|
"tinted-kitty": "tinted-kitty",
|
||||||
"tinted-schemes": "tinted-schemes",
|
"tinted-tmux": "tinted-tmux"
|
||||||
"tinted-tmux": "tinted-tmux",
|
|
||||||
"tinted-zed": "tinted-zed"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742496983,
|
"lastModified": 1735764504,
|
||||||
"narHash": "sha256-UpJrU0DEhNLVZwL/RPVOEUHCG6iDOVDoYelkmgS4V38=",
|
"narHash": "sha256-shMdOkQzR9jIK3TW6XaesOea1rHwxWIFFOhIRhuCF4Y=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "7e9906679d384472849272e5a5eef7adbdb1d87f",
|
"rev": "911c07f40f816fd2d12a7dd750ca8bc421db9dd2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -628,30 +724,14 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"tinted-schemes": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1741468895,
|
|
||||||
"narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=",
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "schemes",
|
|
||||||
"rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "schemes",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tinted-tmux": {
|
"tinted-tmux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740877430,
|
"lastModified": 1729501581,
|
||||||
"narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=",
|
"narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "tinted-tmux",
|
"repo": "tinted-tmux",
|
||||||
"rev": "d48ee86394cbe45b112ba23ab63e33656090edb4",
|
"rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -660,36 +740,19 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"tinted-zed": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1725758778,
|
|
||||||
"narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "base16-zed",
|
|
||||||
"rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "base16-zed",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"treefmt-nix": {
|
"treefmt-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"stylix",
|
"nixvim",
|
||||||
"nur",
|
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733222881,
|
"lastModified": 1735135567,
|
||||||
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
|
"narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
|
"rev": "9e09d30a644c57257715902efbb3adc56c79cf28",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -697,6 +760,39 @@
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"xwayland-satellite-stable": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1730166465,
|
||||||
|
"narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=",
|
||||||
|
"owner": "Supreeeme",
|
||||||
|
"repo": "xwayland-satellite",
|
||||||
|
"rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Supreeeme",
|
||||||
|
"ref": "v0.5",
|
||||||
|
"repo": "xwayland-satellite",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"xwayland-satellite-unstable": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1734745564,
|
||||||
|
"narHash": "sha256-JQNl4pqonVVPQ2JzEOLUcPVRNj//FFFNRDyvQoOkG7s=",
|
||||||
|
"owner": "Supreeeme",
|
||||||
|
"repo": "xwayland-satellite",
|
||||||
|
"rev": "94da1af75326d89ecb12aba0cc9362e93ffdc766",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Supreeeme",
|
||||||
|
"repo": "xwayland-satellite",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
25
flake.nix
25
flake.nix
|
@ -14,7 +14,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
lix-module = {
|
lix-module = {
|
||||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
|
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -33,6 +33,11 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
niri = {
|
||||||
|
url = "github:sodiboo/niri-flake";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
# secret-config = {
|
# secret-config = {
|
||||||
# url = "git+ssh://git@code.muhh.lol/muhh/nix-config-secret.git";
|
# url = "git+ssh://git@code.muhh.lol/muhh/nix-config-secret.git";
|
||||||
# flake = true;
|
# flake = true;
|
||||||
|
@ -47,6 +52,7 @@
|
||||||
sops-nix,
|
sops-nix,
|
||||||
stylix,
|
stylix,
|
||||||
nixvim,
|
nixvim,
|
||||||
|
niri,
|
||||||
# secret-config,
|
# secret-config,
|
||||||
...
|
...
|
||||||
} @ inputs: let
|
} @ inputs: let
|
||||||
|
@ -62,6 +68,12 @@
|
||||||
./hosts/cube.nix
|
./hosts/cube.nix
|
||||||
lix-module.nixosModules.default
|
lix-module.nixosModules.default
|
||||||
sops-nix.nixosModules.sops
|
sops-nix.nixosModules.sops
|
||||||
|
niri.nixosModules.niri
|
||||||
|
# {
|
||||||
|
# environment.systemPackages = [
|
||||||
|
# secret-config.packages.${system}.default
|
||||||
|
# ];
|
||||||
|
# }
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
muhhStar = lib.nixosSystem {
|
muhhStar = lib.nixosSystem {
|
||||||
|
@ -71,13 +83,6 @@
|
||||||
./hosts/muhhStar.nix
|
./hosts/muhhStar.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
ze = lib.nixosSystem {
|
|
||||||
inherit system;
|
|
||||||
modules = [
|
|
||||||
sops-nix.nixosModules.sops
|
|
||||||
./hosts/ze.nix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
homeConfigurations = {
|
homeConfigurations = {
|
||||||
|
@ -86,13 +91,15 @@
|
||||||
inherit system;
|
inherit system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
config.permittedInsecurePackages = [
|
config.permittedInsecurePackages = [
|
||||||
"electron-32.3.3"
|
"electron-25.9.0"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
nixvim.homeManagerModules.nixvim
|
nixvim.homeManagerModules.nixvim
|
||||||
sops-nix.homeManagerModules.sops
|
sops-nix.homeManagerModules.sops
|
||||||
stylix.homeManagerModules.stylix
|
stylix.homeManagerModules.stylix
|
||||||
|
niri.homeModules.niri
|
||||||
|
niri.homeModules.stylix
|
||||||
./home.nix
|
./home.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
40
home.nix
40
home.nix
|
@ -1,10 +1,5 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
|
||||||
modules/gnome
|
|
||||||
modules/sway
|
|
||||||
];
|
|
||||||
|
|
||||||
home = {
|
home = {
|
||||||
username = "muhh";
|
username = "muhh";
|
||||||
homeDirectory = "/home/muhh";
|
homeDirectory = "/home/muhh";
|
||||||
|
@ -26,19 +21,17 @@
|
||||||
devenv
|
devenv
|
||||||
distrobox
|
distrobox
|
||||||
# dog
|
# dog
|
||||||
|
downonspot
|
||||||
fastfetch
|
fastfetch
|
||||||
fd
|
fd
|
||||||
ffmpegthumbnailer
|
ffmpegthumbnailer
|
||||||
fuzzel
|
fuzzel
|
||||||
git
|
git
|
||||||
gurk-rs
|
|
||||||
heroku
|
heroku
|
||||||
htop
|
htop
|
||||||
httpie
|
httpie
|
||||||
jq
|
|
||||||
just
|
just
|
||||||
libreoffice
|
libreoffice
|
||||||
localsend
|
|
||||||
nerd-fonts.iosevka
|
nerd-fonts.iosevka
|
||||||
maid
|
maid
|
||||||
mediainfo
|
mediainfo
|
||||||
|
@ -290,6 +283,15 @@
|
||||||
highlight feedlist "^─.*$" color142 color234 bold
|
highlight feedlist "^─.*$" color142 color234 bold
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
niri = {
|
||||||
|
enable = true;
|
||||||
|
# settings = {
|
||||||
|
# environment = {
|
||||||
|
# "NIXOS_OZONE_WL" = "1";
|
||||||
|
# "QT_QPA_PLATFORM" = "wayland";
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
};
|
||||||
nixvim = {
|
nixvim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultEditor = true;
|
defaultEditor = true;
|
||||||
|
@ -349,7 +351,7 @@
|
||||||
{ name = "nvim-lsp"; }
|
{ name = "nvim-lsp"; }
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
# lualine.enable = true;
|
lualine.enable = true;
|
||||||
fidget.enable = true;
|
fidget.enable = true;
|
||||||
fugitive.enable = true;
|
fugitive.enable = true;
|
||||||
gitblame.enable = true;
|
gitblame.enable = true;
|
||||||
|
@ -364,17 +366,6 @@
|
||||||
yamlls.enable = true;
|
yamlls.enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
mini = {
|
|
||||||
enable = true;
|
|
||||||
mockDevIcons = true;
|
|
||||||
modules = {
|
|
||||||
|
|
||||||
files = {};
|
|
||||||
icons = {};
|
|
||||||
notify = {};
|
|
||||||
statusline = {};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
neogit.enable = true;
|
neogit.enable = true;
|
||||||
neo-tree = {
|
neo-tree = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -385,7 +376,7 @@
|
||||||
};
|
};
|
||||||
nix.enable = true;
|
nix.enable = true;
|
||||||
noice.enable = false;
|
noice.enable = false;
|
||||||
# notify.enable = false;
|
notify.enable = false;
|
||||||
nvim-autopairs.enable = true;
|
nvim-autopairs.enable = true;
|
||||||
obsidian = {
|
obsidian = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -418,7 +409,7 @@
|
||||||
indent.enable = true;
|
indent.enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# web-devicons.enable = true;
|
web-devicons.enable = true;
|
||||||
zen-mode.enable = true;
|
zen-mode.enable = true;
|
||||||
};
|
};
|
||||||
extraPlugins = with pkgs.vimPlugins; [
|
extraPlugins = with pkgs.vimPlugins; [
|
||||||
|
@ -708,11 +699,6 @@
|
||||||
wrapperFeatures.gtk = true;
|
wrapperFeatures.gtk = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# catppuccin = {
|
|
||||||
# enable = true;
|
|
||||||
# flavor = "mocha";
|
|
||||||
# };
|
|
||||||
|
|
||||||
xdg = {
|
xdg = {
|
||||||
enable = true;
|
enable = true;
|
||||||
mimeApps.enable = true;
|
mimeApps.enable = true;
|
||||||
|
|
|
@ -33,6 +33,11 @@
|
||||||
fsType = "xfs";
|
fsType = "xfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fileSystems."/storage/muhh" =
|
||||||
|
{ device = "/dev/disk/by-uuid/8b716713-359b-4bac-8951-a35405dccd4c";
|
||||||
|
fsType = "xfs";
|
||||||
|
};
|
||||||
|
|
||||||
swapDevices = [ ];
|
swapDevices = [ ];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, inputs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
|
@ -49,11 +49,6 @@
|
||||||
wheelNeedsPassword = false;
|
wheelNeedsPassword = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.avahi = {
|
|
||||||
enable = true;
|
|
||||||
nssmdns4 = true;
|
|
||||||
openFirewall = true;
|
|
||||||
};
|
|
||||||
services.envfs.enable = true;
|
services.envfs.enable = true;
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
services.fwupd.enable = true;
|
services.fwupd.enable = true;
|
||||||
|
@ -110,25 +105,20 @@
|
||||||
|
|
||||||
environment.shells = with pkgs; [ bash fish zsh ];
|
environment.shells = with pkgs; [ bash fish zsh ];
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
evolutionWithPlugins
|
|
||||||
git
|
git
|
||||||
home-manager
|
home-manager
|
||||||
mosh
|
mosh
|
||||||
toolbox
|
toolbox
|
||||||
vim
|
vim
|
||||||
wget
|
wget
|
||||||
# ] ++ [
|
|
||||||
# inputs.zen-browser.packages.x86_64-linux.default
|
|
||||||
];
|
];
|
||||||
|
|
||||||
fonts = {
|
fonts.packages = with pkgs; [
|
||||||
enableDefaultPackages = true;
|
|
||||||
packages = with pkgs; [
|
|
||||||
atkinson-hyperlegible
|
atkinson-hyperlegible
|
||||||
nerd-fonts.iosevka
|
iosevka
|
||||||
# secret-config.packages.x86_64-linux.default
|
# secret-config.packages.x86_64-linux.default
|
||||||
];
|
];
|
||||||
};
|
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
_1password.enable = true;
|
_1password.enable = true;
|
||||||
|
@ -146,6 +136,7 @@
|
||||||
brightnessKeys.enable = true;
|
brightnessKeys.enable = true;
|
||||||
};
|
};
|
||||||
hyprland.enable = true;
|
hyprland.enable = true;
|
||||||
|
niri.enable = true;
|
||||||
sway.enable = true;
|
sway.enable = true;
|
||||||
# ssh = {
|
# ssh = {
|
||||||
# pubkeyAcceptedKeyTypes = ["ssh-ed25519" "ssh-rsa"];
|
# pubkeyAcceptedKeyTypes = ["ssh-ed25519" "ssh-rsa"];
|
||||||
|
@ -153,12 +144,12 @@
|
||||||
# };
|
# };
|
||||||
};
|
};
|
||||||
virtualisation = {
|
virtualisation = {
|
||||||
docker.enable = false;
|
docker.enable = true;
|
||||||
libvirtd = {
|
libvirtd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
podman = {
|
podman = {
|
||||||
enable = true;
|
enable = false;
|
||||||
dockerCompat = true;
|
dockerCompat = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
{ modulesPath, ... }:
|
|
||||||
{
|
|
||||||
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
|
|
||||||
boot.loader.grub.device = "/dev/sda";
|
|
||||||
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
|
|
||||||
boot.initrd.kernelModules = [ "nvme" ];
|
|
||||||
fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; };
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,33 +0,0 @@
|
||||||
{ lib, ... }: {
|
|
||||||
# This file was populated at runtime with the networking
|
|
||||||
# details gathered from the active system.
|
|
||||||
networking = {
|
|
||||||
nameservers = [ "8.8.8.8"
|
|
||||||
];
|
|
||||||
defaultGateway = "172.31.1.1";
|
|
||||||
defaultGateway6 = {
|
|
||||||
address = "fe80::1";
|
|
||||||
interface = "eth0";
|
|
||||||
};
|
|
||||||
dhcpcd.enable = false;
|
|
||||||
usePredictableInterfaceNames = lib.mkForce false;
|
|
||||||
interfaces = {
|
|
||||||
eth0 = {
|
|
||||||
ipv4.addresses = [
|
|
||||||
{ address="188.34.164.224"; prefixLength=32; }
|
|
||||||
];
|
|
||||||
ipv6.addresses = [
|
|
||||||
{ address="2a01:4f8:c013:2152::1"; prefixLength=64; }
|
|
||||||
{ address="fe80::9400:3ff:fe70:5f0d"; prefixLength=64; }
|
|
||||||
];
|
|
||||||
ipv4.routes = [ { address = "172.31.1.1"; prefixLength = 32; } ];
|
|
||||||
ipv6.routes = [ { address = "fe80::1"; prefixLength = 128; } ];
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
};
|
|
||||||
services.udev.extraRules = ''
|
|
||||||
ATTR{address}=="96:00:03:70:5f:0d", NAME="eth0"
|
|
||||||
|
|
||||||
'';
|
|
||||||
}
|
|
103
hosts/ze.nix
103
hosts/ze.nix
|
@ -1,103 +0,0 @@
|
||||||
{ config, pkgs, inputs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports =
|
|
||||||
[
|
|
||||||
./ze-hardware-configuration.nix
|
|
||||||
./ze-networking.nix
|
|
||||||
./common.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
networking.hostName = "ze"; # Define your hostname.
|
|
||||||
|
|
||||||
# Configure network proxy if necessary
|
|
||||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
|
||||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
|
||||||
|
|
||||||
# Enable networking
|
|
||||||
networking.networkmanager.enable = true;
|
|
||||||
|
|
||||||
networking.hosts = {
|
|
||||||
# "178.63.121.197" = ["www.boell.de"];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Workaround for broken networkmanager/systemd thing
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/180175#issuecomment-1658731959
|
|
||||||
systemd.services.NetworkManager-wait-online = {
|
|
||||||
serviceConfig = {
|
|
||||||
ExecStart = [ "" "${pkgs.networkmanager}/bin/nm-online -q" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
security = {
|
|
||||||
sudo = {
|
|
||||||
wheelNeedsPassword = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
services.openssh = {
|
|
||||||
enable = true;
|
|
||||||
settings.PasswordAuthentication = true;
|
|
||||||
settings.PubkeyAuthentication = true;
|
|
||||||
};
|
|
||||||
services.tailscale = {
|
|
||||||
enable = true;
|
|
||||||
authKeyFile = config.sops.secrets.tailscale_auth_key.path;
|
|
||||||
};
|
|
||||||
|
|
||||||
sops.defaultSopsFile = ../secrets/secrets.yaml;
|
|
||||||
sops.age.keyFile = "/home/muhh/.config/sops/age/keys.txt";
|
|
||||||
sops.secrets.tailscale_auth_key = {};
|
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
|
||||||
users.users.muhh = {
|
|
||||||
isNormalUser = true;
|
|
||||||
name = "muhh";
|
|
||||||
description = "Markus Heurung";
|
|
||||||
extraGroups = [ "audio" "docker" "libvirtd" "input" "networkmanager" "plugdev" "qemu-libvirtd" "video" "wheel"];
|
|
||||||
shell = pkgs.fish;
|
|
||||||
linger = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
nixpkgs.config = {
|
|
||||||
allowUnfree = true;
|
|
||||||
allowUnfreePredicate = pkg: true;
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.shells = with pkgs; [ bash fish zsh ];
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
git
|
|
||||||
home-manager
|
|
||||||
mosh
|
|
||||||
neovim
|
|
||||||
vim
|
|
||||||
wget
|
|
||||||
];
|
|
||||||
|
|
||||||
programs = {
|
|
||||||
fish.enable = true;
|
|
||||||
};
|
|
||||||
virtualisation = {
|
|
||||||
docker.enable = false;
|
|
||||||
libvirtd = {
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
podman = {
|
|
||||||
enable = true;
|
|
||||||
dockerCompat = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Open ports in the firewall.
|
|
||||||
# FIREWALL IS ENABLED BY DEFAULT - muhh
|
|
||||||
# networking.firewall.allowedTCPPorts = [ 19132 ];
|
|
||||||
# networking.firewall.allowedUDPPorts = [ 19132 ];
|
|
||||||
# Or disable the firewall altogether.
|
|
||||||
# networking.firewall.enable = false;
|
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
|
||||||
# settings for stateful data, like file locations and database versions
|
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
|
||||||
# this value at the release version of the first install of this system.
|
|
||||||
# Before changing this value read the documentation for this option
|
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
|
||||||
system.stateVersion = "23.11"; # Did you read the comment?
|
|
||||||
}
|
|
|
@ -1,2 +0,0 @@
|
||||||
{
|
|
||||||
}
|
|
|
@ -1,272 +0,0 @@
|
||||||
{
|
|
||||||
programs.niri = {
|
|
||||||
enable = true;
|
|
||||||
|
|
||||||
settings = {
|
|
||||||
environment = {
|
|
||||||
"NIXOS_OZONE_WL" = "1";
|
|
||||||
"QT_QPA_PLATFORM" = "wayland";
|
|
||||||
};
|
|
||||||
binds = {
|
|
||||||
# Keys consist of modifiers separated by + signs, followed by an XKB key name
|
|
||||||
# in the end. To find an XKB name for a particular key, you may use a program
|
|
||||||
# like wev.
|
|
||||||
#
|
|
||||||
# "Mod" is a special modifier equal to Super when running on a TTY, and to Alt
|
|
||||||
# when running as a winit window.
|
|
||||||
#
|
|
||||||
# Most actions that you can bind here can also be invoked programmatically with
|
|
||||||
# `niri msg action do-something`.
|
|
||||||
|
|
||||||
# Mod-Shift-/, which is usually the same as Mod-?,
|
|
||||||
# shows a list of important hotkeys.
|
|
||||||
"Mod+Shift+Slash".action.show-hotkey-overlay = {};
|
|
||||||
|
|
||||||
# Suggested binds for running programs: terminal, app launcher, screen locker.
|
|
||||||
"Mod+T".action.spawn = "alacritty";
|
|
||||||
"Mod+D".action.spawn = "fuzzel";
|
|
||||||
"Super+Alt+L".action.spawn = "swaylock";
|
|
||||||
|
|
||||||
# You can also use a shell. Do this if you need pipes, multiple commands, etc.
|
|
||||||
# Note: the entire command goes as a single argument in the end.
|
|
||||||
# Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; }
|
|
||||||
|
|
||||||
# Example volume keys mappings for PipeWire & WirePlumber.
|
|
||||||
# The allow-when-locked=true property makes them work even when the session is locked.
|
|
||||||
"XF86AudioRaiseVolume" = {
|
|
||||||
allow-when-locked = true;
|
|
||||||
action.spawn = [ "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+" ];
|
|
||||||
};
|
|
||||||
"XF86AudioLowerVolume" = {
|
|
||||||
allow-when-locked = true;
|
|
||||||
action.spawn = ["wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"];
|
|
||||||
};
|
|
||||||
"XF86AudioMute" = {
|
|
||||||
allow-when-locked = true;
|
|
||||||
action.spawn = [ "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle" ];
|
|
||||||
};
|
|
||||||
"XF86AudioMicMute" = {
|
|
||||||
allow-when-locked = true;
|
|
||||||
action.spawn = [ "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
"Mod+Q".action.close-window = {};
|
|
||||||
|
|
||||||
"Mod+Left".action.focus-column-left = {};
|
|
||||||
"Mod+Down".action.focus-window-down = {};
|
|
||||||
"Mod+Up".action.focus-window-up = {};
|
|
||||||
"Mod+Right".action.focus-column-right = {};
|
|
||||||
"Mod+H".action.focus-column-left = {};
|
|
||||||
"Mod+J".action.focus-window-down = {};
|
|
||||||
"Mod+K".action.focus-window-up = {};
|
|
||||||
"Mod+L".action.focus-column-right = {};
|
|
||||||
|
|
||||||
"Mod+Ctrl+Left".action.move-column-left = {};
|
|
||||||
"Mod+Ctrl+Down".action.move-window-down = {};
|
|
||||||
"Mod+Ctrl+Up".action.move-window-up = {};
|
|
||||||
"Mod+Ctrl+Right".action.move-column-right = {};
|
|
||||||
"Mod+Ctrl+H".action.move-column-left = {};
|
|
||||||
"Mod+Ctrl+J".action.move-window-down = {};
|
|
||||||
"Mod+Ctrl+K".action.move-window-up = {};
|
|
||||||
"Mod+Ctrl+L".action.move-column-right = {};
|
|
||||||
|
|
||||||
# Alternative commands that move across workspaces when reaching
|
|
||||||
# the first or last window in a column.
|
|
||||||
# Mod+J { focus-window-or-workspace-down; }
|
|
||||||
# Mod+K { focus-window-or-workspace-up; }
|
|
||||||
# Mod+Ctrl+J { move-window-down-or-to-workspace-down; }
|
|
||||||
# Mod+Ctrl+K { move-window-up-or-to-workspace-up; }
|
|
||||||
|
|
||||||
"Mod+Home".action.focus-column-first = {};
|
|
||||||
"Mod+End".action.focus-column-last = {};
|
|
||||||
"Mod+Ctrl+Home".action.move-column-to-first = {};
|
|
||||||
"Mod+Ctrl+End".action.move-column-to-last = {};
|
|
||||||
|
|
||||||
"Mod+Shift+Left".action.focus-monitor-left = {};
|
|
||||||
"Mod+Shift+Down".action.focus-monitor-down = {};
|
|
||||||
"Mod+Shift+Up".action.focus-monitor-up = {};
|
|
||||||
"Mod+Shift+Right".action.focus-monitor-right = {};
|
|
||||||
"Mod+Shift+H".action.focus-monitor-left = {};
|
|
||||||
"Mod+Shift+J".action.focus-monitor-down = {};
|
|
||||||
"Mod+Shift+K".action.focus-monitor-up = {};
|
|
||||||
"Mod+Shift+L".action.focus-monitor-right = {};
|
|
||||||
|
|
||||||
"Mod+Shift+Ctrl+Left".action.move-column-to-monitor-left = {};
|
|
||||||
"Mod+Shift+Ctrl+Down".action.move-column-to-monitor-down = {};
|
|
||||||
"Mod+Shift+Ctrl+Up".action.move-column-to-monitor-up = {};
|
|
||||||
"Mod+Shift+Ctrl+Right".action.move-column-to-monitor-right = {};
|
|
||||||
"Mod+Shift+Ctrl+H".action.move-column-to-monitor-left = {};
|
|
||||||
"Mod+Shift+Ctrl+J".action.move-column-to-monitor-down = {};
|
|
||||||
"Mod+Shift+Ctrl+K".action.move-column-to-monitor-up = {};
|
|
||||||
"Mod+Shift+Ctrl+L".action.move-column-to-monitor-right = {};
|
|
||||||
|
|
||||||
# Alternatively, there are commands to move just a single window:
|
|
||||||
# Mod+Shift+Ctrl+Left { move-window-to-monitor-left; }
|
|
||||||
# ...
|
|
||||||
|
|
||||||
# And you can also move a whole workspace to another monitor:
|
|
||||||
# Mod+Shift+Ctrl+Left { move-workspace-to-monitor-left; }
|
|
||||||
# ...
|
|
||||||
|
|
||||||
"Mod+Page_Down".action.focus-workspace-down = {};
|
|
||||||
"Mod+Page_Up".action.focus-workspace-up = {};
|
|
||||||
"Mod+U".action.focus-workspace-down = {};
|
|
||||||
"Mod+I".action.focus-workspace-up = {};
|
|
||||||
"Mod+Ctrl+Page_Down".action.move-column-to-workspace-down = {};
|
|
||||||
"Mod+Ctrl+Page_Up".action.move-column-to-workspace-up = {};
|
|
||||||
"Mod+Ctrl+U".action.move-column-to-workspace-down = {};
|
|
||||||
"Mod+Ctrl+I".action.move-column-to-workspace-up = {};
|
|
||||||
|
|
||||||
# Alternatively, there are commands to move just a single window:
|
|
||||||
# Mod+Ctrl+Page_Down { move-window-to-workspace-down; }
|
|
||||||
# ...
|
|
||||||
|
|
||||||
"Mod+Shift+Page_Down".action.move-workspace-down = {};
|
|
||||||
"Mod+Shift+Page_Up".action.move-workspace-up = {};
|
|
||||||
"Mod+Shift+U".action.move-workspace-down = {};
|
|
||||||
"Mod+Shift+I".action.move-workspace-up = {};
|
|
||||||
|
|
||||||
# You can bind mouse wheel scroll ticks using the following syntax.
|
|
||||||
# These binds will change direction based on the natural-scroll setting.
|
|
||||||
#
|
|
||||||
# To avoid scrolling through workspaces really fast, you can use
|
|
||||||
# the cooldown-ms property. The bind will be rate-limited to this value.
|
|
||||||
# You can set a cooldown on any bind, but it's most useful for the wheel.
|
|
||||||
"Mod+WheelScrollDown" = {
|
|
||||||
cooldown-ms = 150;
|
|
||||||
action.focus-workspace-down = {};
|
|
||||||
};
|
|
||||||
"Mod+WheelScrollUp" = {
|
|
||||||
cooldown-ms = 150;
|
|
||||||
action.focus-workspace-up = {};
|
|
||||||
};
|
|
||||||
"Mod+Ctrl+WheelScrollDown" = {
|
|
||||||
cooldown-ms = 150;
|
|
||||||
action.move-column-to-workspace-down = {};
|
|
||||||
};
|
|
||||||
"Mod+Ctrl+WheelScrollUp" = {
|
|
||||||
cooldown-ms = 150;
|
|
||||||
action.move-column-to-workspace-up = {};
|
|
||||||
};
|
|
||||||
|
|
||||||
"Mod+WheelScrollRight".action.focus-column-right = {};
|
|
||||||
"Mod+WheelScrollLeft".action.focus-column-left = {};
|
|
||||||
"Mod+Ctrl+WheelScrollRight".action.move-column-right = {};
|
|
||||||
"Mod+Ctrl+WheelScrollLeft".action.move-column-left = {};
|
|
||||||
|
|
||||||
# Usually scrolling up and down with Shift in applications results in
|
|
||||||
# horizontal scrolling; these binds replicate that.
|
|
||||||
"Mod+Shift+WheelScrollDown".action.focus-column-right = {};
|
|
||||||
"Mod+Shift+WheelScrollUp".action.focus-column-left = {};
|
|
||||||
"Mod+Ctrl+Shift+WheelScrollDown".action.move-column-right = {};
|
|
||||||
"Mod+Ctrl+Shift+WheelScrollUp".action.move-column-left = {};
|
|
||||||
|
|
||||||
# Similarly, you can bind touchpad scroll "ticks".
|
|
||||||
# Touchpad scrolling is continuous, so for these binds it is split into
|
|
||||||
# discrete intervals.
|
|
||||||
# These binds are also affected by touchpad's natural-scroll, so these
|
|
||||||
# example binds are "inverted", since we have natural-scroll enabled for
|
|
||||||
# touchpads by default.
|
|
||||||
# Mod+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; }
|
|
||||||
# Mod+TouchpadScrollUp { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; }
|
|
||||||
|
|
||||||
# You can refer to workspaces by index. However, keep in mind that
|
|
||||||
# niri is a dynamic workspace system, so these commands are kind of
|
|
||||||
# "best effort". Trying to refer to a workspace index bigger than
|
|
||||||
# the current workspace count will instead refer to the bottommost
|
|
||||||
# (empty) workspace.
|
|
||||||
#
|
|
||||||
# For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on
|
|
||||||
# will all refer to the 3rd workspace.
|
|
||||||
"Mod+1".action.focus-workspace = 1;
|
|
||||||
"Mod+2".action.focus-workspace = 2;
|
|
||||||
"Mod+3".action.focus-workspace = 3;
|
|
||||||
"Mod+4".action.focus-workspace = 4;
|
|
||||||
"Mod+5".action.focus-workspace = 5;
|
|
||||||
"Mod+6".action.focus-workspace = 6;
|
|
||||||
"Mod+7".action.focus-workspace = 7;
|
|
||||||
"Mod+8".action.focus-workspace = 8;
|
|
||||||
"Mod+9".action.focus-workspace = 9;
|
|
||||||
"Mod+Ctrl+1".action.move-column-to-workspace = 1;
|
|
||||||
"Mod+Ctrl+2".action.move-column-to-workspace = 2;
|
|
||||||
"Mod+Ctrl+3".action.move-column-to-workspace = 3;
|
|
||||||
"Mod+Ctrl+4".action.move-column-to-workspace = 4;
|
|
||||||
"Mod+Ctrl+5".action.move-column-to-workspace = 5;
|
|
||||||
"Mod+Ctrl+6".action.move-column-to-workspace = 6;
|
|
||||||
"Mod+Ctrl+7".action.move-column-to-workspace = 7;
|
|
||||||
"Mod+Ctrl+8".action.move-column-to-workspace = 8;
|
|
||||||
"Mod+Ctrl+9".action.move-column-to-workspace = 9;
|
|
||||||
|
|
||||||
# Alternatively, there are commands to move just a single window:
|
|
||||||
# Mod+Ctrl+1 { move-window-to-workspace 1; }
|
|
||||||
|
|
||||||
# Switches focus between the current and the previous workspace.
|
|
||||||
# Mod+Tab { focus-workspace-previous; }
|
|
||||||
|
|
||||||
"Mod+Comma".action.consume-window-into-column = {};
|
|
||||||
"Mod+Period".action.expel-window-from-column = {};
|
|
||||||
|
|
||||||
# There are also commands that consume or expel a single window to the side.
|
|
||||||
# Mod+BracketLeft { consume-or-expel-window-left; }
|
|
||||||
# Mod+BracketRight { consume-or-expel-window-right; }
|
|
||||||
|
|
||||||
"Mod+R".action.switch-preset-column-width = {};
|
|
||||||
"Mod+Shift+R".action.reset-window-height = {};
|
|
||||||
"Mod+F".action.maximize-column = {};
|
|
||||||
"Mod+Shift+F".action.fullscreen-window = {};
|
|
||||||
"Mod+C".action.center-column = {};
|
|
||||||
|
|
||||||
# Finer width adjustments.
|
|
||||||
# This command can also:
|
|
||||||
# * set width in pixels: "1000"
|
|
||||||
# * adjust width in pixels: "-5" or "+5"
|
|
||||||
# * set width as a percentage of screen width: "25%"
|
|
||||||
# * adjust width as a percentage of screen width: "-10%" or "+10%"
|
|
||||||
# Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0,
|
|
||||||
# set-column-width "100" will make the column occupy 200 physical screen pixels.
|
|
||||||
"Mod+Minus".action.set-column-width = "-10%";
|
|
||||||
"Mod+Equal".action.set-column-width = "+10%";
|
|
||||||
|
|
||||||
# Finer height adjustments when in column with other windows.
|
|
||||||
"Mod+Shift+Minus".action.set-window-height = "-10%";
|
|
||||||
"Mod+Shift+Equal".action.set-window-height = "+10%";
|
|
||||||
|
|
||||||
# Actions to switch layouts.
|
|
||||||
# Note: if you uncomment these, make sure you do NOT have
|
|
||||||
# a matching layout switch hotkey configured in xkb options above.
|
|
||||||
# Having both at once on the same hotkey will break the switching,
|
|
||||||
# since it will switch twice upon pressing the hotkey (once by xkb, once by niri).
|
|
||||||
# Mod+Space { switch-layout "next"; }
|
|
||||||
# Mod+Shift+Space { switch-layout "prev"; }
|
|
||||||
|
|
||||||
"Print".action.screenshot = {};
|
|
||||||
"Ctrl+Print".action.screenshot-screen = {};
|
|
||||||
"Alt+Print".action.screenshot-window = {};
|
|
||||||
|
|
||||||
# The quit action will show a confirmation dialog to avoid accidental exits.
|
|
||||||
"Mod+Shift+E".action.quit = {};
|
|
||||||
|
|
||||||
# Powers off the monitors. To turn them back on, do any input like
|
|
||||||
# moving the mouse or pressing any other key.
|
|
||||||
"Mod+Shift+P".action.power-off-monitors = {};
|
|
||||||
};
|
|
||||||
input = {
|
|
||||||
focus-follows-mouse = {
|
|
||||||
enable = true;
|
|
||||||
max-scroll-amount = null;
|
|
||||||
};
|
|
||||||
keyboard.xkb = {
|
|
||||||
layout = "eu";
|
|
||||||
options = "compose:rwin";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
outputs = {
|
|
||||||
"HDMI-A-1" = {
|
|
||||||
transform = {
|
|
||||||
flipped = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue