AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update flake and some machines config

Browse Source
This commit is contained in:
Dmitriy Kholkin 2023-01-26 00:32:35 +03:00
parent 70bb8ca1ec
commit 94d1170bef
8 changed files with 326 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

529
flake.lock generated
View File

@ -24,14 +24,31 @@
"type": "github"
}
},
"all-cabal-json": {
"flake": false,
"locked": {
"lastModified": 1665552503,
"narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=",
"owner": "nix-community",
"repo": "all-cabal-json",
"rev": "d7c0434eebffb305071404edcf9d5cd99703878e",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "hackage",
"repo": "all-cabal-json",
"type": "github"
}
},
"arkenfox-userjs": {
"flake": false,
"locked": {
"lastModified": 1670266131,
"narHash": "sha256-hf+fLTT67YWJPTkKgLxyP6KRAhiCaxuGY7GLltTyZvc=",
"lastModified": 1673196505,
"narHash": "sha256-YsQbH6bqp2I52meYf0X0DQpwLlDdu5pK9XHMT/9RqOg=",
"owner": "arkenfox",
"repo": "user.js",
"rev": "e4a85c30c129cf664cc8a39705bb070fce828d33",
"rev": "62a68f08147123b0c2c288ffdecc3f03e4ab1ae8",
"type": "github"
},
"original": {
@ -101,11 +118,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1669471061,
"narHash": "sha256-7FdhCbyPB0ajZP/piWjyhd4bwHc9TZifY8htOjsmxt8=",
"lastModified": 1670543350,
"narHash": "sha256-JMYwGa2nJPInuVuYbR3XSGUJewTDyeoTDQaALydduko=",
"owner": "nix-community",
"repo": "comma",
"rev": "48b723b201e94958a29a35e4f64bb4391fe73464",
"rev": "1b07c19774129ebce3af846fb571e1c0b97f24a3",
"type": "github"
},
"original": {
@ -117,11 +134,11 @@
"crane": {
"flake": false,
"locked": {
"lastModified": 1661875961,
"narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=",
"lastModified": 1670284777,
"narHash": "sha256-JF0pc0s4z/X+Iy+lNHOwUQ8I5bz+q7uX4HrKTNIEj24=",
"owner": "ipetkov",
"repo": "crane",
"rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24",
"rev": "2243fb9c872de25cb564a02d324ea6a5b9853052",
"type": "github"
},
"original": {
@ -139,11 +156,11 @@
"utils": "utils_2"
},
"locked": {
"lastModified": 1668797197,
"narHash": "sha256-0w6iD3GSSQbIeSFVDzAAQZB+hDq670ZTms3d9XI+BtM=",
"lastModified": 1672327199,
"narHash": "sha256-pFlngSHXKBhAmbaKZ4FYtu57LLunG+vWdL7a5vw1RvQ=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "2a3c5f70eee04a465aa534d8bd4fcc9bb3c4a8ce",
"rev": "a5619f5660a00f58c2b7c16d89058e92327ac9b8",
"type": "github"
},
"original": {
@ -153,38 +170,13 @@
}
},
"devshell": {
"inputs": {
"flake-utils": [
"direnv-vscode",
"flake-utils"
],
"nixpkgs": [
"direnv-vscode",
"nixpkgs"
]
},
"locked": {
"lastModified": 1667210711,
"narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=",
"owner": "numtide",
"repo": "devshell",
"rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"devshell_2": {
"flake": false,
"locked": {
"lastModified": 1653917170,
"narHash": "sha256-FyxOnEE/V4PNEcMU62ikY4FfYPo349MOhMM97HS0XEo=",
"lastModified": 1663445644,
"narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=",
"owner": "numtide",
"repo": "devshell",
"rev": "fc7a3e3adde9bbcab68af6d1e3c6eb738e296a92",
"rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66",
"type": "github"
},
"original": {
@ -193,37 +185,18 @@
"type": "github"
}
},
"direnv-vscode": {
"inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1670423628,
"narHash": "sha256-LSoXnDx8j9XC3aqT5RNW+Uj8SebuxqUo1eFnOKC6t1U=",
"owner": "direnv",
"repo": "direnv-vscode",
"rev": "750a141decd7dc982f00b429cd639bee644495c2",
"type": "github"
},
"original": {
"owner": "direnv",
"repo": "direnv-vscode",
"type": "github"
}
},
"dream2nix": {
"inputs": {
"alejandra": "alejandra",
"all-cabal-json": "all-cabal-json",
"crane": "crane",
"devshell": "devshell_2",
"devshell": "devshell",
"flake-parts": "flake-parts_2",
"flake-utils-pre-commit": "flake-utils-pre-commit",
"ghc-utils": "ghc-utils",
"gomod2nix": "gomod2nix",
"mach-nix": "mach-nix",
"nix-pypi-fetcher": "nix-pypi-fetcher",
"nixpkgs": [
"webcord",
"nixpkgs"
@ -232,11 +205,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1664882193,
"narHash": "sha256-uiAYOxN/M4dpaB6ieY3xOvOH6XgHP9NVXDTzSRa3pMc=",
"lastModified": 1670715183,
"narHash": "sha256-l3OhVCCimrN1HFPfqfKAyzuMuPxNXZYLsI9w7AaQXv8=",
"owner": "nix-community",
"repo": "dream2nix",
"rev": "785b76894263fd76a0e69955e4cd990b7b735bdf",
"rev": "3d6f13ef9d4cb8c41bc83383bbec3e74865ef90d",
"type": "github"
},
"original": {
@ -288,11 +261,11 @@
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1648199409,
"narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"type": "github"
},
"original": {
@ -349,6 +322,46 @@
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nixpkgs-wayland",
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1673047662,
"narHash": "sha256-dXYxH/0Ea5oQSkGAWWNy7HzmFutguycDGn2dt6lTYRQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "aa1f6ca773b6e740037ebfb35f7010e0c3960638",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1668450977,
"narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-registry": {
"flake": false,
"locked": {
@ -400,7 +413,7 @@
},
"flake-utils-plus_2": {
"inputs": {
"flake-utils": "flake-utils_3"
"flake-utils": "flake-utils_2"
},
"locked": {
"lastModified": 1666080932,
@ -433,11 +446,11 @@
},
"flake-utils_2": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
@ -448,11 +461,11 @@
},
"flake-utils_3": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
@ -477,21 +490,6 @@
}
},
"flake-utils_5": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_6": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -506,22 +504,7 @@
"type": "github"
}
},
"flake-utils_7": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_8": {
"flake-utils_6": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -552,6 +535,22 @@
"type": "github"
}
},
"ghc-utils": {
"flake": false,
"locked": {
"lastModified": 1662774800,
"narHash": "sha256-1Rd2eohGUw/s1tfvkepeYpg8kCEXiIot0RijapUjAkE=",
"ref": "refs/heads/master",
"rev": "bb3a2d3dc52ff0253fb9c2812bd7aa2da03e0fea",
"revCount": 1072,
"type": "git",
"url": "https://gitlab.haskell.org/bgamari/ghc-utils"
},
"original": {
"type": "git",
"url": "https://gitlab.haskell.org/bgamari/ghc-utils"
}
},
"gomod2nix": {
"flake": false,
"locked": {
@ -576,11 +575,11 @@
"utils": "utils_3"
},
"locked": {
"lastModified": 1670280307,
"narHash": "sha256-3x+0whP1nCz5adQMIsBA3L9fI/ABOpRUJdbw0AmxBnU=",
"lastModified": 1673343300,
"narHash": "sha256-5Xdj6kpXYMie0MlnGwqK5FaMdsedxvyuakWtyKB3zaQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2af0d07678fc15612345e0dd55337550dcf6465f",
"rev": "176e455371a8371586e8a3ff0d56ee9f3ca2324e",
"type": "github"
},
"original": {
@ -592,18 +591,16 @@
"hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs": "nixpkgs_2",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1670429324,
"narHash": "sha256-kazSw0F59iM3bVtwO5LN5zg6dr2LVNB3GevPmzb2vTs=",
"lastModified": 1673460918,
"narHash": "sha256-vL9AhYPCMP1/8va2pdmLn0vmCdsxbgYSSQHm4kaQjHs=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "73b3bbe49bf5a059df688b389aba7f947f62626c",
"rev": "11afb660102198abb1e74fffdffd00f8c1a11cd9",
"type": "github"
},
"original": {
@ -613,13 +610,18 @@
}
},
"hyprland-protocols": {
"flake": false,
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1670258048,
"narHash": "sha256-Lm2sXnDVZNE+taHqsqVibvPmSdu65VHvXI507KVX4lg=",
"lastModified": 1671839510,
"narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "0dcff94fc10df2bbb66d3e1b5a1d6cfd3ada5515",
"rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75",
"type": "github"
},
"original": {
@ -628,19 +630,23 @@
"type": "github"
}
},
"hyprland-protocols_2": {
"flake": false,
"hyprpaper": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1670185345,
"narHash": "sha256-hxWGqlPecqEsE6nOHDV29KFBKePbY2Ipeac6lrChMKY=",
"lastModified": 1672925969,
"narHash": "sha256-d94BZH6gJ6s3GmudyKc4XleARpLnYkxhxa6YMb7yKAw=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "4623a404c091e64743ba310199bb380ec52f1936",
"repo": "hyprpaper",
"rev": "50852e531987d20c432122fbec7f1f089bc2dc09",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"repo": "hyprpaper",
"type": "github"
}
},
@ -661,15 +667,15 @@
},
"lib-aggregate": {
"inputs": {
"flake-utils": "flake-utils_7",
"flake-utils": "flake-utils_6",
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1670155750,
"narHash": "sha256-42o7/LiCRPUd2eCnN576a973NfWcBrqURMTlKkOJafc=",
"lastModified": 1673179716,
"narHash": "sha256-nW+mwtAlEddI20ODyheHzDARROn3Hv0UmXx4gU0KCbw=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "c0f784c05c85422cd7d532fd1a630ba5e8f2348f",
"rev": "737b962c5fb6150d11f88a247016df72df8d23d9",
"type": "github"
},
"original": {
@ -755,15 +761,15 @@
"nix": {
"inputs": {
"lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_3",
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1670428938,
"narHash": "sha256-1oeFMXsBtJuBCoBmGrUXkRfyek+DfRMbaFC/euTlMIg=",
"lastModified": 1673443847,
"narHash": "sha256-w7+PgQmfM2y7hsoI1JJ1rWGLo1bNY3+CXE+rii9oT/8=",
"owner": "nixos",
"repo": "nix",
"rev": "5dce1a5af6ffd911657ee1be2403a4f694c67477",
"rev": "6dd8b3b4122d9a4dccf17c00a290349a1509a7d6",
"type": "github"
},
"original": {
@ -774,17 +780,17 @@
},
"nix-alien": {
"inputs": {
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1668504894,
"narHash": "sha256-Q/URqJtTONNEoVfat+UMZq8rl7MvMwLEKF1uPFQm/cs=",
"lastModified": 1672257991,
"narHash": "sha256-y8PXQLfbHqutORvr4VutOhxAAlx3rVT/Bcnvv8nS76E=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "ec6dabeaddecab75794bfa1070989371b2636b70",
"rev": "967735b1f9bdc12f24e7b1ac336e499d12896988",
"type": "github"
},
"original": {
@ -795,15 +801,15 @@
},
"nix-direnv": {
"inputs": {
"flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_3"
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1670247922,
"narHash": "sha256-8CsdoO/59ddJxS6cI/N0CTP5hno5tSWEglQofMLO5mM=",
"lastModified": 1673283879,
"narHash": "sha256-PvTmnoHHcPCw5ipoRNC49Ze9WVvy5oX0OXgNbgaVoiA=",
"owner": "nix-community",
"repo": "nix-direnv",
"rev": "22b5729f266a6d59746fdb12eb3303bb2de63896",
"rev": "32bf26a499b96eb4b2d2a3e2a3219ebff9971b3b",
"type": "github"
},
"original": {
@ -814,18 +820,18 @@
},
"nix-eval-jobs": {
"inputs": {
"flake-utils": "flake-utils_8",
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs-wayland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1670203340,
"narHash": "sha256-kX8j5g09zRoSt1o53/hrGpBx8ZtRh7bqStH5b9V+ZcA=",
"lastModified": 1673227333,
"narHash": "sha256-z24lgjWp0eVtAX6Ds1rM7gVfvghciNXj5IlQZQm5Fto=",
"owner": "nix-community",
"repo": "nix-eval-jobs",
"rev": "100600c810b2d02de97675dd4911f98923152fc5",
"rev": "8124ed466c3a8727875cef773aaa8df0b01e1cdd",
"type": "github"
},
"original": {
@ -834,22 +840,38 @@
"type": "github"
}
},
"nix-vscode-marketplace": {
"inputs": {
"flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_4"
},
"nix-pypi-fetcher": {
"flake": false,
"locked": {
"lastModified": 1670395808,
"narHash": "sha256-GQcqf7gNlFCL9wHSAzepAA3VPHshVksk6HxyhLN1hvo=",
"owner": "AmeerTaweel",
"repo": "nix-vscode-marketplace",
"rev": "5b773331aead58a0563b8b956dd2459d4a575982",
"lastModified": 1669065297,
"narHash": "sha256-UStjXjNIuIm7SzMOWvuYWIHBkPUKQ8Id63BMJjnIDoA=",
"owner": "DavHau",
"repo": "nix-pypi-fetcher",
"rev": "a9885ac6a091576b5195d547ac743d45a2a615ac",
"type": "github"
},
"original": {
"owner": "AmeerTaweel",
"repo": "nix-vscode-marketplace",
"owner": "DavHau",
"repo": "nix-pypi-fetcher",
"type": "github"
}
},
"nix-vscode-marketplace": {
"inputs": {
"flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1674178250,
"narHash": "sha256-Z8f0kiDXq9SFgfF2cRjWO04AI87/2ZVXA28uoAwHEXY=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "365027ba04e67b6790a895e6960c260e1a61fc00",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"type": "github"
}
},
@ -876,11 +898,11 @@
]
},
"locked": {
"lastModified": 1669065280,
"narHash": "sha256-3+pq1oJWjGDLfd8G/vR3IIFZ+EQ/aglukA0bTiMlf3o=",
"lastModified": 1672682641,
"narHash": "sha256-940TLvtdT8YKuP5nXcPhUfNeK0A/leSjjG8hfqvWM84=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "50aeec40f2072d2ab267c8ec8a345573704ec110",
"rev": "30516cb2b01896e14ce66893e414b6e3eec71cac",
"type": "github"
},
"original": {
@ -905,28 +927,28 @@
"type": "github"
}
},
"nixpkgs-22_05": {
"nixpkgs-22_11": {
"locked": {
"lastModified": 1654936503,
"narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=",
"lastModified": 1669558522,
"narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dab6df51387c3878cdea09f43589a15729cae9f4",
"rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-22.05",
"ref": "nixos-22.11",
"type": "indirect"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1670114968,
"narHash": "sha256-2a9m6wpsGKRpQdBh3B+aMVzfKzrOpu9+HbLXO1DNy7Y=",
"lastModified": 1673139014,
"narHash": "sha256-wWtN1TjfsRbI2AYRP4RPcEKv3HVgy6lCCLg0Lyhlxbc=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "77e67cb65014fb75c1c8ccfec60e9bd8b7d02c94",
"rev": "080b7eb536d3baf70796dcc20abe4ee90618ca3c",
"type": "github"
},
"original": {
@ -935,13 +957,31 @@
"type": "github"
}
},
"nixpkgs-lib_2": {
"locked": {
"dir": "lib",
"lastModified": 1665349835,
"narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1670429513,
"narHash": "sha256-vMS0osUQXaM2n0OZdPsDOweAUqtDWh9NELqarecWMHI=",
"lastModified": 1673474156,
"narHash": "sha256-8SBVelPtzNWDqPMqaYGX9A9G+M9AVEqv7AYeWj/6/s0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f6a0924bd650d4d39ddf214e8fef052c610eec60",
"rev": "94ba1055239297f21cdbb275027604d88722cd10",
"type": "github"
},
"original": {
@ -985,7 +1025,7 @@
},
"nixpkgs-wayland": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-compat": "flake-compat_4",
"lib-aggregate": "lib-aggregate",
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": [
@ -993,11 +1033,11 @@
]
},
"locked": {
"lastModified": 1670350038,
"narHash": "sha256-3iFzmg3nh83lV++6jNKLzz/wXIrRfx+h2JVRsw0viKM=",
"lastModified": 1673438983,
"narHash": "sha256-lXCHxLVrcCJ22NvH0YHuGDdX7dt9c8ljPlpZL4afFZY=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "7a9e28e2fb249bc6ff31b668ccd3b005e5157aaa",
"rev": "0b662fed3593b6c6e8461b8639aa8e4d0c453db5",
"type": "github"
},
"original": {
@ -1008,43 +1048,43 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1657693803,
"narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
"lastModified": 1673315479,
"narHash": "sha256-GNCFRtDHjTygXGJp/H+f2XQPMGxpYSmNiibIqYzihtM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "365e1b3a859281cf11b94f87231adeabbdd878a2",
"rev": "c07552f6f7d4eead7806645ec03f7f1eb71ba6bd",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.05-small",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1670086663,
"narHash": "sha256-hT8C8AQB74tdoCPwz4nlJypLMD7GI2F5q+vn+VE/qQk=",
"lastModified": 1670461440,
"narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "813836d64fa57285d108f0dbf2356457ccd304e3",
"rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"ref": "nixos-22.11-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1660464579,
"narHash": "sha256-kzA9rwh0wS6CwUnFHAQ7dhJCowMPfRbvixVeOKnUmjo=",
"lastModified": 1673027386,
"narHash": "sha256-Wjt+oDhRLcf3opIjUKHGN+Xrp3w2ZDms6bO4pCLvsco=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b02538b16f6c5e1dbfce1033b27946e25c019b3b",
"rev": "b3818a46e686f24561a28eaa9fcf35e18b8d8e89",
"type": "github"
},
"original": {
@ -1056,11 +1096,27 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1670242877,
"narHash": "sha256-jBLh7dRHnbfvPPA9znOC6oQfKrCPJ0El8Zoe0BqnCjQ=",
"lastModified": 1671213428,
"narHash": "sha256-0deLDx1KjTiB3AKV2/OizGfEWcp6ZPjsDXk99uPJ8FM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dbc68fa4bb132d990945d39801b0d7f2ba15b08f",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dbc68fa4bb132d990945d39801b0d7f2ba15b08f",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1673315479,
"narHash": "sha256-GNCFRtDHjTygXGJp/H+f2XQPMGxpYSmNiibIqYzihtM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6e51c97f1c849efdfd4f3b78a4870e6aa2da4198",
"rev": "c07552f6f7d4eead7806645ec03f7f1eb71ba6bd",
"type": "github"
},
"original": {
@ -1070,28 +1126,29 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_7": {
"locked": {
"lastModified": 1664876616,
"narHash": "sha256-OxZntLnFgKbGUrPJJNLMxxj4yUaN/30+LG9N81ADqZE=",
"lastModified": 1670507980,
"narHash": "sha256-riNZa0xzM1it3pzxciwALeMs+0CsBMWIW2FqulzK8vM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0490b307e5556a8804e710d0c744d29c80fbce48",
"rev": "2787fc7d1e51404678614bf0fe92fc296746eec0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1670387514,
"narHash": "sha256-dSsoDMyoVwy60ZaGJNoCXEzYToYfdV6XYyadnliMJnE=",
"lastModified": 1673466346,
"narHash": "sha256-xQmR3V5l5hwHSWIOmWxqBUttmcgsUD7Da8sEpngW7/w=",
"owner": "nix-community",
"repo": "NUR",
"rev": "25c0b2f7f43cbe50bf17f5c190c0aa6231d3754f",
"rev": "1ee2886609567a210debe8b53520b12b9d7541f8",
"type": "github"
},
"original": {
@ -1103,16 +1160,16 @@
"poetry2nix": {
"flake": false,
"locked": {
"lastModified": 1632969109,
"narHash": "sha256-jPDclkkiAy5m2gGLBlKgH+lQtbF7tL4XxBrbSzw+Ioc=",
"lastModified": 1666918719,
"narHash": "sha256-BkK42fjAku+2WgCOv2/1NrPa754eQPV7gPBmoKQBWlc=",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "aee8f04296c39d88155e05d25cfc59dfdd41cc77",
"rev": "289efb187123656a116b915206e66852f038720e",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "1.21.0",
"ref": "1.36.0",
"repo": "poetry2nix",
"type": "github"
}
@ -1189,19 +1246,19 @@
"base16-tokyonight-scheme": "base16-tokyonight-scheme",
"comma": "comma",
"deploy-rs": "deploy-rs",
"direnv-vscode": "direnv-vscode",
"flake-compat": "flake-compat_4",
"flake-compat": "flake-compat_3",
"flake-registry": "flake-registry",
"flake-utils-plus": "flake-utils-plus_2",
"home-manager": "home-manager",
"hyprland": "hyprland",
"hyprpaper": "hyprpaper",
"impermanence": "impermanence",
"nix": "nix",
"nix-alien": "nix-alien",
"nix-direnv": "nix-direnv",
"nix-vscode-marketplace": "nix-vscode-marketplace",
"nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs_5",
"nixpkgs": "nixpkgs_6",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-wayland": "nixpkgs-wayland",
@ -1237,11 +1294,11 @@
"rycee": {
"flake": false,
"locked": {
"lastModified": 1670385787,
"narHash": "sha256-CsmFEwc9cQC/gr5mePkYzh7mhGv3aiIDfJXsO/Or5Xc=",
"lastModified": 1673409770,
"narHash": "sha256-mBOhKfYO6M8G/+mnrQ3Jml71nlj/n5F9McwoySFoEtU=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "f512eb653b48f499dfa58f07accf4b75101fe238",
"rev": "103f5681e3798d01fd23d0e9cb696f7645099d3e",
"type": "gitlab"
},
"original": {
@ -1253,18 +1310,19 @@
"simple-nixos-mailserver": {
"inputs": {
"blobs": "blobs",
"flake-compat": "flake-compat_5",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-22_05": "nixpkgs-22_05",
"nixpkgs-22_11": "nixpkgs-22_11",
"utils": "utils_5"
},
"locked": {
"lastModified": 1669807829,
"narHash": "sha256-rgQ8MYV1UD4Ynw0wzfl9hatgsV5GV7X6eM6ioSPKzls=",
"lastModified": 1671738303,
"narHash": "sha256-PRgqtaWf2kMSYqVmcnmhTh+UsC0RmvXRTr+EOw5VZUA=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
"rev": "694e7d34f60028f4877517e1c7c73c9527fad400",
"rev": "6d0d9fb966cc565a3df74d3b686f924c7615118c",
"type": "gitlab"
},
"original": {
@ -1290,11 +1348,11 @@
},
"utils_2": {
"locked": {
"lastModified": 1648297722,
"narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
@ -1371,15 +1429,15 @@
"webcord": {
"inputs": {
"dream2nix": "dream2nix",
"nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_7",
"webcord": "webcord_2"
},
"locked": {
"lastModified": 1666097086,
"narHash": "sha256-6WKh4NwItcz9IGY5rGkkeWCtGOmpU3nf85dX29suDjE=",
"lastModified": 1670874335,
"narHash": "sha256-nJ1LUVj3dIHP5B+XkZXUvY39OqaZn/MMHSFwsOSPnwI=",
"owner": "fufexan",
"repo": "webcord-flake",
"rev": "9098504f2a08ac848ea43de40496925c450e7111",
"rev": "b462d57c36d664b48f047c96b2f9de091bff6e8b",
"type": "github"
},
"original": {
@ -1391,11 +1449,11 @@
"webcord_2": {
"flake": false,
"locked": {
"lastModified": 1664742535,
"narHash": "sha256-QoXBlhCM97haNlkbU4O2oXITnzrkiM9hYAiNpduVjIQ=",
"lastModified": 1670713990,
"narHash": "sha256-e+y/M+/gjezHoNrdXeFhqtvxbPdhRSDOQlwK1nUhNfo=",
"owner": "SpacingBat3",
"repo": "WebCord",
"rev": "cb6938bde4f57b252b167b23fc0c2d6120326fff",
"rev": "80ba858c025e0bb59510f7136211948d8ae10ece",
"type": "github"
},
"original": {
@ -1408,11 +1466,11 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1669925104,
"narHash": "sha256-xMHfW+/G9MieN/5tXHUA5/ztE8dkE093cNFTEUgcwxI=",
"lastModified": 1671183014,
"narHash": "sha256-oMWT5Zbe/3HFINAk38jNVxiZ4PCYvPJj2Jo4iiyBtm0=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "c8eb24d30e18c165728b8788a10716611c3b633d",
"rev": "dc7cc98cf21a8dc19ab8895505500e3700646af0",
"type": "gitlab"
},
"original": {
@ -1424,18 +1482,21 @@
},
"xdph": {
"inputs": {
"hyprland-protocols": "hyprland-protocols_2",
"hyprland-protocols": [
"hyprland",
"hyprland-protocols"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1670202338,
"narHash": "sha256-StTfshdAoSxO+t0wRbq1I3YESLFIQWFjGJse5ICV8rk=",
"lastModified": 1673116118,
"narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "af840a9e0947a79a37a95a9f62062653721e43fa",
"rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2",
"type": "github"
},
"original": {
@ -1479,11 +1540,11 @@
"zsh-you-should-use": {
"flake": false,
"locked": {
"lastModified": 1661951724,
"narHash": "sha256-1XMn1TjPi8Ic3loDx9ICLeKw0oOZifNJbwIiW+XWZy4=",
"lastModified": 1670753354,
"narHash": "sha256-untLdWhVL6BEoflqr0ggqqO0NLOMvf9uL0wHB5BZUqQ=",
"owner": "MichaelAquilina",
"repo": "zsh-you-should-use",
"rev": "13c86356553b80e0e0cbf1ecf6d82cfa79751b5a",
"rev": "5b316f4af3ac90e044f386003aacdaa0ad606488",
"type": "github"
},
"original": {

23
flake.nix
View File

@ -43,6 +43,10 @@
};
hyprland = {
url = "github:hyprwm/Hyprland";
# inputs.nixpkgs.follows = "nixpkgs";
};
hyprpaper = {
url = "github:hyprwm/hyprpaper";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-alien = {
@ -50,11 +54,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nix-direnv.url = "github:nix-community/nix-direnv";
direnv-vscode = {
url = "github:direnv/direnv-vscode";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-vscode-marketplace.url = "github:AmeerTaweel/nix-vscode-marketplace";
nix-vscode-marketplace.url = "github:nix-community/nix-vscode-extensions";
nixos-generators = {
url = "github:nix-community/nixos-generators";
inputs.nixpkgs.follows = "nixpkgs";
@ -121,12 +121,12 @@
inherit self inputs;
supportedSystems = [ "x86_64-linux" ];
sharedPatches = patchesPath [ "mullvad-exclude-containers.patch" ];
sharedPatches = patchesPath [ "mullvad-exclude-containers.patch" "mullvad.patch" ];
channelsConfig = { allowUnfree = true; };
channels.unstable.input = nixpkgs;
channels.unstable.patches = [ ] ++ sharedPatches;
channels.unstable.patches = patchesPath [ ] ++ sharedPatches;
channels.unstable-zfs.input = nixpkgs;
channels.unstable-zfs.patches = [ ./patches/zen-kernels.patch ] ++ sharedPatches;
channels.unstable-zfs.patches = patchesPath [ "zen-kernels.patch" ] ++ sharedPatches;
hostDefaults.system = "x86_64-linux";
hostDefaults.channelName = "unstable";
@ -144,6 +144,11 @@
specialArgs = { inherit inputs; };
channelName = "unstable-zfs";
};
Home-Hypervisor = {
system = builtins.readFile (./machines/Home-Hypervisor/system);
modules = [ (import (./machines/Home-Hypervisor)) { device = "Home-Hypervisor"; mainuser = "ataraxia"; } ];
specialArgs = { inherit inputs; };
};
};
outputsBuilder = channels: let
@ -175,7 +180,7 @@
nix flake lock --update-input hyprland
'';
in {
devShell = channels.unstable.mkShell {
devShells.default = channels.unstable.mkShell {
name = "aliases";
packages = with pkgs; [
rebuild update-vscode upgrade upgrade-hyprland

6
machines/AMD-Workstation/default.nix
View File

@ -70,6 +70,12 @@
};
};
boot.tmpOnTmpfs = true;
boot.tmpOnTmpfsSize = "2G";
boot.supportedFilesystems = [ "btrfs" ];
services.openssh.permitRootLogin = lib.mkForce "without-password";
services.ratbagd.enable = true;
home-manager.users.${config.mainuser} = {

8
machines/Flakes-ISO/default.nix
View File

@ -21,7 +21,7 @@
identityFile /home/nixos/ssh-builder
'';
environment.systemPackages = [ pkgs.git ];
environment.systemPackages = [ pkgs.git pkgs.kitty ];
nix = {
nixPath = lib.mkForce [ "self=/etc/self/compat" "nixpkgs=/etc/nixpkgs" ];
registry.self.flake = inputs.self;
@ -46,8 +46,8 @@
services.openssh = {
enable = true;
passwordAuthentication = true;
permitRootLogin = "yes";
passwordAuthentication = false;
permitRootLogin = lib.mkForce "without-password";
forwardX11 = true;
extraConfig = "StreamLocalBindUnlink yes";
ports = [ 22 ];
@ -58,6 +58,8 @@
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDP0/DReYSAfkucroMTdELzTORsGhhbEa+W0FDFBnwViHuoqoKvetCOkW657icexc5v/j6Ghy3+Li9twbHnEDzUJVtNtauhGMjOcUYt6pTbeJ09CGSAh+orxzeY4vXp7ANb91xW8yRn/EE4ALxqbLsc/D7TUMl11fmf0UW+kLgU5TcUYVSLMjQqBpD1Lo7lXLrImloDxe5fwoBDT09E59r9tq6+/3aHz8mpKRLsIQIV0Av00BRJ+/OVmZuBd9WS35rfkpUYmpEVInSJy3G4O6kCvY/zc9Bnh67l4kALZZ0+6W23kBGrzaRfaOtCEcscwfIu+6GXiHOL33rrMNNinF0T2942jGc18feL6P/LZCzqz8bGdFNxT43jAGPeDDcrJEWAJZFO3vVTP65dTRTHQG2KlQMzS7tcif6YUlY2JLJIb61ZfLoShH/ini/tqsGT0Be1f3ndOFt48h4XMW1oIF+EXaHYeO2UJ6855m8Wpxs4bP/jX6vMV38IvvnHy4tWD50= alukard@AMD-Workstation"
];
users.users.root.openssh.authorizedKeys.keys = config.users.users.nixos.openssh.authorizedKeys.keys;
# isoImage.contents = [{
# source = ../..;
# target = "/home/nixos/nixos-config";

3
machines/Home-Hypervisor/autoinstall.nix
View File

@ -3,7 +3,7 @@
debug = false;
hostname = "Home-Hypervisor";
mainuser = "ataraxia";
flakesPath = "/home/nixos/conf";
flakesPath = "/home/nixos/nixos-config";
encryption.enable = true;
encryption.passwordFile = "/home/nixos/pass";
encryption.argonIterTime = "4000";
@ -16,5 +16,6 @@
zfsOpts.bootPoolReservation = "256M";
zfsOpts.rootPoolReservation = "25G";
persist.enable = true;
oldUefi = true;
};
}

3
machines/Home-Hypervisor/default.nix
View File

@ -9,6 +9,7 @@ in {
./virtualisation.nix
nixosRoles.hypervisor
nixosProfiles.vscode-server
];
deviceSpecific.devInfo = {
@ -108,7 +109,7 @@ in {
home.file.".config/libvirt/libvirt.conf".text = ''
uri_default = "qemu:///system"
'';
home.packages = with pkgs; [ bat podman-compose ];
home.packages = with pkgs; [ bat podman-compose micro bottom nix-index-update ];
xdg.mime.enable = false;
home.stateVersion = "22.11";
};

2
machines/Home-Hypervisor/virtualisation.nix
View File

@ -6,7 +6,7 @@
enable = true;
extraPackages = [ pkgs.zfs ];
# dockerCompat = true;
defaultNetwork.dnsname.enable = true;
defaultNetwork.settings.dns_enabled = true;
# dockerSocket.enable = true;
};
containers.registries.search = [

1
todo.md
View File

@ -4,6 +4,7 @@
* telegram theme
* use theme engine from https://github.com/SenchoPens/senixos
* update waybar
* FIX Seadrive
## Tips: