Compare commits
2 commits
aff594f114
...
14a76a18af
| Author | SHA1 | Date | |
|---|---|---|---|
|
14a76a18af | ||
|
|
3c3be7f906 |
5 changed files with 94 additions and 247 deletions
255
flake.lock
255
flake.lock
|
|
@ -46,8 +46,8 @@
|
|||
"blink-pairs": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1757108414,
|
||||
|
|
@ -63,21 +63,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"cl-nix-lite": {
|
||||
"locked": {
|
||||
"lastModified": 1728174978,
|
||||
"narHash": "sha256-Grqqg+xuicANB85j0gNEXxi9SBKY7bzGeTuyi95eGcY=",
|
||||
"owner": "hraban",
|
||||
"repo": "cl-nix-lite",
|
||||
"rev": "31cfe6275c341eb3120a99f4b1c8516c49a29d87",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hraban",
|
||||
"repo": "cl-nix-lite",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"cmp-diag-codes": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -158,16 +143,15 @@
|
|||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1730663653,
|
||||
"narHash": "sha256-kFCUWettiFHDIqxCWWQ9qY8pVh+Lj+XL0Giyy/kdomg=",
|
||||
"owner": "hraban",
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "e5b16676185cb7548581c852f51ce7f3a49bba5e",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hraban",
|
||||
"ref": "fixed-output",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -175,11 +159,11 @@
|
|||
"flake-compat_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"lastModified": 1747046372,
|
||||
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -204,32 +188,16 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_4": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1747046372,
|
||||
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741352980,
|
||||
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
|
||||
"lastModified": 1760813311,
|
||||
"narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
|
||||
"rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -243,11 +211,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760813311,
|
||||
"narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=",
|
||||
"lastModified": 1741352980,
|
||||
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8",
|
||||
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -295,26 +263,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": [
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gen-luarc": {
|
||||
"inputs": {
|
||||
"flake-parts": [
|
||||
|
|
@ -361,7 +309,7 @@
|
|||
},
|
||||
"git-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-compat": "flake-compat",
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"mynvim",
|
||||
|
|
@ -386,7 +334,7 @@
|
|||
},
|
||||
"git-hooks_2": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_4",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"gitignore": "gitignore_2",
|
||||
"nixpkgs": [
|
||||
"neovim-nightly-overlay",
|
||||
|
|
@ -500,11 +448,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760809591,
|
||||
"narHash": "sha256-OxGcFcQdfOK8veZkPdQuqXIotFYiy4sBQB58dMNLeHY=",
|
||||
"lastModified": 1760887455,
|
||||
"narHash": "sha256-/xU8iYZjolWbMUNBQF6af5zgGs73Qw21WMgz1tLs3Yw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "870883ba11ba1c84f756c0c1f9fa74cdb2a16c1e",
|
||||
"rev": "aeabc1ac63e6ebb8ba4714c4abdfe0556f2de765",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -514,31 +462,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"limainit": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixos-generators": "nixos-generators",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1756586912,
|
||||
"narHash": "sha256-MuXFln0E1ozYRzy5lHJy1r1PuEwcVQkBXsCMgE0txDI=",
|
||||
"owner": "nixos-lima",
|
||||
"repo": "nixos-lima",
|
||||
"rev": "813e170372e0c7b5f5944ed8979cba44777b418c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos-lima",
|
||||
"ref": "master",
|
||||
"repo": "nixos-lima",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"local-highlight-nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -573,29 +496,23 @@
|
|||
},
|
||||
"mac-app-util": {
|
||||
"inputs": {
|
||||
"cl-nix-lite": "cl-nix-lite",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
"flake-parts": [
|
||||
"flake-parts"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"systems"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1756057867,
|
||||
"narHash": "sha256-ziR5eQGqRWhW8tf8r0TIplaqNt+HXu1G1X41LUr4IYo=",
|
||||
"owner": "hraban",
|
||||
"lastModified": 1760901174,
|
||||
"narHash": "sha256-6T1//SxvqIeSJpWsaf9F+rrkSAVPbyw913SReQgIx54=",
|
||||
"owner": "JMarkin",
|
||||
"repo": "mac-app-util",
|
||||
"rev": "8414fa1e2cb775b17793104a9095aabeeada63ef",
|
||||
"rev": "f06afe6451bbf165c5ae4562cf58e35cc61dc6c3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hraban",
|
||||
"owner": "JMarkin",
|
||||
"repo": "mac-app-util",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -606,7 +523,9 @@
|
|||
"blink-pairs": "blink-pairs",
|
||||
"cmp-diag-codes": "cmp-diag-codes",
|
||||
"diaglist-nvim": "diaglist-nvim",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"flake-parts": [
|
||||
"flake-parts"
|
||||
],
|
||||
"gen-luarc": "gen-luarc",
|
||||
"gentags-lua": "gentags-lua",
|
||||
"hlargs-nvim": "hlargs-nvim",
|
||||
|
|
@ -656,7 +575,7 @@
|
|||
},
|
||||
"neovim-nightly-overlay": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-parts": "flake-parts_3",
|
||||
"git-hooks": "git-hooks_2",
|
||||
"hercules-ci-effects": "hercules-ci-effects",
|
||||
|
|
@ -664,7 +583,7 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix_2"
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760832323,
|
||||
|
|
@ -696,28 +615,13 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixlib": {
|
||||
"locked": {
|
||||
"lastModified": 1736643958,
|
||||
"narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos": {
|
||||
"locked": {
|
||||
"lastModified": 1760580664,
|
||||
"narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=",
|
||||
"lastModified": 1760725957,
|
||||
"narHash": "sha256-tdoIhL/NlER290HfSjOkgi4jfmjeqmqrzgnmiMtGepE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389",
|
||||
"rev": "81b927b14b7b3988334d5282ef9cba802e193fe1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -727,35 +631,13 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-generators": {
|
||||
"inputs": {
|
||||
"nixlib": "nixlib",
|
||||
"nixpkgs": [
|
||||
"limainit",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1751903740,
|
||||
"narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-generators",
|
||||
"rev": "032decf9db65efed428afd2fa39d80f7089085eb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-generators",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1754340878,
|
||||
"narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
|
||||
"lastModified": 1741865919,
|
||||
"narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "cab778239e705082fe97bb4990e0d24c50924c04",
|
||||
"rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -767,11 +649,11 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1740877520,
|
||||
"narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=",
|
||||
"lastModified": 1754788789,
|
||||
"narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "147dee35aab2193b174e4c0868bd80ead5ce755c",
|
||||
"rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -782,11 +664,11 @@
|
|||
},
|
||||
"nixpkgs-lib_2": {
|
||||
"locked": {
|
||||
"lastModified": 1754788789,
|
||||
"narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
|
||||
"lastModified": 1740877520,
|
||||
"narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
|
||||
"rev": "147dee35aab2193b174e4c0868bd80ead5ce755c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -828,27 +710,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1741865919,
|
||||
"narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=",
|
||||
"lastModified": 1760782043,
|
||||
"narHash": "sha256-+4A1SFln9wOCoUZM0mQfKefP1uRVmjz6bV5SPbl1Q/4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1760596604,
|
||||
"narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43",
|
||||
"rev": "36226520e9f7a35bf341cbe3b6a1ff9047bec6d9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -893,14 +759,13 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"flake-utils": "flake-utils",
|
||||
"flake-parts": "flake-parts",
|
||||
"home-manager": "home-manager",
|
||||
"limainit": "limainit",
|
||||
"mac-app-util": "mac-app-util",
|
||||
"mynvim": "mynvim",
|
||||
"neovim-nightly-overlay": "neovim-nightly-overlay",
|
||||
"nixos": "nixos",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"secrets": "secrets",
|
||||
"systems": "systems"
|
||||
}
|
||||
|
|
@ -978,24 +843,6 @@
|
|||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755934250,
|
||||
"narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"neovim-nightly-overlay",
|
||||
|
|
|
|||
56
flake.nix
56
flake.nix
|
|
@ -3,18 +3,20 @@
|
|||
|
||||
inputs = {
|
||||
systems.url = "github:nix-systems/default";
|
||||
|
||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
flake-utils.inputs.systems.follows = "systems";
|
||||
# flake-utils.url = "github:numtide/flake-utils";
|
||||
# flake-utils.inputs.systems.follows = "systems";
|
||||
|
||||
# nixpkgs-master.url = "github:nixos/nixpkgs";
|
||||
# nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||
nixos.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||
|
||||
limainit.url = "github:nixos-lima/nixos-lima/master";
|
||||
limainit.inputs.flake-utils.follows = "flake-utils";
|
||||
limainit.inputs.nixpkgs.follows = "nixpkgs";
|
||||
# limainit.url = "github:nixos-lima/nixos-lima/master";
|
||||
# limainit.inputs.flake-utils.follows = "flake-utils";
|
||||
# limainit.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
|
||||
# neovim-nightly-overlay.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -32,10 +34,9 @@
|
|||
# darwin.url = "github:lnl7/nix-darwin/master";
|
||||
# darwin.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
mac-app-util.url = "github:hraban/mac-app-util";
|
||||
mac-app-util.url = "github:JMarkin/mac-app-util";
|
||||
mac-app-util.inputs.nixpkgs.follows = "nixpkgs";
|
||||
mac-app-util.inputs.systems.follows = "systems";
|
||||
mac-app-util.inputs.flake-utils.follows = "flake-utils";
|
||||
mac-app-util.inputs.flake-parts.follows = "flake-parts";
|
||||
|
||||
|
||||
# microvm.url = "github:microvm-nix/microvm.nix";
|
||||
|
|
@ -47,6 +48,7 @@
|
|||
|
||||
mynvim.url = "git+https://git.jmarkin.ru/jmarkin/nvim-nix";
|
||||
mynvim.inputs.nixpkgs.follows = "nixpkgs";
|
||||
mynvim.inputs.flake-parts.follows = "flake-parts";
|
||||
mynvim.inputs.neovim-nightly-overlay.follows = "neovim-nightly-overlay";
|
||||
# mynvim.url = "path:/projects/jmarkin/nvim-nix";
|
||||
|
||||
|
|
@ -62,7 +64,7 @@
|
|||
, nixos
|
||||
, home-manager
|
||||
, mac-app-util
|
||||
, limainit
|
||||
# , limainit
|
||||
, secrets
|
||||
, ...
|
||||
} @ inputs:
|
||||
|
|
@ -153,14 +155,14 @@
|
|||
./home/users/small-pc.nix
|
||||
];
|
||||
};
|
||||
"kron@lima" = home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = aarch64Pkgs;
|
||||
|
||||
modules = [
|
||||
kronHome
|
||||
./home/users/lima.nix
|
||||
];
|
||||
};
|
||||
# "kron@lima" = home-manager.lib.homeManagerConfiguration {
|
||||
# pkgs = aarch64Pkgs;
|
||||
#
|
||||
# modules = [
|
||||
# kronHome
|
||||
# ./home/users/lima.nix
|
||||
# ];
|
||||
# };
|
||||
"kron@orb" = home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = aarch64Pkgs;
|
||||
|
||||
|
|
@ -189,16 +191,16 @@
|
|||
./nixos/orbstack.nix
|
||||
];
|
||||
};
|
||||
lima = nixos.lib.nixosSystem {
|
||||
system = "aarch64-linux";
|
||||
pkgs = nixosAarch64Packages;
|
||||
specialArgs = { inherit limainit; };
|
||||
modules = [
|
||||
home-manager.nixosModules.home-manager
|
||||
secrets.nixosModules.default
|
||||
./nixos/lima.nix
|
||||
];
|
||||
};
|
||||
# lima = nixos.lib.nixosSystem {
|
||||
# system = "aarch64-linux";
|
||||
# pkgs = nixosAarch64Packages;
|
||||
# specialArgs = { inherit limainit; };
|
||||
# modules = [
|
||||
# home-manager.nixosModules.home-manager
|
||||
# secrets.nixosModules.default
|
||||
# ./nixos/lima.nix
|
||||
# ];
|
||||
# };
|
||||
/*
|
||||
nixos-rebuild switch --flake .#gw \
|
||||
--target-host gw-nix-home --verbose --use-remote-sudo
|
||||
|
|
|
|||
|
|
@ -6,19 +6,9 @@
|
|||
gh
|
||||
];
|
||||
imports = [ ./gitignore_global.nix ];
|
||||
programs.git = {
|
||||
programs.delta = {
|
||||
enable = true;
|
||||
userName = "jmarkin";
|
||||
userEmail = "me@jmarkin.ru";
|
||||
lfs = {
|
||||
enable = true;
|
||||
skipSmudge = true;
|
||||
};
|
||||
hooks = {
|
||||
prepare-commit-msg = ./commitprefix.py;
|
||||
};
|
||||
delta = {
|
||||
enable = true;
|
||||
enableGitIntegration = true;
|
||||
options = {
|
||||
decorations = {
|
||||
commit-decoration-style = "blue ol";
|
||||
|
|
@ -33,7 +23,17 @@
|
|||
whitespace-error-style = "22 reverse";
|
||||
};
|
||||
};
|
||||
extraConfig = {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
lfs = {
|
||||
enable = true;
|
||||
skipSmudge = true;
|
||||
};
|
||||
hooks = {
|
||||
prepare-commit-msg = ./commitprefix.py;
|
||||
};
|
||||
settings = {
|
||||
user = {name = "jmarkin"; email = "me@jmarkin.ru";};
|
||||
core = {
|
||||
fscache = true;
|
||||
packedGitLimit = "512m";
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
};
|
||||
|
||||
pull = {
|
||||
rebase = false;
|
||||
rebase = true;
|
||||
};
|
||||
http = {
|
||||
sslVerify = false;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ rec {
|
|||
|
||||
home.packages = with pkgs; [
|
||||
jaq
|
||||
delta
|
||||
docker-compose
|
||||
dust
|
||||
kubectl
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
|
||||
# utils
|
||||
jaq
|
||||
delta
|
||||
docker-compose
|
||||
dust
|
||||
tree-sitter
|
||||
|
|
|
|||
Loading…
Reference in a new issue