updating flake, userChrome, and emacs.nix
This commit is contained in:
parent
cef3749d87
commit
c3de5f9330
10 changed files with 550 additions and 401 deletions
24
flake.lock
generated
24
flake.lock
generated
|
@ -432,11 +432,19 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1741378606,
|
||||
"narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "95711f926676018d279ba09fe7530d03b5d5b3e2",
|
||||
=======
|
||||
"lastModified": 1741914680,
|
||||
"narHash": "sha256-Vu4DIZvgfWMzhUyxbHUrJaQb5232S5vuwxQ2sBcBVHk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "30cce6848a5aa41ceb5fb33185b84868cc3e9bef",
|
||||
>>>>>>> d31e6ee (updating flake, userChrome, and emacs.nix)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -518,11 +526,19 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1741360124,
|
||||
"narHash": "sha256-x9eHurxh8AhCmVplugQiYTyfz+NNU4DGRRLq1UqQ8g0=",
|
||||
"owner": "lilyinstarlight",
|
||||
"repo": "nixos-cosmic",
|
||||
"rev": "5be89641d8b9190460af05d59f6dbe4cb8695399",
|
||||
=======
|
||||
"lastModified": 1741919923,
|
||||
"narHash": "sha256-ZBKD3Rd8fCu8TaGr2bkHqai3bqxKuUBOFLLMWThcGKM=",
|
||||
"owner": "lilyinstarlight",
|
||||
"repo": "nixos-cosmic",
|
||||
"rev": "24785e84d4b3844936caffe2c56994bdef9a9300",
|
||||
>>>>>>> d31e6ee (updating flake, userChrome, and emacs.nix)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -612,11 +628,19 @@
|
|||
},
|
||||
"nixpkgs-stable_3": {
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1741196730,
|
||||
"narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3",
|
||||
=======
|
||||
"lastModified": 1741862977,
|
||||
"narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0",
|
||||
>>>>>>> d31e6ee (updating flake, userChrome, and emacs.nix)
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue