chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing merge conflicts

Browse source
This commit is contained in:
Chris Cochrun 2025-03-22 22:50:34 -05:00
parent 2bdb4733f9
commit 36307fd401
1 changed files with 47 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

109
flake.lock generated
View file

@ -102,6 +102,24 @@
"type": "gitlab" "type": "gitlab"
} }
}, },
"darkly": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1741543504,
"narHash": "sha256-IwN6eZusfeGIEtdubpJpp1wrzToi0Umwi9jbXc4AF90=",
"owner": "Bali10050",
"repo": "Darkly",
"rev": "40ccf235ae340ace5a55c7740db78f15d1285105",
"type": "github"
},
"original": {
"owner": "Bali10050",
"repo": "Darkly",
"type": "github"
}
},
"emacs": { "emacs": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -432,27 +450,11 @@
] ]
}, },
"locked": { "locked": {
<<<<<<< HEAD
<<<<<<< HEAD
"lastModified": 1741378606, "lastModified": 1741378606,
"narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=", "narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "95711f926676018d279ba09fe7530d03b5d5b3e2", "rev": "95711f926676018d279ba09fe7530d03b5d5b3e2",
=======
"lastModified": 1741914680,
"narHash": "sha256-Vu4DIZvgfWMzhUyxbHUrJaQb5232S5vuwxQ2sBcBVHk=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "30cce6848a5aa41ceb5fb33185b84868cc3e9bef",
>>>>>>> d31e6ee (updating flake, userChrome, and emacs.nix)
=======
"lastModified": 1741378606,
"narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "95711f926676018d279ba09fe7530d03b5d5b3e2",
>>>>>>> b36d19f (adding ddclient to nix situation)
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -487,7 +489,7 @@
"inputs": { "inputs": {
"extra-container": "extra-container", "extra-container": "extra-container",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
}, },
"locked": { "locked": {
@ -530,31 +532,15 @@
"nixos-cosmic": { "nixos-cosmic": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_5",
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
<<<<<<< HEAD
<<<<<<< HEAD
"lastModified": 1741360124, "lastModified": 1741360124,
"narHash": "sha256-x9eHurxh8AhCmVplugQiYTyfz+NNU4DGRRLq1UqQ8g0=", "narHash": "sha256-x9eHurxh8AhCmVplugQiYTyfz+NNU4DGRRLq1UqQ8g0=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "5be89641d8b9190460af05d59f6dbe4cb8695399", "rev": "5be89641d8b9190460af05d59f6dbe4cb8695399",
=======
"lastModified": 1741919923,
"narHash": "sha256-ZBKD3Rd8fCu8TaGr2bkHqai3bqxKuUBOFLLMWThcGKM=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "24785e84d4b3844936caffe2c56994bdef9a9300",
>>>>>>> d31e6ee (updating flake, userChrome, and emacs.nix)
=======
"lastModified": 1741360124,
"narHash": "sha256-x9eHurxh8AhCmVplugQiYTyfz+NNU4DGRRLq1UqQ8g0=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "5be89641d8b9190460af05d59f6dbe4cb8695399",
>>>>>>> b36d19f (adding ddclient to nix situation)
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -579,6 +565,22 @@
"type": "github" "type": "github"
} }
}, },
"nixos-unstable-small": {
"locked": {
"lastModified": 1742661564,
"narHash": "sha256-ER1V/mAVvtwB/eY4MQVLkg4Ek1Y0eDK2E3N/lgzFP4k=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3fcae17eabac8fdc6599d1c67d89726af3682613",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716509168, "lastModified": 1716509168,
@ -644,27 +646,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
<<<<<<< HEAD
<<<<<<< HEAD
"lastModified": 1741196730, "lastModified": 1741196730,
"narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=", "narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3", "rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3",
=======
"lastModified": 1741862977,
"narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0",
>>>>>>> d31e6ee (updating flake, userChrome, and emacs.nix)
=======
"lastModified": 1741196730,
"narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3",
>>>>>>> b36d19f (adding ddclient to nix situation)
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -708,12 +694,10 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1739357830, "lastModified": 1734424634,
"narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
<<<<<<< HEAD
=======
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"type": "github" "type": "github"
}, },
@ -730,18 +714,17 @@
"narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
>>>>>>> b36d19f (adding ddclient to nix situation) "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1741246872, "lastModified": 1741246872,
"narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
@ -757,7 +740,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1735264675, "lastModified": 1735264675,
"narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=",
@ -771,7 +754,7 @@
"url": "https://flakehub.com/f/NixOS/nixpkgs/%2A.tar.gz" "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A.tar.gz"
} }
}, },
"nixpkgs_6": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1732014248, "lastModified": 1732014248,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
@ -857,7 +840,7 @@
"quickemu": { "quickemu": {
"inputs": { "inputs": {
"flake-schemas": "flake-schemas", "flake-schemas": "flake-schemas",
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1735561406, "lastModified": 1735561406,
@ -875,12 +858,14 @@
"root": { "root": {
"inputs": { "inputs": {
"anipy-cli": "anipy-cli", "anipy-cli": "anipy-cli",
"darkly": "darkly",
"emacs": "emacs", "emacs": "emacs",
"eww": "eww", "eww": "eww",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-bitcoin": "nix-bitcoin", "nix-bitcoin": "nix-bitcoin",
"nixos-cosmic": "nixos-cosmic", "nixos-cosmic": "nixos-cosmic",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-unstable-small": "nixos-unstable-small",
"nixpkgs": [ "nixpkgs": [
"nixos-cosmic", "nixos-cosmic",
"nixpkgs" "nixpkgs"
@ -917,7 +902,7 @@
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_7",
"nixpkgs-24_11": "nixpkgs-24_11" "nixpkgs-24_11": "nixpkgs-24_11"
}, },
"locked": { "locked": {